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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
type SignInExperiencePageManagedData,
type SignInExperienceForm,
type AccountCenterFormValues,
normalizeWebauthnRelatedOrigins,
} from '../types';

import AccountCenter from './AccountCenter';
Expand Down Expand Up @@ -97,6 +98,9 @@ function PageContent({ data, onSignInExperienceUpdated, onAccountCenterUpdated }

try {
const { accountCenter, ...formValues } = getValues();
const webauthnRelatedOrigins = normalizeWebauthnRelatedOrigins(
accountCenter.webauthnRelatedOrigins
);

const updatedData = await api
.patch('api/sign-in-exp', {
Expand All @@ -110,7 +114,7 @@ function PageContent({ data, onSignInExperienceUpdated, onAccountCenterUpdated }
enabled: accountCenter.enabled,
// Disable all fields when account center is disabled
fields: accountCenter.enabled ? accountCenter.fields : {},
webauthnRelatedOrigins: accountCenter.webauthnRelatedOrigins,
webauthnRelatedOrigins,
},
})
.json<AccountCenterConfig>();
Expand Down
5 changes: 4 additions & 1 deletion packages/console/src/pages/SignInExperience/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ const createDefaultAccountCenterFormValues = (): AccountCenterFormValues => ({
webauthnRelatedOrigins: [],
});

export const normalizeWebauthnRelatedOrigins = (origins?: string[]): string[] =>
origins?.map((origin) => origin.trim()).filter(Boolean) ?? [];

export const convertAccountCenterToForm = (
accountCenter?: AccountCenterConfig
): AccountCenterFormValues => ({
Expand All @@ -63,7 +66,7 @@ export const convertAccountCenterToForm = (
...createDefaultAccountCenterFormValues().fields,
...accountCenter?.fields,
},
webauthnRelatedOrigins: accountCenter?.webauthnRelatedOrigins ?? [],
webauthnRelatedOrigins: normalizeWebauthnRelatedOrigins(accountCenter?.webauthnRelatedOrigins),
});

/**
Expand Down
Loading