TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-12 06:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

login component

Browse Source
This commit is contained in:
Max Peintner
2023-06-27 13:44:11 +02:00
parent 7cbc4677f0
commit f334f0fb3b
2 changed files with 48 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/login/app/(login)/passkey/login/page.tsx
View File

@@ -1,5 +1,6 @@
import { getSession, server } from "#/lib/zitadel";
import Alert, { AlertType } from "#/ui/Alert";
import LoginPasskey from "#/ui/LoginPasskey";
import RegisterPasskey from "#/ui/RegisterPasskey";
import UserAvatar from "#/ui/UserAvatar";
import { getMostRecentCookieWithLoginname } from "#/utils/cookies";
@@ -50,9 +51,7 @@ export default async function Page({
</div>
)}
{sessionFactors?.id && (
<LoginPasskey sessionId={sessionFactors.id} isPrompt={!!prompt} />
)}
{sessionFactors?.id && <LoginPasskey sessionId={sessionFactors.id} />}
</div>
);
}

124
apps/login/ui/LoginPasskey.tsx
View File

@@ -56,87 +56,55 @@ export default function LoginPasskey({ sessionId }: Props) {
}
function submitLoginAndContinue(value: Inputs): Promise<boolean | void> {
return submitLogin().then((resp: LoginPasskeyResponse) => {
const passkeyId = resp.passkeyId;
navigator.credentials
.get({
publicKey: resp.publicKeyCredentialCreationOptions,
})
.then((assertedCredential: any) => {
if (assertedCredential) {
let authData = new Uint8Array(
assertedCredential.response.authenticatorData
);
let clientDataJSON = new Uint8Array(
assertedCredential.response.clientDataJSON
);
let rawId = new Uint8Array(assertedCredential.rawId);
let sig = new Uint8Array(assertedCredential.response.signature);
let userHandle = new Uint8Array(
assertedCredential.response.userHandle
);
if (
resp.publicKeyCredentialCreationOptions &&
resp.publicKeyCredentialCreationOptions.publicKey
) {
resp.publicKeyCredentialCreationOptions.publicKey.challenge =
coerceToArrayBuffer(
resp.publicKeyCredentialCreationOptions.publicKey.challenge,
"challenge"
);
resp.publicKeyCredentialCreationOptions.publicKey.user.id =
coerceToArrayBuffer(
resp.publicKeyCredentialCreationOptions.publicKey.user.id,
"challenge"
);
if (
resp.publicKeyCredentialCreationOptions.publicKey.excludeCredentials
) {
resp.publicKeyCredentialCreationOptions.publicKey.excludeCredentials.map(
(cred: any) => {
cred.id = coerceToArrayBuffer(
cred.id as string,
"excludeCredentials.id"
);
return cred;
}
);
}
let data = JSON.stringify({
id: assertedCredential.id,
rawId: coerceToBase64Url(rawId, "rawId"),
type: assertedCredential.type,
response: {
authenticatorData: coerceToBase64Url(authData, "authData"),
clientDataJSON: coerceToBase64Url(
clientDataJSON,
"clientDataJSON"
),
signature: coerceToBase64Url(sig, "sig"),
userHandle: coerceToBase64Url(userHandle, "userHandle"),
},
});
navigator.credentials
.get({
publicKey: resp.publicKeyCredentialCreationOptions,
})
.then((assertedCredential: any) => {
if (assertedCredential) {
let authData = new Uint8Array(
assertedCredential.response.authenticatorData
);
let clientDataJSON = new Uint8Array(
assertedCredential.response.clientDataJSON
);
let rawId = new Uint8Array(assertedCredential.rawId);
let sig = new Uint8Array(assertedCredential.response.signature);
let userHandle = new Uint8Array(
assertedCredential.response.userHandle
);
let data = JSON.stringify({
id: assertedCredential.id,
rawId: coerceToBase64Url(rawId, "rawId"),
type: assertedCredential.type,
response: {
authenticatorData: coerceToBase64Url(authData, "authData"),
clientDataJSON: coerceToBase64Url(
clientDataJSON,
"clientDataJSON"
),
signature: coerceToBase64Url(sig, "sig"),
userHandle: coerceToBase64Url(userHandle, "userHandle"),
},
});
return submitVerify(passkeyId, "", data, sessionId);
} else {
setLoading(false);
setError("An error on retrieving passkey");
return null;
}
})
.catch((error) => {
console.error(error);
return submitLogin(passkeyId, "", data, sessionId);
} else {
setLoading(false);
// setError(error);
setError("An error on retrieving passkey");
return null;
});
}
// return router.push(`/accounts`);
});
}
})
.catch((error) => {
console.error(error);
setLoading(false);
// setError(error);
return null;
});
}
// return router.push(`/accounts`);
}
const { errors } = formState;
@@ -174,7 +142,7 @@ export default function LoginPasskey({ sessionId }: Props) {
className="self-end"
variant={ButtonVariants.Primary}
disabled={loading || !formState.isValid}
onClick={handleSubmit(submitRegisterAndContinue)}
onClick={handleSubmit(submitLoginAndContinue)}
>
{loading && <Spinner className="h-5 w-5 mr-2" />}
continue