feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
NicolasLopes7 merged 1 commit into from
Sep 25, 2024
Merged

feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection #4211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changeset/fresh-forks-talk.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
---
"@clerk/clerk-js": patch
"@clerk/backend": patch
"@clerk/types": patch
---

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.
15 changes: 15 additions & 0 deletions packages/backend/src/api/resources/JSON.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -114,6 +114,7 @@ export interface SamlAccountJSON extends ClerkResourceJSON {
first_name: string;
last_name: string;
verification: VerificationJSON | null;
saml_connection: SamlAccountConnectionJSON | null;
}

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
created_at: number;
updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
id: string;
name: string;
domain: string;
active: boolean;
provider: string;
sync_user_attributes: boolean;
allow_subdomains: boolean;
allow_idp_initiated: boolean;
disable_additional_identifications: boolean;
created_at: number;
updated_at: number;
}
3 changes: 3 additions & 0 deletions packages/backend/src/api/resources/SamlAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
readonly firstName: string,
readonly lastName: string,
readonly verification: Verification | null,
readonly samlConnection: SamlAccountConnection | null,
) {}

static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
data.first_name,
data.last_name,
data.verification && Verification.fromJSON(data.verification),
data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
);
}
}
31 changes: 30 additions & 1 deletion packages/backend/src/api/resources/SamlConnection.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
}
}

export class SamlAccountConnection {
constructor(
readonly id: string,
readonly name: string,
readonly domain: string,
readonly active: boolean,
readonly provider: string,
readonly syncUserAttributes: boolean,
readonly allowSubdomains: boolean,
readonly allowIdpInitiated: boolean,
readonly createdAt: number,
readonly updatedAt: number,
) {}
static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
return new SamlAccountConnection(
data.id,
data.name,
data.domain,
data.active,
data.provider,
data.sync_user_attributes,
data.allow_subdomains,
data.allow_idp_initiated,
data.created_at,
data.updated_at,
);
}
}

class AttributeMapping {
constructor(
readonly userId: string,
Expand Down
2 changes: 1 addition & 1 deletion packages/clerk-js/bundlewatch.config.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"files": [
{ "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
{ "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
{ "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
{ "path": "./dist/ui-common*.js", "maxSize": "86KB" },
{ "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down
51 changes: 50 additions & 1 deletion packages/clerk-js/src/core/resources/SamlAccount.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
SamlAccountConnectionJSON,
SamlAccountConnectionResource,
SamlAccountJSON,
SamlAccountResource,
SamlIdpSlug,
VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
firstName = '';
lastName = '';
verification: VerificationResource | null = null;
samlConnection: SamlAccountConnectionResource | null = null;

public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
this.verification = new Verification(data.verification);
}

if (data.saml_connection) {
this.samlConnection = new SamlAccountConnection(data.saml_connection);
}

return this;
}
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
id!: string;
name!: string;
domain!: string;
active!: boolean;
provider!: string;
syncUserAttributes!: boolean;
allowSubdomains!: boolean;
allowIdpInitiated!: boolean;
disableAdditionalIdentifications!: boolean;
createdAt!: Date;
updatedAt!: Date;

constructor(data: SamlAccountConnectionJSON | null) {
super();
this.fromJSON(data);
}
protected fromJSON(data: SamlAccountConnectionJSON | null): this {
if (data) {
this.id = data.id;
this.name = data.name;
this.domain = data.domain;
this.active = data.active;
this.provider = data.provider;
this.syncUserAttributes = data.sync_user_attributes;
this.allowSubdomains = data.allow_subdomains;
this.allowIdpInitiated = data.allow_idp_initiated;
this.disableAdditionalIdentifications = data.disable_additional_identifications;
this.createdAt = unixEpochToDate(data.created_at);
this.updatedAt = unixEpochToDate(data.updated_at);
}

return this;
}
}
15 changes: 11 additions & 4 deletions packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
const { attributes, saml, social } = useEnvironment().userSettings;
const card = useCardState();
const { user } = useUser();

const showUsername = attributes.username.enabled;
const showEmail = attributes.email_address.enabled;
const showPhone = attributes.phone_number.enabled;
const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
const showWeb3 = attributes.web3_wallet.enabled;

const shouldAllowIdentificationCreation =
!showSamlAccounts ||
!user?.samlAccounts?.some(
samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
);

return (
<Col
elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

<UserProfileSection />
{showUsername && <UsernameSection />}
{showEmail && <EmailsSection />}
{showPhone && <PhoneSection />}
{showConnectedAccounts && <ConnectedAccountsSection />}
{showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
{showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
{showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
{showSamlAccounts && <EnterpriseAccountsSection />}
{showWeb3 && <Web3Section />}
{showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
</Col>
</Col>
);
Expand Down
70 changes: 36 additions & 34 deletions packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
const { user } = useUser();
const card = useCardState();

if (!user) {
return null;
}

const accounts = [
...user.verifiedExternalAccounts,
...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
];
export const ConnectedAccountsSection = withCardStateProvider(
({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
const { user } = useUser();
const card = useCardState();
const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
return null;
}

return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
centered={false}
id='connectedAccounts'
>
<Card.Alert>{card.error}</Card.Alert>
<Action.Root>
<ProfileSection.ItemList id='connectedAccounts'>
{accounts.map(account => (
<ConnectedAccount
key={account.id}
account={account}
/>
))}
</ProfileSection.ItemList>

<AddConnectedAccount />
</Action.Root>
</ProfileSection.Root>
);
});
const accounts = [
...user.verifiedExternalAccounts,
...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
];

return (
<ProfileSection.Root
title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
centered={false}
id='connectedAccounts'
>
<Card.Alert>{card.error}</Card.Alert>
<Action.Root>
<ProfileSection.ItemList id='connectedAccounts'>
{accounts.map(account => (
<ConnectedAccount
key={account.id}
account={account}
/>
))}
</ProfileSection.ItemList>
{shouldAllowCreation && <AddConnectedAccount />}
</Action.Root>
</ProfileSection.Root>
);
},
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down
30 changes: 16 additions & 14 deletions packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
);
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
const { user } = useUser();

return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
</Action.Open>
</Action.Root>
))}

<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='emailAddresses'
localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
/>
</Action.Trigger>

<Action.Open value='add'>
<Action.Card>
<EmailScreen />
</Action.Card>
</Action.Open>
{shouldAllowCreation && (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='emailAddresses'
localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<EmailScreen />
</Action.Card>
</Action.Open>
</>
)}
</ProfileSection.ItemList>
</Action.Root>
</ProfileSection.Root>
Expand Down
35 changes: 21 additions & 14 deletions packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
);
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
const { user } = useUser();
const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

if (!shouldAllowCreation && !hasPhoneNumbers) {
return null;
}

return (
<ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
</Action.Open>
</Action.Root>
))}

<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='phoneNumbers'
localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
/>
</Action.Trigger>

<Action.Open value='add'>
<Action.Card>
<PhoneScreen />
</Action.Card>
</Action.Open>
{shouldAllowCreation && (
<>
<Action.Trigger value='add'>
<ProfileSection.ArrowButton
id='phoneNumbers'
localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
/>
</Action.Trigger>
<Action.Open value='add'>
<Action.Card>
<PhoneScreen />
</Action.Card>
</Action.Open>
</>
)}
</ProfileSection.ItemList>
</Action.Root>
</ProfileSection.Root>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading

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

Skip to content
feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection#4211

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

NicolasLopes7
merged 1 commit into

from

Sep 25, 2024
 Merged


feat(clerk-js,backend,types): Implement "disable additional identifiers" for SAML connection
#4211
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 7 additions & 0 deletions
.changeset/fresh-forks-talk.md

View file


Open in desktop

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

Conditionally renders identification sections on `UserProfile` based on the SAML connection configuration for disabling additional identifiers.

15 changes: 15 additions & 0 deletions
packages/backend/src/api/resources/JSON.ts

View file


Open in desktop

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

export interface IdentificationLinkJSON extends ClerkResourceJSON {
Expand DownExpand Up@@ -399,3 +400,17 @@ export interface PermissionJSON extends ClerkResourceJSON {
 created_at: number;
 updated_at: number;
}

export interface SamlAccountConnectionJSON extends ClerkResourceJSON {
 id: string;
 name: string;
 domain: string;
 active: boolean;
 provider: string;
 sync_user_attributes: boolean;
 allow_subdomains: boolean;
 allow_idp_initiated: boolean;
 disable_additional_identifications: boolean;
 created_at: number;
 updated_at: number;
}

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
import type { SamlAccountJSON } from './JSON';
import { SamlAccountConnection } from './SamlConnection';
import { Verification } from './Verification';

export class SamlAccount {
Expand All@@ -11,6 +12,7 @@ export class SamlAccount {
 readonly firstName: string,
 readonly lastName: string,
 readonly verification: Verification | null,
 readonly samlConnection: SamlAccountConnection | null,
 ) {}

 static fromJSON(data: SamlAccountJSON): SamlAccount {
Expand All@@ -23,6 +25,7 @@ export class SamlAccount {
 data.first_name,
 data.last_name,
 data.verification && Verification.fromJSON(data.verification),
 data.saml_connection && SamlAccountConnection.fromJSON(data.saml_connection),
 );
 }
}

31 changes: 30 additions & 1 deletion
packages/backend/src/api/resources/SamlConnection.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { AttributeMappingJSON, SamlConnectionJSON } from './JSON';
import type { AttributeMappingJSON, SamlAccountConnectionJSON, SamlConnectionJSON } from './JSON';

export class SamlConnection {
 constructor(
Expand DownExpand Up@@ -49,6 +49,35 @@ export class SamlConnection {
 }
}

export class SamlAccountConnection {
 constructor(
 readonly id: string,
 readonly name: string,
 readonly domain: string,
 readonly active: boolean,
 readonly provider: string,
 readonly syncUserAttributes: boolean,
 readonly allowSubdomains: boolean,
 readonly allowIdpInitiated: boolean,
 readonly createdAt: number,
 readonly updatedAt: number,
 ) {}
 static fromJSON(data: SamlAccountConnectionJSON): SamlAccountConnection {
 return new SamlAccountConnection(
 data.id,
 data.name,
 data.domain,
 data.active,
 data.provider,
 data.sync_user_attributes,
 data.allow_subdomains,
 data.allow_idp_initiated,
 data.created_at,
 data.updated_at,
 );
 }
}

class AttributeMapping {
 constructor(
 readonly userId: string,
Expand Down

2 changes: 1 addition & 1 deletion
packages/clerk-js/bundlewatch.config.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
 "files": [
 { "path": "./dist/clerk.browser.js", "maxSize": "64.1kB" },
 { "path": "./dist/clerk.browser.js", "maxSize": "65kB" },
 { "path": "./dist/clerk.headless.js", "maxSize": "43kB" },
 { "path": "./dist/ui-common*.js", "maxSize": "86KB" },
 { "path": "./dist/vendors*.js", "maxSize": "70KB" },
Expand Down

51 changes: 50 additions & 1 deletion
packages/clerk-js/src/core/resources/SamlAccount.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
import type { SamlAccountJSON, SamlAccountResource, SamlIdpSlug, VerificationResource } from '@clerk/types';
import type {
 SamlAccountConnectionJSON,
 SamlAccountConnectionResource,
 SamlAccountJSON,
 SamlAccountResource,
 SamlIdpSlug,
 VerificationResource,
} from '@clerk/types';

import { unixEpochToDate } from '../../utils/date';
import { BaseResource } from './Base';
import { Verification } from './Verification';

Expand All@@ -12,6 +20,7 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 firstName = '';
 lastName = '';
 verification: VerificationResource | null = null;
 samlConnection: SamlAccountConnectionResource | null = null;

 public constructor(data: Partial<SamlAccountJSON>, pathRoot: string);
 public constructor(data: SamlAccountJSON, pathRoot: string) {
Expand All@@ -37,6 +46,46 @@ export class SamlAccount extends BaseResource implements SamlAccountResource {
 this.verification = new Verification(data.verification);
 }

 if (data.saml_connection) {
 this.samlConnection = new SamlAccountConnection(data.saml_connection);
 }

 return this;
 }
}

export class SamlAccountConnection extends BaseResource implements SamlAccountConnectionResource {
 id!: string;
 name!: string;
 domain!: string;
 active!: boolean;
 provider!: string;
 syncUserAttributes!: boolean;
 allowSubdomains!: boolean;
 allowIdpInitiated!: boolean;
 disableAdditionalIdentifications!: boolean;
 createdAt!: Date;
 updatedAt!: Date;

 constructor(data: SamlAccountConnectionJSON | null) {
 super();
 this.fromJSON(data);
 }
 protected fromJSON(data: SamlAccountConnectionJSON | null): this {
 if (data) {
 this.id = data.id;
 this.name = data.name;
 this.domain = data.domain;
 this.active = data.active;
 this.provider = data.provider;
 this.syncUserAttributes = data.sync_user_attributes;
 this.allowSubdomains = data.allow_subdomains;
 this.allowIdpInitiated = data.allow_idp_initiated;
 this.disableAdditionalIdentifications = data.disable_additional_identifications;
 this.createdAt = unixEpochToDate(data.created_at);
 this.updatedAt = unixEpochToDate(data.updated_at);
 }

 return this;
 }
}

15 changes: 11 additions & 4 deletions
packages/clerk-js/src/ui/components/UserProfile/AccountPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,13 +15,20 @@ export const AccountPage = withCardStateProvider(() => {
 const { attributes, saml, social } = useEnvironment().userSettings;
 const card = useCardState();
 const { user } = useUser();

 const showUsername = attributes.username.enabled;
 const showEmail = attributes.email_address.enabled;
 const showPhone = attributes.phone_number.enabled;
 const showConnectedAccounts = social && Object.values(social).filter(p => p.enabled).length > 0;
 const showSamlAccounts = saml && saml.enabled && user && user.samlAccounts.length > 0;
 const showWeb3 = attributes.web3_wallet.enabled;

 const shouldAllowIdentificationCreation =
 !showSamlAccounts ||
 !user?.samlAccounts?.some(
 samlAccount => samlAccount.active && samlAccount.samlConnection?.disableAdditionalIdentifications,
 );

 return (
 <Col
 elementDescriptor={descriptors.page}
Expand All@@ -43,11 +50,11 @@ export const AccountPage = withCardStateProvider(() => {

 <UserProfileSection />
 {showUsername && <UsernameSection />}
 {showEmail && <EmailsSection />}
 {showPhone && <PhoneSection />}
 {showConnectedAccounts && <ConnectedAccountsSection />}
 {showEmail && <EmailsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showPhone && <PhoneSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showConnectedAccounts && <ConnectedAccountsSection shouldAllowCreation={shouldAllowIdentificationCreation} />}
 {showSamlAccounts && <EnterpriseAccountsSection />}
 {showWeb3 && <Web3Section />}
 {showWeb3 && <Web3Section shouldAllowCreation={shouldAllowIdentificationCreation} />}
 </Col>
 </Col>
 );
Expand Down

70 changes: 36 additions & 34 deletions
packages/clerk-js/src/ui/components/UserProfile/ConnectedAccountsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -46,41 +46,43 @@ const errorCodesForReconnect = [
 'external_account_email_address_verification_required',
];

export const ConnectedAccountsSection = withCardStateProvider(() => {
 const { user } = useUser();
 const card = useCardState();

 if (!user) {
 return null;
 }

 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];
export const ConnectedAccountsSection = withCardStateProvider(
 ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const card = useCardState();
 const hasExternalAccounts = Boolean(user?.externalAccounts?.length);

 if (!user || (!shouldAllowCreation && !hasExternalAccounts)) {
 return null;
 }

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>

 <AddConnectedAccount />
 </Action.Root>
 </ProfileSection.Root>
 );
});
 const accounts = [
 ...user.verifiedExternalAccounts,
 ...user.unverifiedExternalAccounts.filter(a => a.verification?.error),
 ];

 return (
 <ProfileSection.Root
 title={localizationKeys('userProfile.start.connectedAccountsSection.title')}
 centered={false}
 id='connectedAccounts'
 >
 <Card.Alert>{card.error}</Card.Alert>
 <Action.Root>
 <ProfileSection.ItemList id='connectedAccounts'>
 {accounts.map(account => (
 <ConnectedAccount
 key={account.id}
 account={account}
 />
 ))}
 </ProfileSection.ItemList>
 {shouldAllowCreation && <AddConnectedAccount />}
 </Action.Root>
 </ProfileSection.Root>
 );
 },
);

const ConnectedAccount = ({ account }: { account: ExternalAccountResource }) => {
 const { additionalOAuthScopes, componentName, mode } = useUserProfileContext();
Expand Down

30 changes: 16 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/EmailsSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,7 +35,7 @@ const EmailScreen = (props: EmailScreenProps) => {
 );
};

export const EmailsSection = () => {
export const EmailsSection = ({ shouldAllowCreation = true }) => {
 const { user } = useUser();

 return (
Expand DownExpand Up@@ -79,19 +79,21 @@ export const EmailsSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='emailAddresses'
 localizationKey={localizationKeys('userProfile.start.emailAddressesSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <EmailScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down

35 changes: 21 additions & 14 deletions
packages/clerk-js/src/ui/components/UserProfile/PhoneSection.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -35,8 +35,13 @@ const PhoneScreen = (props: PhoneScreenProps) => {
 );
};

export const PhoneSection = () => {
export const PhoneSection = ({ shouldAllowCreation = true }: { shouldAllowCreation?: boolean }) => {
 const { user } = useUser();
 const hasPhoneNumbers = Boolean(user?.phoneNumbers?.length);

 if (!shouldAllowCreation && !hasPhoneNumbers) {
 return null;
 }

 return (
 <ProfileSection.Root
Expand DownExpand Up@@ -84,19 +89,21 @@ export const PhoneSection = () => {
 </Action.Open>
 </Action.Root>
 ))}

 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>

 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 {shouldAllowCreation && (
 <>
 <Action.Trigger value='add'>
 <ProfileSection.ArrowButton
 id='phoneNumbers'
 localizationKey={localizationKeys('userProfile.start.phoneNumbersSection.primaryButton')}
 />
 </Action.Trigger>
 <Action.Open value='add'>
 <Action.Card>
 <PhoneScreen />
 </Action.Card>
 </Action.Open>
 </>
 )}
 </ProfileSection.ItemList>
 </Action.Root>
 </ProfileSection.Root>
Expand Down
Loading