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

document password pages, move redirects to sendPassword server action

Browse Source
This commit is contained in:
peintnermax
2024-10-17 10:06:17 +02:00
parent bc3e09ed0c
commit bfe3448f5a
7 changed files with 252 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
apps/login/src/components/set-password-form.tsx
View File

@@ -6,9 +6,10 @@ import {
symbolValidator,
upperCaseValidator,
} from "@/helpers/validators";
import { changePassword } from "@/lib/server/password";
import { changePassword, sendPassword } from "@/lib/server/password";
import { create } from "@zitadel/client";
import { ChecksSchema } from "@zitadel/proto/zitadel/session/v2/session_service_pb";
import { PasswordComplexitySettings } from "@zitadel/proto/zitadel/settings/v2/password_settings_pb";
import { SetPasswordResponse } from "@zitadel/proto/zitadel/user/v2/user_service_pb";
import { useTranslations } from "next-intl";
import { useRouter } from "next/navigation";
import { useState } from "react";
@@ -61,7 +62,7 @@ export function SetPasswordForm({
async function submitRegister(values: Inputs) {
setLoading(true);
const response = await changePassword({
const changeResponse = await changePassword({
userId: userId,
password: values.password,
code: values.code,
@@ -69,21 +70,17 @@ export function SetPasswordForm({
setError("Could not register user");
});
if (response && "error" in response) {
setError(response.error);
if (changeResponse && "error" in changeResponse) {
setError(changeResponse.error);
}
setLoading(false);
if (!response) {
if (!changeResponse) {
setError("Could not register user");
return;
}
const userResponse = response as SetPasswordResponse & {
sessionId: string;
};
const params = new URLSearchParams({});
if (loginName) {
@@ -93,22 +90,45 @@ export function SetPasswordForm({
params.append("organization", organization);
}
// skip verification for now as it is an app based flow
// return router.push(`/verify?` + params);
const passwordResponse = await sendPassword({
loginName,
organization,
checks: create(ChecksSchema, {
password: { password: values.password },
}),
authRequestId,
}).catch(() => {
setLoading(false);
setError("Could not verify password");
return;
});
// check for mfa force to continue with mfa setup
setLoading(false);
if (authRequestId && userResponse.sessionId) {
if (authRequestId) {
params.append("authRequest", authRequestId);
}
return router.push(`/login?` + params);
} else {
if (authRequestId) {
params.append("authRequestId", authRequestId);
}
return router.push(`/signedin?` + params);
if (
passwordResponse &&
"error" in passwordResponse &&
passwordResponse.error
) {
setError(passwordResponse.error);
}
// // skip verification for now as it is an app based flow
// // return router.push(`/verify?` + params);
// // check for mfa force to continue with mfa setup
// if (authRequestId && changeResponse.sessionId) {
// if (authRequestId) {
// params.append("authRequest", authRequestId);
// }
// return router.push(`/login?` + params);
// } else {
// if (authRequestId) {
// params.append("authRequestId", authRequestId);
// }
// return router.push(`/signedin?` + params);
// }
}
const { errors } = formState;