chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NicolasLopes7 merged 6 commits into from
Oct 13, 2025
Merged

chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b97894d
Add `enterprise_connection_id` to resources
LauraBeatris Oct 10, 2025
a858f86
Add changeset
LauraBeatris Oct 10, 2025
3a43aa2
add missing fields
NicolasLopes7 Oct 10, 2025
7a89291
Add `enterpriseConnectionId` to `SamlAccountResource`
LauraBeatris Oct 13, 2025
a911007
Update changeset
LauraBeatris Oct 13, 2025
e4f6ad0
Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`
LauraBeatris Oct 13, 2025
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
7 changes: 7 additions & 0 deletions .changeset/flat-teams-trade.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/JSON.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
verification: VerificationJSON | null;
saml_connection: SamlAccountConnectionJSON | null;
last_authenticated_at: number | null;
enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down
5 changes: 5 additions & 0 deletions packages/backend/src/api/resources/SamlAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
* The date when the SAML account was last authenticated.
*/
readonly lastAuthenticatedAt: number | null,
/**
* The ID of the enterprise connection associated with this SAML account.
*/
readonly enterpriseConnectionId: string | null,
) {}

static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
data.enterprise_connection_id,
Comment on lines 63 to +68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Add nullish coalescing for type safety and consistency.

Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.

Apply this diff to fix the inconsistency:

 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion

‼️IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

);
}
}
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
verification: VerificationResource | null = null;
enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
lastAuthenticatedAt: Date | null = null;
enterpriseConnectionId: string | null = null;

public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
this.lastName = data.last_name;
this.publicMetadata = data.public_metadata;
this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
this.enterpriseConnectionId = data.enterprise_connection_id;
if (data.verification) {
this.verification = new Verification(data.verification);
}
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
verification: this.verification?.__internal_toSnapshot() || null,
enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
enterprise_connection_id: this.enterpriseConnectionId,
};
}
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
syncUserAttributes!: boolean;
createdAt!: Date;
updatedAt!: Date;
enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.

constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
this.disableAdditionalIdentifications = data.disable_additional_identifications;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
this.enterpriseConnectionId = data.enterprise_connection_id;
}

return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
allow_subdomains: this.allowSubdomains,
allow_idp_initiated: this.allowIdpInitiated,
disable_additional_identifications: this.disableAdditionalIdentifications,
enterprise_connection_id: this.enterpriseConnectionId,
created_at: this.createdAt.getTime(),
updated_at: this.updatedAt.getTime(),
};
Expand Down
3 changes: 3 additions & 0 deletions packages/clerk-js/src/core/resources/SamlAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
verification: VerificationResource | null = null;
samlConnection: SamlAccountConnectionResource | null = null;
lastAuthenticatedAt: Date | null = null;
enterpriseConnectionId: string | null = null;

public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
this.emailAddress = data.email_address;
this.firstName = data.first_name;
this.lastName = data.last_name;
this.enterpriseConnectionId = data.enterprise_connection_id;

if (data.verification) {
this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
last_name: this.lastName,
verification: this.verification?.__internal_toSnapshot() || null,
saml_connection: this.samlConnection?.__internal_toSnapshot(),
enterprise_connection_id: this.enterpriseConnectionId,
last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
};
}
Expand Down
3 changes: 3 additions & 0 deletions packages/types/src/enterpriseAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
active: boolean;
emailAddress: string;
enterpriseConnection: EnterpriseAccountConnectionResource | null;
enterpriseConnectionId: string | null;
firstName: string | null;
lastName: string | null;
protocol: EnterpriseProtocol;
provider: EnterpriseProvider;
providerUserId: string | null;
publicMetadata: Record<string, unknown> | null;
verification: VerificationResource | null;
lastAuthenticatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
protocol: EnterpriseProtocol;
provider: EnterpriseProvider;
syncUserAttributes: boolean;
enterpriseConnectionId: string | null;
__internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}
3 changes: 3 additions & 0 deletions packages/types/src/json.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
public_metadata: Record<string, unknown>;
verification: VerificationJSON | null;
last_authenticated_at: number | null;
enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
sync_user_attributes: boolean;
created_at: number;
updated_at: number;
enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
verification?: VerificationJSON;
saml_connection?: SamlAccountConnectionJSON;
last_authenticated_at: number | null;
enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down
2 changes: 2 additions & 0 deletions packages/types/src/samlAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
lastName: string;
verification: VerificationResource | null;
samlConnection: SamlAccountConnectionResource | null;
lastAuthenticatedAt: Date | null;
enterpriseConnectionId: string | null;
__internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading

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

Skip to content
chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 6 commits into

from

Oct 13, 2025
 Merged


chore(clerk-js,types,backend): Add enterprise_connection_id to SamlAccount & EnterpriseAccount#6961
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
b97894d

Add `enterprise_connection_id` to resources


LauraBeatris Oct 10, 2025
a858f86

Add changeset


LauraBeatris Oct 10, 2025
3a43aa2

add missing fields


NicolasLopes7 Oct 10, 2025
7a89291

Add `enterpriseConnectionId` to `SamlAccountResource`


LauraBeatris Oct 13, 2025
a911007

Update changeset


LauraBeatris Oct 13, 2025
e4f6ad0

Add `enterpriseConnectionId` to `EnterpriseAccountConnectionResource`


LauraBeatris Oct 13, 2025

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


7 changes: 7 additions & 0 deletions
.changeset/flat-teams-trade.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': patch
'@clerk/backend': patch
'@clerk/types': patch
---

Add `enterpriseConnectionId` to `SamlAccount` and `EnterpriseAccount` resources

1 change: 1 addition & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -247,6 +247,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification: VerificationJSON | null;
 saml_connection: SamlAccountConnectionJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand Down

5 changes: 5 additions & 0 deletions
packages/backend/src/api/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -47,6 +47,10 @@ export class SamlAccount {
 * The date when the SAML account was last authenticated.
 */
 readonly lastAuthenticatedAt: number | null,
 /**
 * The ID of the enterprise connection associated with this SAML account.
 */
 readonly enterpriseConnectionId: string | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -61,6 +65,7 @@ export class SamlAccount {
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 data.last_authenticated_at ?? null,
 data.enterprise_connection_id,

Comment on lines

63
 to 
+68

@coderabbitaicoderabbitaiBotOct 13, 2025

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor
Add nullish coalescing for type safety and consistency.
Line 68 is missing the nullish coalescing operator (?? null) that's used on line 67 for lastAuthenticatedAt. If data.enterprise_connection_id is undefined, it will pass undefined to the constructor, but the type signature expects string | null. This creates a type safety gap and inconsistency with the established pattern.
Apply this diff to fix the inconsistency:
 data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at ?? null,
- data.enterprise_connection_id,+ data.enterprise_connection_id ?? null,
);
📝 Committable suggestion
‼️IMPORTANT

Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

data.last_authenticated_at??null,
data.enterprise_connection_id,
data.verification&&Verification.fromJSON(data.verification),
data.saml_connection&&SamlAccountConnection.fromJSON(data.saml_connection),
data.last_authenticated_at??null,
data.enterprise_connection_id??null,
);
🤖 Prompt for AI Agents
In packages/backend/src/api/resources/SamlAccount.ts around lines 67 to 68, the
constructor argument for enterprise_connection_id is missing nullish coalescing;
change the value passed from data.enterprise_connection_id to
data.enterprise_connection_id ?? null so it matches the pattern used for
last_authenticated_at and ensures the constructor receives string | null rather
than possibly undefined.

 );
 }
}

6 changes: 6 additions & 0 deletions
packages/clerk-js/src/core/resources/EnterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: VerificationResource | null = null;
 enterpriseConnection: EnterpriseAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: EnterpriseAccountJSON | EnterpriseAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -48,6 +49,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 this.lastName = data.last_name;
 this.publicMetadata = data.public_metadata;
 this.lastAuthenticatedAt = data.last_authenticated_at ? unixEpochToDate(data.last_authenticated_at) : null;
 this.enterpriseConnectionId = data.enterprise_connection_id;
 if (data.verification) {
 this.verification = new Verification(data.verification);
 }
Expand All@@ -74,6 +76,7 @@ export class EnterpriseAccount extends BaseResource implements EnterpriseAccount
 verification: this.verification?.__internal_toSnapshot() || null,
 enterprise_connection: this.enterpriseConnection?.__internal_toSnapshot() || null,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 enterprise_connection_id: this.enterpriseConnectionId,
 };
 }
}
Expand All@@ -92,6 +95,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 syncUserAttributes!: boolean;
 createdAt!: Date;
 updatedAt!: Date;
 enterpriseConnectionId: string | null = '';
Comment thread
coderabbitai[bot] marked this conversation as resolved.


 constructor(data: EnterpriseAccountConnectionJSON | EnterpriseAccountConnectionJSONSnapshot | null) {
 super();
Expand All@@ -112,6 +116,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 this.enterpriseConnectionId = data.enterprise_connection_id;
 }

 return this;
Expand All@@ -131,6 +136,7 @@ export class EnterpriseAccountConnection extends BaseResource implements Enterpr
 allow_subdomains: this.allowSubdomains,
 allow_idp_initiated: this.allowIdpInitiated,
 disable_additional_identifications: this.disableAdditionalIdentifications,
 enterprise_connection_id: this.enterpriseConnectionId,
 created_at: this.createdAt.getTime(),
 updated_at: this.updatedAt.getTime(),
 };
Expand Down

3 changes: 3 additions & 0 deletions
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -24,6 +24,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;
 lastAuthenticatedAt: Date | null = null;
 enterpriseConnectionId: string | null = null;

 public constructor(data: Partial<SamlAccountJSON | SamlAccountJSONSnapshot>, pathRoot: string);
 public constructor(data: SamlAccountJSON | SamlAccountJSONSnapshot, pathRoot: string) {
Expand All@@ -44,6 +45,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.emailAddress = data.email_address;
 this.firstName = data.first_name;
 this.lastName = data.last_name;
 this.enterpriseConnectionId = data.enterprise_connection_id;

 if (data.verification) {
 this.verification = new Verification(data.verification);
Expand All@@ -70,6 +72,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 last_name: this.lastName,
 verification: this.verification?.__internal_toSnapshot() || null,
 saml_connection: this.samlConnection?.__internal_toSnapshot(),
 enterprise_connection_id: this.enterpriseConnectionId,
 last_authenticated_at: this.lastAuthenticatedAt ? this.lastAuthenticatedAt.getTime() : null,
 };
 }
Expand Down

3 changes: 3 additions & 0 deletions
packages/types/src/enterpriseAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,13 +12,15 @@ export interface EnterpriseAccountResource extends ClerkResource {
 active: boolean;
 emailAddress: string;
 enterpriseConnection: EnterpriseAccountConnectionResource | null;
 enterpriseConnectionId: string | null;
 firstName: string | null;
 lastName: string | null;
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 providerUserId: string | null;
 publicMetadata: Record<string, unknown> | null;
 verification: VerificationResource | null;
 lastAuthenticatedAt: Date | null;
 __internal_toSnapshot: () => EnterpriseAccountJSONSnapshot;
}

Expand All@@ -33,5 +35,6 @@ export interface EnterpriseAccountConnectionResource extends ClerkResource {
 protocol: EnterpriseProtocol;
 provider: EnterpriseProvider;
 syncUserAttributes: boolean;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => EnterpriseAccountConnectionJSONSnapshot;
}

3 changes: 3 additions & 0 deletions
packages/types/src/json.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -253,6 +253,7 @@ export interface EnterpriseAccountJSON extends ClerkResourceJSON {
 public_metadata: Record<string, unknown>;
 verification: VerificationJSON | null;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
Expand All@@ -268,6 +269,7 @@ export interface EnterpriseAccountConnectionJSON extends ClerkResourceJSON {
 sync_user_attributes: boolean;
 created_at: number;
 updated_at: number;
 enterprise_connection_id: string | null;
}

export interface SamlAccountJSON extends ClerkResourceJSON {
Expand All@@ -281,6 +283,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
 verification?: VerificationJSON;
 saml_connection?: SamlAccountConnectionJSON;
 last_authenticated_at: number | null;
 enterprise_connection_id: string | null;
}

export interface UserJSON extends ClerkResourceJSON {
Expand Down

2 changes: 2 additions & 0 deletions
packages/types/src/samlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,5 +13,7 @@ export interface SamlAccountResource extends ClerkResource {
 lastName: string;
 verification: VerificationResource | null;
 samlConnection: SamlAccountConnectionResource | null;
 lastAuthenticatedAt: Date | null;
 enterpriseConnectionId: string | null;
 __internal_toSnapshot: () => SamlAccountJSONSnapshot;
}
Loading