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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } 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
23 changes: 23 additions & 0 deletions .changeset/deprecate-update-organization-metadata.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
---
'@clerk/backend': minor
---

Add `clerkClient.organizations.replaceOrganizationMetadata(organizationId, params)` for replacing an organization's metadata fields in full.

Use `replaceOrganizationMetadata` when the provided metadata should become the complete value for that metadata field:

```ts
await clerkClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { plan: 'pro' },
});
```

Use `clerkClient.organizations.updateOrganizationMetadata(organizationId, params)` when you want to partially update metadata with deep-merge semantics:

```ts
await clerkClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { onboardingComplete: true },
});
```

The `publicMetadata` and `privateMetadata` parameters on `clerkClient.organizations.updateOrganization()` are now deprecated. They continue to work, but new code should use `updateOrganizationMetadata()` for partial updates or `replaceOrganizationMetadata()` for full replacement.
202 changes: 184 additions & 18 deletions packages/backend/src/api/__tests__/OrganizationApi.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
import { http, HttpResponse } from 'msw';
import { describe, expect, expectTypeOf, it } from 'vitest';
import { describe, expect, expectTypeOf, it, vi } from 'vitest';

import { server, validateHeaders } from '../../mock-server';
import { createBackendApiClient } from '../factory';
Expand All@@ -14,29 +14,199 @@ describe('OrganizationAPI', () => {

const organizationId = 'org_123';

const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
const mockOrgResponse = {
object: 'organization',
id: organizationId,
name: 'Test Org',
slug: 'test-org',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

describe('updateOrganization', () => {
it('calls PATCH /organizations/{id} when no metadata fields are provided', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, { name: 'New Name' });

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(response.id).toBe(organizationId);
});

it('routes metadata to PUT /organizations/{id}/metadata when only metadata is provided', async () => {
const patchHandler = vi.fn(() => HttpResponse.json(mockOrgResponse));
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { foo: 'bar' },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { foo: 'bar' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
publicMetadata: { foo: 'bar' },
});

expect(patchHandler).not.toHaveBeenCalled();
expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ foo: 'bar' });
});

it('splits mixed calls: PATCH for non-metadata, then PUT for metadata', async () => {
const calls: string[] = [];

const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('patch');
const body = await request.json();
expect(body).toEqual({ name: 'New Name' });
return HttpResponse.json(mockOrgResponse);
});

const putHandler = vi.fn(async ({ request }: { request: Request }) => {
calls.push('put');
const body = await request.json();
expect(body).toEqual({
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
return HttpResponse.json({
...mockOrgResponse,
name: 'New Name',
public_metadata: { plan: 'pro' },
private_metadata: { invoice: 'inv_1' },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}`, validateHeaders(patchHandler)),
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.updateOrganization(organizationId, {
name: 'New Name',
publicMetadata: { plan: 'pro' },
privateMetadata: { invoice: 'inv_1' },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
expect(putHandler).toHaveBeenCalledTimes(1);
expect(calls).toEqual(['patch', 'put']);
expect(response.name).toBe('New Name');
expect(response.publicMetadata).toEqual({ plan: 'pro' });
});

it('passes only metadata fields that were explicitly provided to PUT', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = (await request.json()) as Record<string, unknown>;
expect(body.private_metadata).toEqual({ secret: 'value' });
expect(body).not.toHaveProperty('public_metadata');
return HttpResponse.json({
...mockOrgResponse,
private_metadata: { secret: 'value' },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

await apiClient.organizations.updateOrganization(organizationId, {
privateMetadata: { secret: 'value' },
});

expect(putHandler).toHaveBeenCalledTimes(1);
});
});

describe('updateOrganizationMetadata', () => {
it('still hits PATCH /organizations/{id}/metadata (unchanged)', async () => {
const patchHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { merge: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { merge: true },
});
});

server.use(
http.patch(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(patchHandler)),
);

await apiClient.organizations.updateOrganizationMetadata(organizationId, {
publicMetadata: { merge: true },
});

expect(patchHandler).toHaveBeenCalledTimes(1);
});
});

describe('replaceOrganizationMetadata', () => {
it('hits PUT /organizations/{id}/metadata', async () => {
const putHandler = vi.fn(async ({ request }: { request: Request }) => {
const body = await request.json();
expect(body).toEqual({
public_metadata: { replaced: true },
});
return HttpResponse.json({
...mockOrgResponse,
public_metadata: { replaced: true },
});
});

server.use(
http.put(`https://api.clerk.test/v1/organizations/${organizationId}/metadata`, validateHeaders(putHandler)),
);

const response = await apiClient.organizations.replaceOrganizationMetadata(organizationId, {
publicMetadata: { replaced: true },
});

expect(putHandler).toHaveBeenCalledTimes(1);
expect(response.publicMetadata).toEqual({ replaced: true });
});
});

describe('createOrganizationInvitationBulk', () => {
const mockInvitation = {
object: 'organization_invitation',
id: 'orginv_1',
email_address: 'one@example.com',
role: 'org:member',
role_name: 'Member',
organization_id: organizationId,
status: 'pending',
public_metadata: {},
private_metadata: {},
url: null,
created_at: 1640995200,
updated_at: 1640995200,
expires_at: 1643673600,
};

it('returns a paginated { data, totalCount } response matching the Backend API shape', async () => {
server.use(
http.post(
`https://api.clerk.test/v1/organizations/${organizationId}/invitations/bulk`,
validateHeaders(async ({ request }) => {
// The SDK should forward the invitations as a snake_cased array body.
const body = (await request.json()) as Array<Record<string, unknown>>;
expect(body).toHaveLength(2);
expect(body[0]).toMatchObject({
Expand All@@ -58,15 +228,11 @@ describe('OrganizationAPI', () => {
{ emailAddress: 'two@example.com', role: 'org:member', inviterUserId: 'user_1' },
]);

// The Backend API wraps bulk results in a paginated envelope, and the
// deserializer surfaces it as `{ data, totalCount }`.
expect(response.data).toHaveLength(2);
expect(response.data[0].emailAddress).toBe('one@example.com');
expect(response.data[0].organizationId).toBe(organizationId);
expect(response.totalCount).toBe(2);

// The declared return type must reflect that paginated shape, the same
// way the sibling `getOrganizationInvitationList` does.
expectTypeOf(response).toEqualTypeOf<PaginatedResourceResponse<OrganizationInvitation[]>>();
});
});
Expand Down
70 changes: 66 additions & 4 deletions packages/backend/src/api/endpoints/OrganizationApi.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { ClerkPaginationRequest, OrganizationEnrollmentMode } from '@clerk/

import { runtime } from '../../runtime';
import { joinPaths } from '../../util/path';
import { deprecated } from '../../util/shared';
import type {
Organization,
OrganizationDomain,
Expand DownExpand Up@@ -45,7 +46,25 @@ type UpdateParams = {
slug?: string;
adminDeleteEnabled?: boolean;
maxAllowedMemberships?: number;
} & MetadataParams;

/**
* Metadata visible to your Frontend and Backend APIs.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
publicMetadata?: OrganizationPublicMetadata;

/**
* Metadata visible only to your Backend API.
*
* @deprecated Updating metadata via `updateOrganization` is deprecated. Use
* `updateOrganizationMetadata` for partial updates (deep merge) or
* `replaceOrganizationMetadata` for full replacement.
*/
privateMetadata?: OrganizationPrivateMetadata;
};

type UpdateLogoParams = {
file: Blob | File;
Expand DownExpand Up@@ -256,10 +275,38 @@ export class OrganizationAPI extends AbstractAPI {

public async updateOrganization(organizationId: string, params: UpdateParams) {
this.requireId(organizationId);

const { publicMetadata, privateMetadata, ...rest } = params;
const hasMetadata = publicMetadata !== undefined || privateMetadata !== undefined;
const hasRest = Object.keys(rest).length > 0;

if (hasMetadata) {
deprecated(
'updateOrganization(organizationId, { publicMetadata | privateMetadata })',
'Use updateOrganizationMetadata for partial updates (merge) or replaceOrganizationMetadata for full replacement.',
);
}

if (!hasMetadata) {
return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
}

if (hasRest) {
await this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: rest,
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

return this.request<Organization>({
method: 'PATCH',
path: joinPaths(basePath, organizationId),
bodyParams: params,
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: { publicMetadata, privateMetadata },
});
}

Expand DownExpand Up@@ -298,6 +345,21 @@ export class OrganizationAPI extends AbstractAPI {
});
}

/**
* Replace an organization's metadata. Supplied fields are overwritten in full;
* fields omitted from `params` are left unchanged. Prefer
* `updateOrganizationMetadata` for partial updates with deep-merge semantics.
*/
public async replaceOrganizationMetadata(organizationId: string, params: MetadataParams) {
this.requireId(organizationId);

return this.request<Organization>({
method: 'PUT',
path: joinPaths(basePath, organizationId, 'metadata'),
bodyParams: params,
});
}

public async deleteOrganization(organizationId: string) {
return this.request<Organization>({
method: 'DELETE',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,7 @@ export const API_VERSION = 'v1';

export const USER_AGENT = `${PACKAGE_NAME}@${PACKAGE_VERSION}`;
export const MAX_CACHE_LAST_UPDATED_AT_SECONDS = 5 * 60;
export const SUPPORTED_BAPI_VERSION = '2025-11-10';
export const SUPPORTED_BAPI_VERSION = '2026-05-12';

const Attributes = {
AuthToken: '__clerkAuthToken',
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/tokens/__tests__/handshake.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -447,7 +447,7 @@ describe('HandshakeService', () => {

// Verify all required parameters are present
expect(url.searchParams.get('redirect_url')).toBeDefined();
expect(url.searchParams.get('__clerk_api_version')).toBe('2025-11-10');
expect(url.searchParams.get('__clerk_api_version')).toBe('2026-05-12');
expect(url.searchParams.get(constants.QueryParameters.SuffixedCookies)).toMatch(/^(true|false)$/);
expect(url.searchParams.get(constants.QueryParameters.HandshakeReason)).toBe('test-reason');
});
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/internal/clerk-js/constants.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,7 +62,7 @@ export const SIGN_UP_MODES = {
} satisfies Record<string, SignUpModes>;

// This is the currently supported version of the Frontend API
export const SUPPORTED_FAPI_VERSION = '2025-11-10';
export const SUPPORTED_FAPI_VERSION = '2026-05-12';

export const CAPTCHA_ELEMENT_ID = 'clerk-captcha';
export const CAPTCHA_INVISIBLE_CLASSNAME = 'clerk-invisible-captcha';
Loading