Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .changeset/fuzzy-chefs-change.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
---
'@clerk/backend': minor
---

Adds the Blocklist Identifier endpoints to the Backend API client.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
await clerkClient.blocklistIdentifiers.getBlocklistIdentifierList();
await clerkClient.blocklistIdentifiers.createBlocklistIdentifier({ identifier });
await clerkClient.blocklistIdentifiers.deleteBlocklistIdentifier('blocklistIdentifierId');
```

Updates the ability paginate Allowlist Identifier reponses and access `identifierType` and `instanceId` from the response.

```ts
import { createClerkClient } from '@clerk/backend';

const clerkClient = createClerkClient(...);
const res = await clerkClient.blocklistIdentifiers.getAllowlistIdentifierList({ limit, offset });
```

Corrects the type of the Allowlist Identifier `DeletedObject`
9 changes: 6 additions & 3 deletions packages/backend/src/api/endpoints/AllowlistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { AllowlistIdentifier } from '../resources/AllowlistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

Expand All@@ -11,11 +14,11 @@ type AllowlistIdentifierCreateParams = {
};

export class AllowlistIdentifierAPI extends AbstractAPI {
public async getAllowlistIdentifierList() {
public async getAllowlistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<AllowlistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: { paginated: true },
queryParams: { ...params, paginated: true },
});
}

Expand All@@ -29,7 +32,7 @@ export class AllowlistIdentifierAPI extends AbstractAPI {

public async deleteAllowlistIdentifier(allowlistIdentifierId: string) {
this.requireId(allowlistIdentifierId);
return this.request<AllowlistIdentifier>({
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, allowlistIdentifierId),
});
Expand Down
39 changes: 39 additions & 0 deletions packages/backend/src/api/endpoints/BlocklistIdentifierApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
import type { ClerkPaginationRequest } from '@clerk/types';

import { joinPaths } from '../../util/path';
import type { BlocklistIdentifier } from '../resources/BlocklistIdentifier';
import type { DeletedObject } from '../resources/DeletedObject';
import type { PaginatedResourceResponse } from '../resources/Deserializer';
import { AbstractAPI } from './AbstractApi';

const basePath = '/blocklist_identifiers';

type BlocklistIdentifierCreateParams = {
identifier: string;
};

export class BlocklistIdentifierAPI extends AbstractAPI {
public async getBlocklistIdentifierList(params: ClerkPaginationRequest = {}) {
return this.request<PaginatedResourceResponse<BlocklistIdentifier[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async createBlocklistIdentifier(params: BlocklistIdentifierCreateParams) {
return this.request<BlocklistIdentifier>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async deleteBlocklistIdentifier(blocklistIdentifierId: string) {
this.requireId(blocklistIdentifierId);
return this.request<DeletedObject>({
method: 'DELETE',
path: joinPaths(basePath, blocklistIdentifierId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
export * from './AccountlessApplicationsAPI';
export * from './AbstractApi';
export * from './AllowlistIdentifierApi';
export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
import {
AccountlessApplicationAPI,
AllowlistIdentifierAPI,
BlocklistIdentifierAPI,
ClientAPI,
DomainAPI,
EmailAddressAPI,
Expand DownExpand Up@@ -31,6 +32,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
buildRequest({ ...options, requireSecretKey: false }),
),
allowlistIdentifiers: new AllowlistIdentifierAPI(request),
blocklistIdentifiers: new BlocklistIdentifierAPI(request),
clients: new ClientAPI(request),
emailAddresses: new EmailAddressAPI(request),
invitations: new InvitationAPI(request),
Expand Down
13 changes: 12 additions & 1 deletion packages/backend/src/api/resources/AllowlistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
import type { AllowlistIdentifierType } from './Enums';
import type { AllowlistIdentifierJSON } from './JSON';

export class AllowlistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: AllowlistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
readonly invitationId?: string,
) {}

static fromJSON(data: AllowlistIdentifierJSON): AllowlistIdentifier {
return new AllowlistIdentifier(data.id, data.identifier, data.created_at, data.updated_at, data.invitation_id);
return new AllowlistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
data.invitation_id,
);
}
}
24 changes: 24 additions & 0 deletions packages/backend/src/api/resources/BlocklistIdentifier.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
import type { BlocklistIdentifierType } from './Enums';
import type { BlocklistIdentifierJSON } from './JSON';

export class BlocklistIdentifier {
constructor(
readonly id: string,
readonly identifier: string,
readonly identifierType: BlocklistIdentifierType,
readonly createdAt: number,
readonly updatedAt: number,
readonly instanceId?: string,
) {}

static fromJSON(data: BlocklistIdentifierJSON): BlocklistIdentifier {
return new BlocklistIdentifier(
data.id,
data.identifier,
data.identifier_type,
data.created_at,
data.updated_at,
data.instance_id,
);
}
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
import {
AllowlistIdentifier,
BlocklistIdentifier,
Client,
Cookies,
DeletedObject,
Expand DownExpand Up@@ -73,6 +74,8 @@ function jsonToObject(item: any): any {
return AccountlessApplication.fromJSON(item);
case ObjectType.AllowlistIdentifier:
return AllowlistIdentifier.fromJSON(item);
case ObjectType.BlocklistIdentifier:
return BlocklistIdentifier.fromJSON(item);
case ObjectType.Client:
return Client.fromJSON(item);
case ObjectType.Cookies:
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/Enums.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,3 +36,7 @@ export type SignInStatus = 'needs_identifier' | 'needs_factor_one' | 'needs_fact
export type SignUpStatus = 'missing_requirements' | 'complete' | 'abandoned';

export type InvitationStatus = 'pending' | 'accepted' | 'revoked' | 'expired';

export type AllowlistIdentifierType = 'email_address' | 'phone_number' | 'web3_wallet';

export type BlocklistIdentifierType = AllowlistIdentifierType;
16 changes: 15 additions & 1 deletion packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
import type {
AllowlistIdentifierType,
BlocklistIdentifierType,
InvitationStatus,
OrganizationDomainVerificationStatus,
OrganizationDomainVerificationStrategy,
Expand All@@ -12,6 +14,7 @@ import type {
export const ObjectType = {
AccountlessApplication: 'accountless_application',
AllowlistIdentifier: 'allowlist_identifier',
BlocklistIdentifier: 'blocklist_identifier',
Client: 'client',
Cookies: 'cookies',
Email: 'email',
Expand DownExpand Up@@ -73,9 +76,20 @@ export interface AccountlessApplicationJSON extends ClerkResourceJSON {
export interface AllowlistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.AllowlistIdentifier;
identifier: string;
identifier_type: AllowlistIdentifierType;
instance_id?: string;
invitation_id?: string;
created_at: number;
updated_at: number;
}

export interface BlocklistIdentifierJSON extends ClerkResourceJSON {
object: typeof ObjectType.BlocklistIdentifier;
identifier: string;
identifier_type: BlocklistIdentifierType;
instance_id?: string;
created_at: number;
updated_at: number;
invitation_id?: string;
}

export interface ClientJSON extends ClerkResourceJSON {
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
export * from './AccountlessApplication';
export * from './AllowlistIdentifier';
export * from './BlocklistIdentifier';
export * from './Client';
export * from './Cookies';
export * from './DeletedObject';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -58,6 +58,7 @@ export type {
ClerkResourceJSON,
TokenJSON,
AllowlistIdentifierJSON,
BlocklistIdentifierJSON,
ClientJSON,
EmailJSON,
EmailAddressJSON,
Expand DownExpand Up@@ -96,6 +97,7 @@ export type {
export type {
AccountlessApplication,
AllowlistIdentifier,
BlocklistIdentifier,
Client,
EmailAddress,
ExternalAccount,
Expand Down