TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-12-14 13:04:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

signin after register

Browse Source
This commit is contained in:
peintnermax
2024-09-19 16:00:20 +02:00
parent dca1745435
commit 0715281d00
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ import TOTPRegister from "@/ui/TOTPRegister";
import UserAvatar from "@/ui/UserAvatar";
import { RegisterTOTPResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
import Link from "next/link";
import { redirect } from "next/navigation";
export default async function Page({
searchParams,
@@ -80,6 +81,10 @@ export default async function Page({
if (checkAfter) {
urlToContinue = `/otp/${method}?` + paramsToContinue;
// immediately check the OTP on the next page if sms or email was set up
if (["email", "sms"].includes(method)) {
return redirect(urlToContinue);
}
} else if (authRequestId && sessionId) {
urlToContinue = `/login?` + paramsToContinue;
} else if (loginName) {

21
apps/login/src/ui/SetPasswordForm.tsx
View File

@@ -81,12 +81,12 @@ export default function SetPasswordForm({
return;
}
const userReponse = response as RegisterUserResponse;
const userResponse = response as RegisterUserResponse;
const params = new URLSearchParams({ userId: userReponse.userId });
const params = new URLSearchParams({ userId: userResponse.userId });
if (userReponse.factors?.user?.loginName) {
params.append("loginName", userReponse.factors.user.loginName);
if (userResponse.factors?.user?.loginName) {
params.append("loginName", userResponse.factors.user.loginName);
}
if (authRequestId) {
params.append("authRequestId", authRequestId);
@@ -94,11 +94,18 @@ export default function SetPasswordForm({
if (organization) {
params.append("organization", organization);
}
if (userReponse && userReponse.sessionId) {
params.append("sessionId", userReponse.sessionId);
if (userResponse && userResponse.sessionId) {
params.append("sessionId", userResponse.sessionId);
}
return router.push(`/verify?` + params);
// skip verification for now as it is an app based flow
// return router.push(`/verify?` + params);
if (authRequestId && userResponse.sessionId) {
return router.push(`/login?` + params);
} else {
return router.push(`/signedin?` + params);
}
}
const { errors } = formState;