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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(backend): Add enterprise connection resource by LauraBeatris · Pull Request #8017 · clerk/javascript · GitHub
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
5 changes: 5 additions & 0 deletions .changeset/slick-berries-tie.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/backend': minor
---

Add `EnterpriseConnection` resource, allowing to create both OIDC and SAML connections
106 changes: 106 additions & 0 deletions packages/backend/src/api/endpoints/EnterpriseConnectionApi.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
import type { ClerkPaginationRequest } from '@clerk/shared/types';

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

const basePath = '/enterprise_connections';

type EnterpriseConnectionListParams = ClerkPaginationRequest<{
organizationId?: string;
active?: boolean;
}>;

export interface EnterpriseConnectionOidcParams {
authUrl?: string;
clientId?: string;
clientSecret?: string;
discoveryUrl?: string;
requiresPkce?: boolean;
tokenUrl?: string;
userInfoUrl?: string;
}

export interface EnterpriseConnectionSamlAttributeMappingParams {
userId?: string | null;
emailAddress?: string | null;
firstName?: string | null;
lastName?: string | null;
}

export interface EnterpriseConnectionSamlParams {
allowIdpInitiated?: boolean;
allowSubdomains?: boolean;
attributeMapping?: EnterpriseConnectionSamlAttributeMappingParams;
forceAuthn?: boolean;
idpCertificate?: string;
idpEntityId?: string;
idpMetadata?: string;
idpMetadataUrl?: string;
idpSsoUrl?: string;
}

type CreateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

type UpdateEnterpriseConnectionParams = {
name?: string;
domains?: string[];
organizationId?: string;
active?: boolean;
syncUserAttributes?: boolean;
provider?: string;
oidc?: EnterpriseConnectionOidcParams;
saml?: EnterpriseConnectionSamlParams;
};

export class EnterpriseConnectionAPI extends AbstractAPI {
public async createEnterpriseConnection(params: CreateEnterpriseConnectionParams) {
return this.request<EnterpriseConnection>({
method: 'POST',
path: basePath,
bodyParams: params,
});
}

public async updateEnterpriseConnection(enterpriseConnectionId: string, params: UpdateEnterpriseConnectionParams) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'PATCH',
path: joinPaths(basePath, enterpriseConnectionId),
bodyParams: params,
});
}

public async getEnterpriseConnectionList(params: EnterpriseConnectionListParams = {}) {
return this.request<PaginatedResourceResponse<EnterpriseConnection[]>>({
method: 'GET',
path: basePath,
queryParams: params,
});
}

public async getEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'GET',
path: joinPaths(basePath, enterpriseConnectionId),
});
}

public async deleteEnterpriseConnection(enterpriseConnectionId: string) {
this.requireId(enterpriseConnectionId);
return this.request<EnterpriseConnection>({
method: 'DELETE',
path: joinPaths(basePath, enterpriseConnectionId),
});
}
}
1 change: 1 addition & 0 deletions packages/backend/src/api/endpoints/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export * from './BlocklistIdentifierApi';
export * from './ClientApi';
export * from './DomainApi';
export * from './EmailAddressApi';
export * from './EnterpriseConnectionApi';
export * from './IdPOAuthAccessTokenApi';
export * from './InstanceApi';
export * from './InvitationApi';
Expand Down
8 changes: 7 additions & 1 deletion packages/backend/src/api/factory.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ import {
ClientAPI,
DomainAPI,
EmailAddressAPI,
EnterpriseConnectionAPI,
IdPOAuthAccessTokenApi,
InstanceAPI,
InvitationAPI,
Expand DownExpand Up@@ -67,6 +68,7 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
clients: new ClientAPI(request),
domains: new DomainAPI(request),
emailAddresses: new EmailAddressAPI(request),
enterpriseConnections: new EnterpriseConnectionAPI(request),
idPOAuthAccessToken: new IdPOAuthAccessTokenApi(
buildRequest({
...options,
Expand DownExpand Up@@ -96,13 +98,17 @@ export function createBackendApiClient(options: CreateBackendApiOptions) {
phoneNumbers: new PhoneNumberAPI(request),
proxyChecks: new ProxyCheckAPI(request),
redirectUrls: new RedirectUrlAPI(request),
samlConnections: new SamlConnectionAPI(request),
sessions: new SessionAPI(request),
signInTokens: new SignInTokenAPI(request),
signUps: new SignUpAPI(request),
testingTokens: new TestingTokenAPI(request),
users: new UserAPI(request),
waitlistEntries: new WaitlistEntryAPI(request),
webhooks: new WebhookAPI(request),

/**
* @deprecated Use `enterpriseConnections` instead.
*/
samlConnections: new SamlConnectionAPI(request),
};
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/Deserializer.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import {
Domain,
Email,
EmailAddress,
EnterpriseConnection,
IdPOAuthAccessToken,
Instance,
InstanceRestrictions,
Expand DownExpand Up@@ -193,6 +194,8 @@ function jsonToObject(item: any): any {
return ProxyCheck.fromJSON(item);
case ObjectType.RedirectUrl:
return RedirectUrl.fromJSON(item);
case ObjectType.EnterpriseConnection:
return EnterpriseConnection.fromJSON(item);
case ObjectType.SamlConnection:
return SamlConnection.fromJSON(item);
case ObjectType.SignInToken:
Expand Down
64 changes: 64 additions & 0 deletions packages/backend/src/api/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
import type { EnterpriseConnectionJSON } from './JSON';

/**
* The Backend `EnterpriseConnection` object holds information about an enterprise connection (SAML or OAuth) for an instance or organization.
*/
export class EnterpriseConnection {
constructor(
/**
* The unique identifier for the connection.
*/
readonly id: string,
/**
* The name to use as a label for the connection.
*/
readonly name: string,
/**
* The domain of the enterprise. Sign-in flows using an email with this domain may use the connection.
*/
readonly domains: Array<string>,
/**
* The Organization ID if the connection is scoped to an organization.
*/
readonly organizationId: string | null,
/**
* Indicates whether the connection is active or not.
*/
readonly active: boolean,
/**
* Indicates whether the connection syncs user attributes between the IdP and Clerk or not.
*/
readonly syncUserAttributes: boolean,
/**
* Indicates whether users with an email address subdomain are allowed to use this connection or not.
*/
readonly allowSubdomains: boolean,
/**
* Indicates whether additional identifications are disabled for this connection.
*/
readonly disableAdditionalIdentifications: boolean,
/**
* The date when the connection was first created.
*/
readonly createdAt: number,
/**
* The date when the connection was last updated.
*/
readonly updatedAt: number,
) {}

static fromJSON(data: EnterpriseConnectionJSON): EnterpriseConnection {
return new EnterpriseConnection(
data.id,
data.name,
data.domains,
data.organization_id,
data.active,
data.sync_user_attributes,
data.allow_subdomains,
data.disable_additional_identifications,
data.created_at,
data.updated_at,
);
}
}
39 changes: 39 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,6 +27,7 @@ export const ObjectType = {
Cookies: 'cookies',
Domain: 'domain',
Email: 'email',
EnterpriseConnection: 'enterprise_connection',
EmailAddress: 'email_address',
ExternalAccount: 'external_account',
FacebookAccount: 'facebook_account',
Expand DownExpand Up@@ -670,6 +671,44 @@ export interface PaginatedResponseJSON {
total_count?: number;
}

export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.EnterpriseConnection;
name: string;
domains: string[];
organization_id: string | null;
active: boolean;
sync_user_attributes: boolean;
allow_subdomains: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
saml_connection?: Pick<
SamlConnectionJSON,
| 'id'
| 'name'
| 'idp_entity_id'
| 'idp_sso_url'
| 'idp_certificate'
| 'idp_metadata_url'
| 'idp_metadata'
| 'acs_url'
| 'sp_entity_id'
| 'sp_metadata_url'
| 'sync_user_attributes'
| 'allow_subdomains'
| 'allow_idp_initiated'
>;
oauth_config?: {
id: string;
name: string;
client_id: string;
discovery_url: string;
logo_public_url: string;
created_at: number;
updated_at: number;
};
}

export interface SamlConnectionJSON extends ClerkResourceJSON {
object: typeof ObjectType.SamlConnection;
name: string;
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/SamlConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,6 +2,7 @@ import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';

/**
* The Backend `SamlConnection` object holds information about a SAML connection for an organization.
* @deprecated Use `EnterpriseConnection` instead.
*/
export class SamlConnection {
constructor(
Expand Down
1 change: 1 addition & 0 deletions packages/backend/src/api/resources/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,7 @@ export type { SignUpStatus } from '@clerk/shared/types';
export * from './CommercePlan';
export * from './CommerceSubscription';
export * from './CommerceSubscriptionItem';
export * from './EnterpriseConnection';
export * from './ExternalAccount';
export * from './Feature';
export * from './IdentificationLink';
Expand Down
2 changes: 2 additions & 0 deletions packages/backend/src/index.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,7 @@ export type {
DomainJSON,
EmailJSON,
EmailAddressJSON,
EnterpriseConnectionJSON,
ExternalAccountJSON,
IdentificationLinkJSON,
InstanceJSON,
Expand DownExpand Up@@ -121,6 +122,7 @@ export type {
CnameTarget,
Domain,
EmailAddress,
EnterpriseConnection,
ExternalAccount,
Feature,
Instance,
Expand Down
Loading