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

fix: session callback on otp register

Browse Source
This commit is contained in:
peintnermax
2024-04-29 14:55:49 +02:00
parent 1e7bbc4aca
commit b75183868a
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
apps/login/app/(login)/otp/[method]/set/page.tsx
View File

@@ -6,8 +6,10 @@ import {
registerTOTP, registerTOTP,
server, server,
} from "#/lib/zitadel"; } from "#/lib/zitadel";
import Alert from "#/ui/Alert";
import DynamicTheme from "#/ui/DynamicTheme"; import DynamicTheme from "#/ui/DynamicTheme";
import TOTPRegister from "#/ui/TOTPRegister"; import TOTPRegister from "#/ui/TOTPRegister";
import UserAvatar from "#/ui/UserAvatar";
import { getMostRecentCookieWithLoginname } from "#/utils/cookies"; import { getMostRecentCookieWithLoginname } from "#/utils/cookies";
export default async function Page({ export default async function Page({
@@ -21,27 +23,25 @@ export default async function Page({
const { method } = params; const { method } = params;
const branding = await getBrandingSettings(server, organization); const branding = await getBrandingSettings(server, organization);
const { session, token } = await loadSession(loginName, organization);
const totpResponse = await loadSession(loginName, organization).then( let totpResponse;
({ session, token }) => { if (session && session.factors?.user?.id) {
if (session && session.factors?.user?.id) { if (method === "time-based") {
if (method === "time-based") { // inconsistency with token: email works with machine token, totp works with session token
// inconsistency with token: email works with machine token, totp works with session token totpResponse = await registerTOTP(session.factors.user.id, token);
return registerTOTP(session.factors.user.id, token); } else if (method === "sms") {
} else if (method === "sms") { // does not work
// does not work await addOTPSMS(session.factors.user.id);
return addOTPSMS(session.factors.user.id); } else if (method === "email") {
} else if (method === "email") { // works
// works await addOTPEmail(session.factors.user.id);
return addOTPEmail(session.factors.user.id); } else {
} else { throw new Error("Invalid method");
throw new Error("Invalid method");
}
} else {
throw new Error("No session found");
}
} }
); } else {
throw new Error("No session found");
}
async function loadSession(loginName?: string, organization?: string) { async function loadSession(loginName?: string, organization?: string) {
const recent = await getMostRecentCookieWithLoginname( const recent = await getMostRecentCookieWithLoginname(
@@ -58,6 +58,23 @@ export default async function Page({
<DynamicTheme branding={branding}> <DynamicTheme branding={branding}>
<div className="flex flex-col items-center space-y-4"> <div className="flex flex-col items-center space-y-4">
<h1>Register 2-factor</h1> <h1>Register 2-factor</h1>
{!session && (
<div className="py-4">
<Alert>
Could not get the context of the user. Make sure to enter the
username first or provide a loginName as searchParam.
</Alert>
</div>
)}
{session && (
<UserAvatar
loginName={loginName ?? session.factors?.user?.loginName}
displayName={session.factors?.user?.displayName}
showDropdown
></UserAvatar>
)}
{totpResponse && "uri" in totpResponse && "secret" in totpResponse ? ( {totpResponse && "uri" in totpResponse && "secret" in totpResponse ? (
<> <>
<p className="ztdl-p"> <p className="ztdl-p">

3
apps/login/ui/TOTPRegister.tsx
View File

@@ -44,8 +44,10 @@ export default function TOTPRegister({
}); });
async function continueWithCode(values: Inputs) { async function continueWithCode(values: Inputs) {
setLoading(true);
return verifyTOTP(values.code, loginName, organization) return verifyTOTP(values.code, loginName, organization)
.then((response) => { .then((response) => {
setLoading(false);
if (authRequestId && sessionId) { if (authRequestId && sessionId) {
const params = new URLSearchParams({ const params = new URLSearchParams({
sessionId: sessionId, sessionId: sessionId,
@@ -73,6 +75,7 @@ export default function TOTPRegister({
} }
}) })
.catch((e) => { .catch((e) => {
setLoading(false);
setError(e.message); setError(e.message);
}); });
} }