增加 PC 企业微信扫码登录(07-30-pc-wecom-qr-login)
ci-e2e / e2e (push) Canceled after 0s
ci-minimal / check-minimal (push) Canceled after 0s

这个提交包含在:
2026-07-30 17:16:22 +08:00
父节点 45dc206a4c
当前提交 fb164eb690
共修改 21 个文件,包含 959 行新增和 22 行删除
+2
查看文件
@@ -79,6 +79,8 @@ export type WecomEntryConfig = {
corpId: string;
agentId: string;
loginUrl: string | null;
pcWebLoginEnabled: boolean;
pcLoginUrl: string | null;
bindEnabled: boolean;
defaultReturnTo: string;
status: "ready" | "disabled" | "misconfigured";
+26 -4
查看文件
@@ -89,6 +89,9 @@ export function LoginPage() {
const wecomConfig = wecomConfigQuery.data;
const wecomEntry = wecomConfig?.entryEnabled && wecomConfig.loginUrl ? wecomConfig : null;
const pcWecomEntry = !isWecomContext && wecomConfig?.pcWebLoginEnabled && wecomConfig.pcLoginUrl
? wecomConfig
: null;
const wecomNotice = useMemo(
() => resolveWecomBindNotice(searchParams.get("wecomBind")) ?? resolveWecomLoginNotice(searchParams.get("wecom")),
[searchParams],
@@ -96,7 +99,7 @@ export function LoginPage() {
const showWecomPrimary = isWecomContext;
const showPasswordPanel = !showWecomPrimary || Boolean(wecomNotice) || passwordFallbackOpen || (showWecomPrimary && wecomConfig && !wecomEntry);
const showBrowserWecomNotice = !showWecomPrimary && Boolean(wecomEntry);
const showBrowserWecomNotice = !showWecomPrimary && Boolean(wecomEntry) && !pcWecomEntry;
useEffect(() => {
if (emailCodeCooldown <= 0) {
@@ -142,6 +145,13 @@ export function LoginPage() {
window.location.assign(buildWecomLoginUrl(wecomEntry.loginUrl, redirectTo, getDeviceFingerprint()));
}
function handlePcWecomLogin() {
if (!pcWecomEntry?.pcLoginUrl) {
return;
}
window.location.assign(buildWecomLoginUrl(pcWecomEntry.pcLoginUrl, redirectTo, getDeviceFingerprint()));
}
async function handleRequestEmailCode(event: React.FormEvent<HTMLFormElement>) {
event.preventDefault();
setEmailCodeError("");
@@ -370,7 +380,9 @@ export function LoginPage() {
<div className="space-y-4">
{!showWecomPrimary ? (
<div className="ux-command-note">
员工日常建议用企业邮箱验证码;固定办公电脑可使用账号密码。企业微信免登需要从企业微信工作台打开。
{pcWecomEntry
? "可使用企业微信扫码登录;企业邮箱验证码和账号密码作为备用方式。"
: "员工日常建议用企业邮箱验证码;固定办公电脑可使用账号密码。企业微信免登需要从企业微信工作台打开。"}
</div>
) : null}
@@ -432,7 +444,7 @@ export function LoginPage() {
: renderPasswordPanel(showWecomPrimary ? "login-password-secondary-panel" : "login-password-primary-panel")
: null}
{!showWecomPrimary && (showBrowserWecomNotice || oidcProvider) ? (
{!showWecomPrimary && (pcWecomEntry || showBrowserWecomNotice || oidcProvider) ? (
<div className="space-y-3">
<div className="flex items-center gap-3 text-xs text-slate-400">
<span className="h-px flex-1 bg-slate-100" />
@@ -440,7 +452,17 @@ export function LoginPage() {
<span className="h-px flex-1 bg-slate-100" />
</div>
{showBrowserWecomNotice ? (
{pcWecomEntry ? (
<Button
className="w-full"
data-testid="wecom-entry-pc"
type="button"
variant="secondary"
onClick={handlePcWecomLogin}
>
企业微信扫码登录
</Button>
) : showBrowserWecomNotice ? (
<div
className="auth-side-entry flex gap-3 text-slate-600"
data-testid="wecom-entry-browser-notice"
+16 -4
查看文件
@@ -8,6 +8,8 @@ function mockWecomConfigPayload() {
corpId: "wx-test-corp",
agentId: "1000001",
loginUrl: "/api/auth/wecom/login?returnTo=%2Fmobile",
pcWebLoginEnabled: true,
pcLoginUrl: "/api/auth/wecom/login?returnTo=%2Fportal&entrySource=pc_qr",
bindEnabled: true,
defaultReturnTo: "/mobile",
status: "ready",
@@ -53,14 +55,23 @@ async function mockWecomConfig(page: import("@playwright/test").Page) {
});
}
test("E2E 企微入口:普通浏览器下只提示企业微信工作台打开", async ({ page }) => {
test("E2E 企微入口:普通浏览器显示托管扫码入口并保留安全回跳", async ({ page }) => {
await mockAuthBase(page);
await mockWecomConfig(page);
let loginEntryUrl = "";
await page.route("**/api/auth/wecom/login?**", async (route) => {
loginEntryUrl = route.request().url();
await route.fulfill({ status: 200, contentType: "text/plain", body: "mock pc wecom login entry" });
});
await page.goto("/login");
await page.goto("/login?redirect=%2Freimbursements");
await expect(page.getByTestId("login-password-primary-panel")).toBeVisible();
await expect(page.getByTestId("wecom-entry-browser-notice")).toContainText("请从企业微信工作台打开 OA");
await expect(page.getByTestId("wecom-entry-secondary")).toHaveCount(0);
await expect(page.getByTestId("wecom-entry-pc")).toHaveText("企业微信扫码登录");
await page.getByTestId("wecom-entry-pc").click();
await expect.poll(() => loginEntryUrl).toContain("entrySource=pc_qr");
expect(new URL(loginEntryUrl).searchParams.get("returnTo")).toBe("/reimbursements");
expect(new URL(loginEntryUrl).searchParams.get("deviceFingerprint")).toBeTruthy();
await expect(page.getByTestId("wecom-entry-browser-notice")).toHaveCount(0);
});
test("E2E 企微入口:企业微信场景优先显示企微 CTA,并展示映射缺失提示", async ({ page }) => {
@@ -83,6 +94,7 @@ test("E2E 企微入口:企业微信场景优先显示企微 CTA,并展示映
await page.goto("/login?redirect=%2Fportal&wecom=account_mapping_required");
await expect(page.getByTestId("login-wecom-primary-panel")).toBeVisible();
await expect(page.getByTestId("wecom-entry-primary")).toBeVisible();
await expect(page.getByTestId("wecom-entry-pc")).toHaveCount(0);
await expect(page.getByTestId("login-wecom-notice")).toContainText("企业微信账号映射尚未完成");
await expect(page.getByTestId("login-wecom-notice")).not.toContainText("账号密码登录");
await expect(page.getByTestId("login-password-secondary-panel")).toBeVisible();