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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
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
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/little-lights-press.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
'@clerk/clerk-js': minor
'@clerk/backend': minor
'@clerk/shared': minor
---

Add `idpCertificateIssuedAt` and `idpCertificateExpiresAt` to SAML enterprise connections, exposing the IdP certificate validity window
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,8 @@ describe('EnterpriseConnectionAPI', () => {
idp_entity_id: 'https://idp.example.com',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: '-----BEGIN CERTIFICATE-----',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.example.com/metadata',
idp_metadata: '<xml/>',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand DownExpand Up@@ -205,6 +207,8 @@ describe('EnterpriseConnectionAPI', () => {
expect(response.samlConnection).not.toBeNull();
expect(response.samlConnection?.id).toBe('samlc_1');
expect(response.samlConnection?.idpEntityId).toBe('https://idp.example.com');
expect(response.samlConnection?.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.samlConnection?.idpCertificateExpiresAt).toBe(1704067200000);
expect(response.oauthConfig).not.toBeNull();
expect(response.oauthConfig?.clientId).toBe('client_abc');
expect(response.oauthConfig?.discoveryUrl).toBe('https://oauth.example.com/.well-known/openid-configuration');
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/__tests__/SamlConnectionApi.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,8 @@ describe('SamlConnectionAPI', () => {
idp_entity_id: 'entity_123',
idp_sso_url: 'https://idp.example.com/sso',
idp_certificate: 'cert_data',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: null,
idp_metadata: null,
attribute_mapping: {
Expand DownExpand Up@@ -70,6 +72,8 @@ describe('SamlConnectionAPI', () => {
expect(response.data[0].id).toBe('samlc_123');
expect(response.data[0].name).toBe('Test Connection');
expect(response.data[0].organizationId).toBe('org_123');
expect(response.data[0].idpCertificateIssuedAt).toBe(1672531200000);
expect(response.data[0].idpCertificateExpiresAt).toBe(1704067200000);
expect(response.totalCount).toBe(1);
});
});
Expand DownExpand Up@@ -114,6 +118,8 @@ describe('SamlConnectionAPI', () => {
expect(response.id).toBe('samlc_123');
expect(response.name).toBe('Test Connection');
expect(response.organizationId).toBe('org_123');
expect(response.idpCertificateIssuedAt).toBe(1672531200000);
expect(response.idpCertificateExpiresAt).toBe(1704067200000);
});
});

Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,10 @@ export class EnterpriseConnectionSamlConnection {
readonly idpSsoUrl: string,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. */
readonly idpMetadataUrl: string,
/** The XML content of the Identity Provider (IdP) metadata file. */
Expand All@@ -44,6 +48,8 @@ export class EnterpriseConnectionSamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -758,6 +758,8 @@ export interface EnterpriseConnectionSamlConnectionJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand DownExpand Up@@ -801,6 +803,8 @@ export interface SamlConnectionJSON extends ClerkResourceJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand Down
6 changes: 6 additions & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,6 +20,10 @@ export class SamlConnection {
readonly idpSsoUrl: string | null,
/** The X.509 certificate as provided by the Identity Provider (IdP). */
readonly idpCertificate: string | null,
/** The Unix timestamp when the Identity Provider (IdP) certificate was issued. */
readonly idpCertificateIssuedAt: number,
/** The Unix timestamp when the Identity Provider (IdP) certificate expires. */
readonly idpCertificateExpiresAt: number,
/** The URL which serves the Identity Provider (IdP) metadata. If present, it takes priority over the corresponding individual properties. */
readonly idpMetadataUrl: string | null,
/** The XML content of the Identity Provider (IdP) metadata file. If present, it takes priority over the corresponding individual properties. */
Expand DownExpand Up@@ -58,6 +62,8 @@ export class SamlConnection {
data.idp_entity_id,
data.idp_sso_url,
data.idp_certificate,
data.idp_certificate_issued_at,
data.idp_certificate_expires_at,
data.idp_metadata_url,
data.idp_metadata,
data.acs_url,
Expand Down
4 changes: 4 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,6 +19,8 @@ function samlNestedFromJSON(data: EnterpriseSamlConnectionNestedJSON): Enterpris
idpEntityId: data.idp_entity_id,
idpSsoUrl: data.idp_sso_url,
idpCertificate: data.idp_certificate,
idpCertificateIssuedAt: data.idp_certificate_issued_at,
idpCertificateExpiresAt: data.idp_certificate_expires_at,
idpMetadataUrl: data.idp_metadata_url,
idpMetadata: data.idp_metadata,
acsUrl: data.acs_url,
Expand All@@ -38,6 +40,8 @@ function samlNestedToJSON(data: EnterpriseSamlConnectionNestedResource): Enterpr
idp_entity_id: data.idpEntityId,
idp_sso_url: data.idpSsoUrl,
idp_certificate: data.idpCertificate,
idp_certificate_issued_at: data.idpCertificateIssuedAt,
idp_certificate_expires_at: data.idpCertificateExpiresAt,
idp_metadata_url: data.idpMetadataUrl,
idp_metadata: data.idpMetadata,
acs_url: data.acsUrl,
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -88,6 +88,8 @@ describe('Organization', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
2 changes: 2 additions & 0 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -102,6 +102,8 @@ describe('User', () => {
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_certificate_issued_at: 1672531200000,
idp_certificate_expires_at: 1704067200000,
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
Expand Down
21 changes: 21 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,20 +22,35 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
export type EnterpriseConnectionJSONSnapshot = EnterpriseConnectionJSON;

export interface EnterpriseConnectionResource extends ClerkResource {
/** The enterprise connection ID. */
id: string;
/** The display name of the connection. */
name: string;
/** Whether the enterprise connection is active. */
active: boolean;
/** The identity provider the connection uses (e.g. `saml_okta`, `oidc_custom`). */
provider: string;
/** The public URL of the identity provider's logo, or `null` when none is set. */
logoPublicUrl: string | null;
/** Domains associated with the enterprise connection. */
domains: string[];
/** Organization ID when the connection is linked to an organization, otherwise `null`. */
organizationId: string | null;
/** Whether user attributes are synced from the identity provider on each sign-in. */
syncUserAttributes: boolean;
/** Whether additional identification methods are disabled for users signing in through this connection. */
disableAdditionalIdentifications: boolean;
/** Whether this connection supports account linking via organization membership. */
allowOrganizationAccountLinking: boolean;
/** Custom attributes configured for the connection. */
customAttributes: unknown[];
/** The OAuth configuration, present when the enterprise connection uses OIDC, otherwise `null`. */
oauthConfig: EnterpriseOAuthConfigResource | null;
/** The SAML configuration, present when the enterprise connection uses SAML, otherwise `null`. */
samlConnection: EnterpriseSamlConnectionNestedResource | null;
/** The date when the connection was created. */
createdAt: Date | null;
/** The date when the connection was last updated. */
updatedAt: Date | null;
__internal_toSnapshot: () => EnterpriseConnectionJSONSnapshot;
}
Expand All@@ -47,6 +62,8 @@ export interface EnterpriseSamlConnectionNestedJSON {
idp_entity_id: string;
idp_sso_url: string;
idp_certificate: string;
idp_certificate_issued_at: number;
idp_certificate_expires_at: number;
idp_metadata_url: string;
idp_metadata: string;
acs_url: string;
Expand All@@ -64,6 +81,10 @@ export interface EnterpriseSamlConnectionNestedResource {
idpEntityId: string;
idpSsoUrl: string;
idpCertificate: string;
/** Unix timestamp (milliseconds) of the start of the IdP certificate validity window (X.509 NotBefore). */
idpCertificateIssuedAt: number;
/** Unix timestamp (milliseconds) of the end of the IdP certificate validity window (X.509 NotAfter). */
idpCertificateExpiresAt: number;
idpMetadataUrl: string;
idpMetadata: string;
acsUrl: string;
Expand Down
Loading