From 64d0883e305912d400fc197c595186c38bf194ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9A=E7=AB=A0=E6=B5=A9?= Date: Mon, 14 Sep 2026 23:21:01 +0800 Subject: [PATCH] fix(settings): complete DingTalk scan login flow --- services/dingtalk-login/server.mjs | 31 +++++++++-- web/src/DingtalkSessionControl.tsx | 83 ++++++++++++++++++++++-------- web/src/DingtalkSpaceRegistrar.tsx | 21 +++++++- web/src/dingtalkSession.test.ts | 29 +++++++++++ web/src/dingtalkSession.ts | 17 +++++- web/src/systemSettings.css | 3 ++ 6 files changed, 155 insertions(+), 29 deletions(-) create mode 100644 web/src/dingtalkSession.test.ts diff --git a/services/dingtalk-login/server.mjs b/services/dingtalk-login/server.mjs index 337c0e3..6932eb5 100644 --- a/services/dingtalk-login/server.mjs +++ b/services/dingtalk-login/server.mjs @@ -172,18 +172,25 @@ async function startSession(id, space) { scheduleCleanup(s); }; - page.on("request", (request) => { + const captureRequest = async (request) => { const url = request.url(); if (!url.includes("dingtalk.com")) return; - const h = request.headers(); - if (!h["a-token"] || !h.cookie || capturedHeaders) return; + // Playwright request.headers() intentionally omits security-related + // headers on some Chromium builds, notably Cookie. allHeaders() is the + // complete API and is required for the capture consumed by the scanner. + const h = await request.allHeaders().catch(() => request.headers()); + if (capturedHeaders) return; + if (!h["a-token"] || !h.cookie) return; capturedHeaders = { ...h }; delete capturedHeaders["content-length"]; delete capturedHeaders["accept-encoding"]; delete capturedHeaders["host"]; s.state = s.state === "qr" ? "scanned" : "reusing"; finish(capturedHeaders); - }); + }; + // Login may redirect the original tab or open another page. Listening on + // the whole context keeps credential capture alive across both paths. + context.on("request", captureRequest); // Read the QR directly from DingTalk's canvas. Do NOT screenshot the DOM: // Playwright element screenshots on a high-DPR page can apply the crop in @@ -226,7 +233,21 @@ async function startSession(id, space) { await page.goto(SCAN_URL(space), { waitUntil: "domcontentloaded", timeout: 45000 }).catch(() => {}); if (page.url().includes("login.dingtalk.com") && !capturedHeaders) { - s.qrPng = await grabQR(); + // The canvas is rendered after DOMContentLoaded. Keep the public state at + // starting until a real QR exists so the UI shows its generation loader, + // never an empty "please scan" panel. + const qrReadyDeadline = Date.now() + 20000; + while (!capturedHeaders && !s.qrPng && Date.now() < qrReadyDeadline) { + s.qrPng = await grabQR(); + if (!s.qrPng) await new Promise((resolve) => setTimeout(resolve, 400)); + } + if (capturedHeaders) return; + if (!s.qrPng) { + s.state = "failed"; + s.error = "qr_generation_failed"; + scheduleCleanup(s); + return; + } s.state = "qr"; const deadline = Date.now() + QR_TTL_MS; const regrab = setInterval(async () => { diff --git a/web/src/DingtalkSessionControl.tsx b/web/src/DingtalkSessionControl.tsx index 8b26860..c125082 100644 --- a/web/src/DingtalkSessionControl.tsx +++ b/web/src/DingtalkSessionControl.tsx @@ -1,4 +1,4 @@ -import { useEffect, useRef, useState } from 'react' +import { useCallback, useEffect, useRef, useState } from 'react' import { cancelDingtalkSession, fetchDingtalkSession, startDingtalkSession } from './dingtalkSession' import type { DingtalkSessionView } from './dingtalkSession' @@ -9,11 +9,22 @@ import type { DingtalkSessionView } from './dingtalkSession' const finished = new Set(['success', 'expired', 'failed', 'closed']) -export function DingtalkSessionControl() { +interface DingtalkSessionControlProps { + autoStart?: boolean + hideTrigger?: boolean + onSuccess?: () => void + onClose?: () => void +} + +export function DingtalkSessionControl({ autoStart = false, hideTrigger = false, onSuccess, onClose }: DingtalkSessionControlProps = {}) { const [session, setSession] = useState(null) const [failure, setFailure] = useState(null) const [starting, setStarting] = useState(false) + const [open, setOpen] = useState(false) + const [lastSuccess, setLastSuccess] = useState(false) const idRef = useRef(null) + const autoStartedRef = useRef(false) + const successHandledRef = useRef(false) useEffect(() => () => { if (idRef.current) void cancelDingtalkSession(idRef.current) }, []) @@ -25,8 +36,20 @@ export function DingtalkSessionControl() { return () => clearInterval(timer) }, [session?.id, session?.state]) - const start = async () => { - setStarting(true); setFailure(null) + const close = useCallback((cancel = true) => { + if (cancel && idRef.current) void cancelDingtalkSession(idRef.current) + idRef.current = null + setSession(null) + setStarting(false) + setOpen(false) + onClose?.() + }, [onClose]) + + const start = useCallback(async () => { + // Show the dialog immediately. Launching Chromium and rendering the QR can + // take several seconds and must never look like an ignored click. + setOpen(true); setStarting(true); setFailure(null); setSession(null); setLastSuccess(false) + successHandledRef.current = false try { const fresh = await startDingtalkSession() idRef.current = fresh.id @@ -36,35 +59,53 @@ export function DingtalkSessionControl() { } finally { setStarting(false) } - } + }, []) - const close = () => { - if (idRef.current) void cancelDingtalkSession(idRef.current) - idRef.current = null - setSession(null) - } + useEffect(() => { + if (!autoStart || autoStartedRef.current) return + autoStartedRef.current = true + void start() + }, [autoStart, start]) + + useEffect(() => { + if (session?.state !== 'success' || successHandledRef.current) return + successHandledRef.current = true + const timer = window.setTimeout(() => { + setLastSuccess(true) + onSuccess?.() + close(false) + }, 700) + return () => window.clearTimeout(timer) + }, [session?.state, onSuccess, close]) const stateLabel: Record = { - starting: '正在打开登录页…', qr: '请用钉钉 App 扫码登录', scanned: '已扫码,正在获取会话…', + starting: '正在生成二维码,请稍候…', qr: '请用钉钉 App 扫码登录', scanned: '已扫码,正在验证并继续…', reusing: '检测到有效浏览器会话,正在验证…', success: '✅ 钉钉扫码会话已刷新,扫描任务可继续使用', expired: '二维码已过期,请重新发起', failed: '会话验证失败,请重试或联系管理员', closed: '会话已关闭', } + const generating = open && !failure && (starting || !session || session.state === 'starting') + return
- - {failure ?

{failure}

: null} - {session ?
+ : null} + {lastSuccess && !hideTrigger ?

✅ 钉钉会话已刷新

: null} + {failure && !open ?

{failure}

: null} + {open ?

刷新钉钉扫码会话

-

{stateLabel[session.state] ?? session.state}

- {session.qr_png && session.state === 'qr' ? 钉钉登录二维码 : null} - {session.error ?

{session.error}

: null} +

+ {generating ? '正在生成二维码,请稍候…' : session ? (stateLabel[session.state] ?? session.state) : '二维码生成失败,请重试'} +

+ {generating ? : null} + {session?.qr_png && session.state === 'qr' ? 钉钉登录二维码 : null} + {session?.error ?

{session.error}

: null} + {failure ?

{failure}

: null}
- {finished.has(session.state) - ? - : } + {session && finished.has(session.state) + ? + : }
: null} diff --git a/web/src/DingtalkSpaceRegistrar.tsx b/web/src/DingtalkSpaceRegistrar.tsx index 0b60c50..3ede276 100644 --- a/web/src/DingtalkSpaceRegistrar.tsx +++ b/web/src/DingtalkSpaceRegistrar.tsx @@ -1,6 +1,7 @@ import { useState } from 'react' -import { registerDingtalkSpace } from './dingtalkSession' +import { DingtalkRequestError, registerDingtalkSpace } from './dingtalkSession' +import { DingtalkSessionControl } from './DingtalkSessionControl' // Admin-only entry in 系统设置 → 数据源配置: paste a DingTalk knowledge-base // space URL (or space id) and register it as a governed source. The sidecar @@ -13,8 +14,9 @@ export function DingtalkSpaceRegistrar({ onRegistered }: { onRegistered: () => v const [busy, setBusy] = useState(false) const [failure, setFailure] = useState(null) const [done, setDone] = useState(null) + const [loginRequired, setLoginRequired] = useState(false) - const submit = async () => { + const submit = async (afterLogin = false) => { setBusy(true); setFailure(null) try { const registered = await registerDingtalkSpace(url.trim()) @@ -22,12 +24,21 @@ export function DingtalkSpaceRegistrar({ onRegistered }: { onRegistered: () => v setUrl('') onRegistered() } catch (cause) { + if (cause instanceof DingtalkRequestError && cause.code === 'login_required' && !afterLogin) { + setLoginRequired(true) + return + } setFailure(cause instanceof Error ? cause.message : '登记钉钉知识库失败') } finally { setBusy(false) } } + const resumeAfterLogin = () => { + setLoginRequired(false) + void submit(true) + } + return
{open ?
@@ -45,5 +56,11 @@ export function DingtalkSpaceRegistrar({ onRegistered }: { onRegistered: () => v
: null} + {loginRequired ? setLoginRequired(false)} + /> : null}
} diff --git a/web/src/dingtalkSession.test.ts b/web/src/dingtalkSession.test.ts new file mode 100644 index 0000000..63c8eb7 --- /dev/null +++ b/web/src/dingtalkSession.test.ts @@ -0,0 +1,29 @@ +import { afterEach, describe, expect, it, vi } from 'vitest' + +import { DingtalkRequestError, registerDingtalkSpace, startDingtalkSession } from './dingtalkSession' + +afterEach(() => vi.unstubAllGlobals()) + +describe('DingTalk session client', () => { + it('returns the starting state immediately while the QR is being generated', async () => { + const fetchMock = vi.fn().mockResolvedValue(new Response(JSON.stringify({ + id: 'session-1', state: 'starting', created_at: 1, expires_at: 2, + }), { status: 201 })) + vi.stubGlobal('fetch', fetchMock) + + await expect(startDingtalkSession()).resolves.toMatchObject({ id: 'session-1', state: 'starting' }) + expect(fetchMock).toHaveBeenCalledWith('/api/v1/dingtalk-session', expect.objectContaining({ method: 'POST' })) + }) + + it('preserves login_required as a machine-readable error for automatic QR fallback', async () => { + vi.stubGlobal('fetch', vi.fn().mockResolvedValue(new Response( + JSON.stringify({ error: 'login_required' }), + { status: 409, headers: { 'Content-Type': 'application/json' } }, + ))) + + const error = await registerDingtalkSpace('https://alidocs.dingtalk.com/i/spaces/9JOGOQneRgkneX4Q/overview') + .then(() => null, (cause: unknown) => cause) + expect(error).toBeInstanceOf(DingtalkRequestError) + expect(error).toMatchObject({ code: 'login_required', status: 409 }) + }) +}) diff --git a/web/src/dingtalkSession.ts b/web/src/dingtalkSession.ts index 2cc7e19..124711a 100644 --- a/web/src/dingtalkSession.ts +++ b/web/src/dingtalkSession.ts @@ -46,6 +46,17 @@ export interface RegisteredDingtalkSpace { name: string } +export class DingtalkRequestError extends Error { + constructor( + message: string, + public readonly code: string, + public readonly status: number, + ) { + super(message) + this.name = 'DingtalkRequestError' + } +} + // Register a DingTalk knowledge-base space (URL or bare space id) as a new // source connection. Errors carry the sidecar's machine codes so the UI can // explain them: login_required, space_not_found, name_conflict. @@ -67,7 +78,11 @@ export async function registerDingtalkSpace(url: string): Promise