修复认证验证码投递与登录入口体验 05-27-oa-auth-delivery-wecom-entry-fix
这个提交包含在:
@@ -1,6 +1,8 @@
|
||||
import { useState } from "react";
|
||||
import { useQuery } from "@tanstack/react-query";
|
||||
import { MailCheck } from "lucide-react";
|
||||
import { Link, useNavigate } from "react-router-dom";
|
||||
import { forgotPassword, resetPassword } from "../api/auth";
|
||||
import { fetchAuthCapabilities, forgotPassword, resetPassword } from "../api/auth";
|
||||
import { mapApiErrorMessage } from "../api/errorMessages";
|
||||
import { isApiError } from "../api/types";
|
||||
import { AuthPanel } from "../components/auth/AuthPanel";
|
||||
@@ -26,6 +28,15 @@ export function ForgotPasswordPage() {
|
||||
const [submittingReset, setSubmittingReset] = useState(false);
|
||||
const [message, setMessage] = useState("");
|
||||
const [error, setError] = useState("");
|
||||
const authCapabilitiesQuery = useQuery({
|
||||
queryKey: ["auth", "capabilities"],
|
||||
queryFn: () => fetchAuthCapabilities(),
|
||||
staleTime: 60_000,
|
||||
});
|
||||
const emailDeliveryReady = authCapabilitiesQuery.data?.emailDelivery.ready === true;
|
||||
const emailDeliveryChecking = authCapabilitiesQuery.isLoading;
|
||||
const emailDeliveryUnavailable = authCapabilitiesQuery.isSuccess && !emailDeliveryReady;
|
||||
const emailDeliveryUnknown = authCapabilitiesQuery.isError;
|
||||
|
||||
async function handleRequestCode(event: React.FormEvent<HTMLFormElement>) {
|
||||
event.preventDefault();
|
||||
@@ -37,12 +48,20 @@ export function ForgotPasswordPage() {
|
||||
setError("请输入邮箱。");
|
||||
return;
|
||||
}
|
||||
if (!emailDeliveryReady) {
|
||||
setError(
|
||||
emailDeliveryChecking
|
||||
? "正在检查邮件服务,请稍后再试。"
|
||||
: "邮件验证码暂不可用,请联系管理员处理。",
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
setSubmittingCode(true);
|
||||
try {
|
||||
await forgotPassword({ email: normalizedEmail });
|
||||
setCodeRequested(true);
|
||||
setMessage("如账号可用,验证码将发送到该邮箱。请在有效期内完成重置。");
|
||||
setMessage("如账号可用,验证码将发送到企业邮箱;请在有效期内完成重置,并查看免提醒邮件。");
|
||||
} catch (err) {
|
||||
if (isApiError(err)) {
|
||||
setError(mapApiErrorMessage(err.code, err.details, err.message));
|
||||
@@ -118,8 +137,27 @@ export function ForgotPasswordPage() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Button className="w-full" data-testid="forgot-password-request-code" disabled={submittingCode || !email.trim()} type="submit">
|
||||
{submittingCode ? "发送中..." : codeRequested ? "重新发送验证码" : "发送验证码"}
|
||||
{!emailDeliveryReady ? (
|
||||
<div
|
||||
aria-live="polite"
|
||||
className="flex gap-3 rounded-xl border border-amber-200 bg-amber-50 px-4 py-3 text-sm leading-6 text-amber-800"
|
||||
data-testid="forgot-password-email-delivery-status"
|
||||
>
|
||||
<MailCheck aria-hidden="true" className="mt-0.5 h-4 w-4 flex-none" />
|
||||
<span>
|
||||
{emailDeliveryChecking
|
||||
? "正在检查企业邮箱验证码服务。"
|
||||
: emailDeliveryUnknown
|
||||
? "暂时无法确认邮件服务,请稍后刷新或联系管理员。"
|
||||
: emailDeliveryUnavailable
|
||||
? "邮件验证码暂不可用,请联系管理员处理。"
|
||||
: "邮件验证码暂不可用。"}
|
||||
</span>
|
||||
</div>
|
||||
) : null}
|
||||
|
||||
<Button className="w-full" data-testid="forgot-password-request-code" disabled={submittingCode || !email.trim() || !emailDeliveryReady} type="submit">
|
||||
{emailDeliveryChecking ? "检查邮件服务..." : submittingCode ? "发送中..." : codeRequested ? "重新发送验证码" : "发送验证码"}
|
||||
</Button>
|
||||
</form>
|
||||
|
||||
|
||||
在新工单中引用
屏蔽一个用户