mirror of
https://github.com/andwati/zitadel.git
synced 2026-11-09 23:55:12 +00:00
# Which Problems Are Solved This PR introduces robust redirect configuration options and enhances security for Server Actions in multi-domain setups. # How the Problems Are Solved - Redirect Fallback Logic: Implemented a unified `resolveRedirectUri` utility that prioritizes redirect targets as follows: - Environment override (`DEFAULT_REDIRECT_URI`) - Organization settings (`defaultRedirectUri`). - Relative fallback (`/signedin?...`). - Host Reflection: `DEFAULT_REDIRECT_URI` supports absolute URLs or relative paths via host reflection. - Server Action Security: Configured `serverActions.allowedOrigins` to be dynamically manageable via the `SERVER_ACTION_ALLOWED_ORIGINS` environment variable (comma-separated list). It defaults to an empty list for maximum security. - UI Integration: Updated the /signedin page to use the unified redirect logic, ensuring consistent behavior for the "Continue" button. - Documentation: Added type definitions and detailed descriptions for new environment variables in `next-env-vars.d.ts` --------- Co-authored-by: Copilot <[email protected]>
196 lines
6.5 KiB
TypeScript
196 lines
6.5 KiB
TypeScript
"use client";
|
|
|
|
import { lowerCaseValidator, numberValidator, symbolValidator, upperCaseValidator } from "@/helpers/validators";
|
|
import { checkSessionAndSetPassword, 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 { useRouter } from "next/navigation";
|
|
import { useState } from "react";
|
|
import { useTranslations } from "next-intl";
|
|
import { FieldValues, useForm } from "react-hook-form";
|
|
import { Alert } from "./alert";
|
|
import { BackButton } from "./back-button";
|
|
import { Button, ButtonVariants } from "./button";
|
|
import { TextInput } from "./input";
|
|
import { PasswordComplexity } from "./password-complexity";
|
|
import { Spinner } from "./spinner";
|
|
import { Translated } from "./translated";
|
|
import { handleServerActionResponse } from "@/lib/client-utils";
|
|
import { AutoSubmitForm } from "./auto-submit-form";
|
|
|
|
type Inputs =
|
|
| {
|
|
currentPassword: string;
|
|
password: string;
|
|
confirmPassword: string;
|
|
}
|
|
| FieldValues;
|
|
|
|
type Props = {
|
|
passwordComplexitySettings: PasswordComplexitySettings;
|
|
sessionId: string;
|
|
loginName: string;
|
|
requestId?: string;
|
|
organization?: string;
|
|
};
|
|
|
|
export function ChangePasswordForm({ passwordComplexitySettings, sessionId, loginName, requestId, organization }: Props) {
|
|
const router = useRouter();
|
|
|
|
const { register, handleSubmit, watch, formState } = useForm<Inputs>({
|
|
mode: "onChange",
|
|
defaultValues: {
|
|
currentPassword: "",
|
|
password: "",
|
|
confirmPassword: "",
|
|
},
|
|
});
|
|
|
|
const t = useTranslations("password");
|
|
|
|
const [loading, setLoading] = useState<boolean>(false);
|
|
const [error, setError] = useState<string>("");
|
|
const [samlData, setSamlData] = useState<{ url: string; fields: Record<string, string> } | null>(null);
|
|
|
|
async function submitChange(values: Inputs) {
|
|
setLoading(true);
|
|
|
|
const changeResponse = await checkSessionAndSetPassword({
|
|
sessionId,
|
|
currentPassword: values.currentPassword,
|
|
password: values.password,
|
|
}).catch(() => {
|
|
setError(t("change.errors.couldNotChangePassword"));
|
|
setLoading(false);
|
|
return;
|
|
});
|
|
|
|
if (changeResponse && "error" in changeResponse && changeResponse.error) {
|
|
setError(typeof changeResponse.error === "string" ? changeResponse.error : t("change.errors.unknownError"));
|
|
setLoading(false);
|
|
return;
|
|
}
|
|
|
|
if (!changeResponse) {
|
|
setError(t("change.errors.couldNotChangePassword"));
|
|
setLoading(false);
|
|
return;
|
|
}
|
|
|
|
await new Promise((resolve) => setTimeout(resolve, 1000)); // wait for a second, to prevent eventual consistency issues
|
|
|
|
const passwordResponse = await sendPassword({
|
|
loginName,
|
|
organization,
|
|
checks: create(ChecksSchema, {
|
|
password: { password: values.password },
|
|
}),
|
|
requestId,
|
|
})
|
|
.catch(() => {
|
|
setError(t("change.errors.couldNotVerifyPassword"));
|
|
return;
|
|
})
|
|
.finally(() => {
|
|
setLoading(false);
|
|
});
|
|
|
|
handleServerActionResponse(passwordResponse as any, router, setSamlData, setError);
|
|
|
|
return;
|
|
}
|
|
|
|
const { errors } = formState;
|
|
|
|
const watchPassword = watch("password", "");
|
|
const watchConfirmPassword = watch("confirmPassword", "");
|
|
|
|
const hasMinLength = passwordComplexitySettings && watchPassword?.length >= passwordComplexitySettings.minLength;
|
|
const hasSymbol = symbolValidator(watchPassword);
|
|
const hasNumber = numberValidator(watchPassword);
|
|
const hasUppercase = upperCaseValidator(watchPassword);
|
|
const hasLowercase = lowerCaseValidator(watchPassword);
|
|
|
|
const policyIsValid =
|
|
passwordComplexitySettings &&
|
|
(passwordComplexitySettings.requiresLowercase ? hasLowercase : true) &&
|
|
(passwordComplexitySettings.requiresNumber ? hasNumber : true) &&
|
|
(passwordComplexitySettings.requiresUppercase ? hasUppercase : true) &&
|
|
(passwordComplexitySettings.requiresSymbol ? hasSymbol : true) &&
|
|
hasMinLength;
|
|
|
|
return (
|
|
<>
|
|
{samlData && <AutoSubmitForm url={samlData.url} fields={samlData.fields} />}
|
|
<form className="w-full">
|
|
<div className="mb-4 grid grid-cols-1 gap-4 pt-4">
|
|
<div className="">
|
|
<TextInput
|
|
type="password"
|
|
autoComplete="current-password"
|
|
autoFocus
|
|
required
|
|
{...register("currentPassword", {
|
|
required: t("change.required.currentPassword"),
|
|
})}
|
|
label={t("change.labels.currentPassword")}
|
|
error={errors.currentPassword?.message as string}
|
|
data-testid="password-change-current-text-input"
|
|
/>
|
|
</div>
|
|
<div className="">
|
|
<TextInput
|
|
type="password"
|
|
autoComplete="new-password"
|
|
required
|
|
{...register("password", {
|
|
required: t("change.required.newPassword"),
|
|
})}
|
|
label={t("change.labels.newPassword")}
|
|
error={errors.password?.message as string}
|
|
data-testid="password-change-text-input"
|
|
/>
|
|
</div>
|
|
<div className="">
|
|
<TextInput
|
|
type="password"
|
|
required
|
|
autoComplete="new-password"
|
|
{...register("confirmPassword", {
|
|
required: t("change.required.confirmPassword"),
|
|
})}
|
|
label={t("change.labels.confirmPassword")}
|
|
error={errors.confirmPassword?.message as string}
|
|
data-testid="password-change-confirm-text-input"
|
|
/>
|
|
</div>
|
|
</div>
|
|
|
|
{passwordComplexitySettings && (
|
|
<PasswordComplexity
|
|
passwordComplexitySettings={passwordComplexitySettings}
|
|
password={watchPassword}
|
|
equals={!!watchPassword && watchPassword === watchConfirmPassword}
|
|
/>
|
|
)}
|
|
|
|
{error && <Alert>{error}</Alert>}
|
|
|
|
<div className="mt-8 flex w-full flex-row items-center justify-between">
|
|
<BackButton data-testid="back-button" />
|
|
<Button
|
|
type="submit"
|
|
variant={ButtonVariants.Primary}
|
|
disabled={loading || !policyIsValid || !formState.isValid || watchPassword !== watchConfirmPassword}
|
|
onClick={handleSubmit(submitChange)}
|
|
data-testid="submit-button"
|
|
>
|
|
{loading && <Spinner className="mr-2 h-5 w-5" />} <Translated i18nKey="change.submit" namespace="password" />
|
|
</Button>
|
|
</div>
|
|
</form>
|
|
</>
|
|
);
|
|
}
|