Skip to content

Use webauthnId instead of identifierValue #541

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
incorbador merged 1 commit into from
Sep 5, 2025
Merged

Use webauthnId instead of identifierValue #541

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
8 changes: 6 additions & 2 deletions packages/connect-react/src/components/login/LoginErrorScreenHard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import useShared from '../../hooks/useShared';
import { LoginScreenType } from '../../types/screenTypes';
import { getLoginErrorMessage, LoginSituationCode } from '../../types/situations';
import LoginErrorHard from './base/LoginErrorHard';
import { type CboApiFallbackOperationError, connectLoginFinishToComplete } from './LoginInitScreen';
import {
type CboApiFallbackOperationError,
connectLoginFinishToComplete,
connectLoginFinishToWebauthnId,
} from './LoginInitScreen';

type Props = {
previousAssertionOptions: string;
Expand Down Expand Up @@ -64,7 +68,7 @@ const LoginErrorScreenHard = ({ previousAssertionOptions }: Props) => {
await config.onComplete(
connectLoginFinishToComplete(resFinish.val),
getConnectService().encodeClientState(),
resFinish.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(resFinish.val),
);
} catch {
return handleSituation(LoginSituationCode.CtApiNotAvailablePostAuthenticator);
Expand Down
4 changes: 2 additions & 2 deletions packages/connect-react/src/components/login/LoginErrorScreenSoft.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { LoginScreenType } from '../../types/screenTypes';
import { getLoginErrorMessage, LoginSituationCode } from '../../types/situations';
import LoginErrorSoft from './base/LoginErrorSoft';
import type { CboApiFallbackOperationError } from './LoginInitScreen';
import { connectLoginFinishToComplete } from './LoginInitScreen';
import { connectLoginFinishToComplete, connectLoginFinishToWebauthnId } from './LoginInitScreen';

type Props = {
previousAssertionOptions: string;
Expand Down Expand Up @@ -59,7 +59,7 @@ const LoginErrorScreenSoft = ({ previousAssertionOptions }: Props) => {
await config.onComplete(
connectLoginFinishToComplete(resFinish.val),
getConnectService().encodeClientState(),
resFinish.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(resFinish.val),
);
setLoading(false);
} catch {
Expand Down
4 changes: 2 additions & 2 deletions packages/connect-react/src/components/login/LoginHybridScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import useShared from '../../hooks/useShared';
import { LoginScreenType } from '../../types/screenTypes';
import { getLoginErrorMessage, LoginSituationCode } from '../../types/situations';
import LoginHybrid from './base/LoginHybrid';
import { connectLoginFinishToComplete } from './LoginInitScreen';
import { connectLoginFinishToComplete, connectLoginFinishToWebauthnId } from './LoginInitScreen';

const LoginHybridScreen = (resStart: ConnectLoginStartRsp) => {
const { config, navigateToScreen, currentIdentifier, fallback } = useLoginProcess();
Expand All @@ -35,7 +35,7 @@ const LoginHybridScreen = (resStart: ConnectLoginStartRsp) => {
await config.onComplete(
connectLoginFinishToComplete(res.val),
getConnectService().encodeClientState(),
res.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(res.val),
);
} catch {
return handleSituation(LoginSituationCode.CtApiNotAvailablePostAuthenticator);
Expand Down
13 changes: 10 additions & 3 deletions packages/connect-react/src/components/login/LoginInitScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { ConnectError } from '@corbado/web-core';
import { ConnectErrorType, PasskeyLoginSource } from '@corbado/web-core';
import { base64decode, ConnectErrorType, PasskeyLoginSource } from '@corbado/web-core';
import type { ConnectLoginFinishRsp } from '@corbado/web-core/dist/api/v2';
import log from 'loglevel';
import type { FC } from 'react';
Expand Down Expand Up @@ -39,6 +39,13 @@ export const connectLoginFinishToComplete = (v: ConnectLoginFinishRsp): string =
return v.signedPasskeyData;
};

export const connectLoginFinishToWebauthnId = (v: ConnectLoginFinishRsp): string => {
const parts = v.signedPasskeyData.split('.');
const base64decoded = JSON.parse(base64decode(parts[1]));

return base64decoded['webauthnId'];
};

const LoginInitScreen: FC<Props> = ({ showFallback = false }) => {
const { config, navigateToScreen, setCurrentIdentifier, setFlags, flags, loadedMs, fallback } = useLoginProcess();
const { sharedConfig, getConnectService } = useShared();
Expand Down Expand Up @@ -181,7 +188,7 @@ const LoginInitScreen: FC<Props> = ({ showFallback = false }) => {
await config.onComplete(
connectLoginFinishToComplete(res.val),
getConnectService().encodeClientState(),
res.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(res.val),
);
} catch {
return handleSituation(LoginSituationCode.CtApiNotAvailablePostAuthenticator);
Expand Down Expand Up @@ -235,7 +242,7 @@ const LoginInitScreen: FC<Props> = ({ showFallback = false }) => {
await config.onComplete(
connectLoginFinishToComplete(res.val),
getConnectService().encodeClientState(),
res.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(res.val),
);
} catch {
void getConnectService().recordEventLoginErrorUntyped();
Expand Down
8 changes: 6 additions & 2 deletions packages/connect-react/src/components/login/LoginPasskeyReLoginScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import useShared from '../../hooks/useShared';
import { LoginScreenType } from '../../types/screenTypes';
import { getLoginErrorMessage, LoginSituationCode } from '../../types/situations';
import LoginOneTap from './base/LoginOneTap';
import { type CboApiFallbackOperationError, connectLoginFinishToComplete } from './LoginInitScreen';
import {
type CboApiFallbackOperationError,
connectLoginFinishToComplete,
connectLoginFinishToWebauthnId,
} from './LoginInitScreen';

export const LoginPasskeyReLoginScreen = () => {
const { config, navigateToScreen, setCurrentIdentifier, currentIdentifier, loadedMs, fallback } = useLoginProcess();
Expand Down Expand Up @@ -56,7 +60,7 @@ export const LoginPasskeyReLoginScreen = () => {
await config.onComplete(
connectLoginFinishToComplete(resFinish.val),
getConnectService().encodeClientState(),
resFinish.val.passkeyOperation.identifierValue,
connectLoginFinishToWebauthnId(resFinish.val),
);
} catch {
return handleSituation(LoginSituationCode.CtApiNotAvailablePostAuthenticator);
Expand Down
Loading