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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(clerk-js,ui,shared): Display enterprise connection icon on account linking dropdown by LauraBeatris · Pull Request #8203 · clerk/javascript · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .changeset/cozy-lands-grow.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
---
'@clerk/clerk-js': patch
'@clerk/shared': patch
---

Add `provider` and `logoPublicUrl` to `EnterpriseConnection` resource
5 changes: 5 additions & 0 deletions .changeset/polite-camels-chew.md
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
---
'@clerk/ui': patch
---

Display enterprise connection icon on account linking dropdown within `UserProfile`
6 changes: 6 additions & 0 deletions packages/clerk-js/src/core/resources/EnterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -81,6 +81,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id!: string;
name!: string;
active!: boolean;
provider!: string;
logoPublicUrl: string | null = null;
domains: string[] = [];
organizationId: string | null = null;
syncUserAttributes!: boolean;
Expand All@@ -105,6 +107,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
this.id = data.id;
this.name = data.name;
this.active = data.active;
this.provider = data.provider;
this.logoPublicUrl = data.logo_public_url ?? null;
this.domains = data.domains ?? [];
this.organizationId = data.organization_id ?? null;
this.syncUserAttributes = data.sync_user_attributes;
Expand All@@ -126,6 +130,8 @@ export class EnterpriseConnection extends BaseResource implements EnterpriseConn
id: this.id,
name: this.name,
active: this.active,
provider: this.provider,
logo_public_url: this.logoPublicUrl,
domains: this.domains,
organization_id: this.organizationId,
sync_user_attributes: this.syncUserAttributes,
Expand Down
31 changes: 23 additions & 8 deletions packages/clerk-js/src/core/resources/__tests__/User.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import type { UserJSON } from '@clerk/shared/types';
import type { EnterpriseConnectionJSON, UserJSON } from '@clerk/shared/types';
import { describe, expect, it, vi } from 'vitest';

import { BaseResource } from '../internal';
Expand DownExpand Up@@ -80,22 +80,37 @@ describe('User', () => {
});

it('fetches enterprise connections', async () => {
const enterpriseConnectionsJSON = [
const enterpriseConnectionsJSON: EnterpriseConnectionJSON[] = [
{
id: 'ec_123',
object: 'enterprise_account_connection',
object: 'enterprise_connection',
name: 'Acme Corp SSO',
active: true,
allow_organization_account_linking: true,
domain: 'acme.com',
protocol: 'saml',
provider: 'saml_okta',
logo_public_url: null,
domains: ['acme.com'],
organization_id: null,
sync_user_attributes: true,
allow_subdomains: false,
allow_idp_initiated: false,
disable_additional_identifications: false,
enterprise_connection_id: 'ec_123',
custom_attributes: [],
oauth_config: null,
saml_connection: {
id: 'saml_123',
name: 'Acme Corp SSO',
active: true,
idp_entity_id: 'https://idp.acme.com/entity',
idp_sso_url: 'https://idp.acme.com/sso',
idp_certificate: 'MIICertificatePlaceholder',
idp_metadata_url: 'https://idp.acme.com/metadata',
idp_metadata: '',
acs_url: 'https://clerk.example.com/v1/saml/acs',
sp_entity_id: 'https://clerk.example.com',
sp_metadata_url: 'https://clerk.example.com/v1/saml/metadata',
allow_subdomains: false,
allow_idp_initiated: false,
force_authn: false,
},
created_at: 1234567890,
updated_at: 1234567890,
},
Expand Down
4 changes: 4 additions & 0 deletions packages/shared/src/types/enterpriseConnection.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,6 +5,8 @@ export interface EnterpriseConnectionJSON extends ClerkResourceJSON {
object: 'enterprise_connection';
name: string;
active: boolean;
provider: string;
logo_public_url?: string | null;
domains?: string[];
organization_id?: string | null;
sync_user_attributes: boolean;
Expand All@@ -23,6 +25,8 @@ export interface EnterpriseConnectionResource extends ClerkResource {
id: string;
name: string;
active: boolean;
provider: string;
logoPublicUrl: string | null;
domains: string[];
organizationId: string | null;
syncUserAttributes: boolean;
Expand Down
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,6 @@ import { ProviderIcon } from '../../common';
import { useUserProfileContext } from '../../contexts';
import { Badge, Box, descriptors, Flex, localizationKeys, Text } from '../../customizables';
import { Action } from '../../elements/Action';

const GENERIC_ENTERPRISE_PROVIDER_ICON_ID = 'custom_enterprise' as OAuthProvider;

const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionResource }) => {
const { connection } = props;
const card = useCardState();
Expand DownExpand Up@@ -54,7 +51,8 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
});
};

const providerIconUrl = connection.oauthConfig?.logoPublicUrl?.trim() ?? '';
const providerIconId = connection.provider.replace(/(oauth_|saml_)/, '').trim() as OAuthProvider;
const providerIconUrl = connection.logoPublicUrl?.trim() || '';
Comment on lines +54 to +55

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟠 Major

Add regression tests for the new enterprise icon resolution path before merge.

This introduces new runtime behavior (connection.provider normalization + connection.logoPublicUrl icon source) but no tests were added/updated to cover OAuth/SAML provider values and empty-logo fallback, which leaves this UI path unprotected against regressions.

As per coding guidelines, "**/*: If there are no tests added or modified as part of the PR, please suggest that tests be added to cover the changes."

Also applies to: 76-83

🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@packages/ui/src/components/UserProfile/EnterpriseAccountsSection.tsx` around
lines 54 - 55, Add regression tests for EnterpriseAccountsSection to cover the
new provider normalization and logo fallback behavior: write unit/tests that
render the component (or call the helper logic) with connection.provider values
like "oauth_google", "saml_okta", and bare provider names to assert
providerIconId is normalized correctly, and tests that provide
connection.logoPublicUrl as a non-empty string and as empty/undefined to assert
providerIconUrl falls back to the expected empty string or default path; target
the code paths referenced by providerIconId and providerIconUrl (and the similar
logic around lines 76-83) so OAuth/SAML normalization and empty-logo fallback
are covered.


return (
<ProfileSection.ActionMenuItem
Expand All@@ -75,15 +73,14 @@ const EnterpriseConnectMenuButton = (props: { connection: EnterpriseConnectionRe
})}
leftIcon={
<ProviderIcon
// TODO - Use `provider` and `logo_public_url` once FAPI `EnterpriseConnection` resource gets updated
id={GENERIC_ENTERPRISE_PROVIDER_ICON_ID}
id={providerIconId}
iconUrl={providerIconUrl || undefined}
name={connection.name}
isLoading={card.loadingMetadata === loadingKey}
isDisabled={card.isLoading}
alt={`Connect ${connection.name} account`}
elementDescriptor={descriptors.providerIcon}
elementId={descriptors.providerIcon.setId(GENERIC_ENTERPRISE_PROVIDER_ICON_ID)}
elementId={descriptors.providerIcon.setId(providerIconId)}
/>
}
/>
Expand Down
Loading