@dreamor/atlas-cli 0.7.4 → 0.7.6

package/dist/adapters/atlas/auth/login.js

@@ -7,7 +7,6 @@ const _require = createRequire(import.meta.url);
 const BANMA_HOST = 'banma-yuntu.alibaba-inc.com';
 // 白名单：只保存 getBanmaIdentity 真正需要的 cookies，避免整域 cookies 落盘
 const WANT_COOKIES = new Set(['access_token', 'buc_username', 'buc_userinfo']);
-const EMP_ID_NAMES = new Set(['emp_id', 'empId', 'employeeId']);
 /**
  * 动态加载 playwright。顶层静态 import 会让单文件 bundle 在未安装 playwright 的
  * 环境下无法启动（连 --version 都 require 失败），故改为运行时动态 import + try/catch
@@ -61,10 +60,25 @@ export async function login(_port) {
     log('请在浏览器中完成 SSO 登录...');
     log('登录成功后页面会自动跳转，CLI 会自动捕获 cookies');
     await page.goto(`https://${BANMA_HOST}/`, { waitUntil: 'domcontentloaded', timeout: 60000 });
-    // 等待 access_token cookie 出现（最多 120s），比脆弱的 url 判断 + 固定 timeout 更可靠
-    await page.waitForFunction(() => document.cookie.includes('access_token'), { timeout: 120_000 });
+    // 等待 access_token cookie 出现（最多 120s）。
+    // 注意 access_token 是 HttpOnly cookie，不能用 document.cookie 检测，
+    // 必须走 page.context().cookies() 才能读到。
+    const MAX_WAIT = 120_000;
+    const POLL_INTERVAL = 500;
+    let foundToken = false;
+    for (let elapsed = 0; elapsed < MAX_WAIT; elapsed += POLL_INTERVAL) {
+        const allCookies = await page.context().cookies();
+        if (allCookies.some((c) => c.name === 'access_token' && c.value)) {
+            foundToken = true;
+            break;
+        }
+        await page.waitForTimeout(POLL_INTERVAL);
+    }
+    if (!foundToken) {
+        log('SSO 登录检测超时。如果您已完成登录，请按 Ctrl+C 重试或确认账号权限。');
+    }
     // 额外等待确保残留 cookie 写入完毕
-    await page.waitForTimeout(1000);
+    await page.waitForTimeout(500);
     // Extract cookies — 精确白名单，避免整域 cookies 落盘
     const cookies = await page.context().cookies();
     const atlasCookies = cookies
@@ -84,10 +98,11 @@ export async function loginStatus() {
     try {
         const daemonCookies = await fetchCookiesFromDaemon();
         if (daemonCookies && daemonCookies.length > 0) {
-            const empIdCookie = daemonCookies.find((c) => EMP_ID_NAMES.has(c.name));
+            const { getBanmaIdentity } = await import('./session.js');
+            const identity = getBanmaIdentity(daemonCookies);
             return {
                 loggedIn: true,
-                account: empIdCookie?.value ?? 'via-daemon',
+                account: identity?.staffId || identity?.user || 'via-daemon',
                 mode: 'daemon',
             };
         }
@@ -98,10 +113,11 @@ export async function loginStatus() {
     // Check local cookies
     const cookies = await readCookies();
     if (cookies && cookies.length > 0) {
-        const empIdCookie = cookies.find((c) => EMP_ID_NAMES.has(c.name));
+        const { getBanmaIdentity } = await import('./session.js');
+        const identity = getBanmaIdentity(cookies);
         return {
             loggedIn: true,
-            account: empIdCookie?.value ?? 'cookies-present',
+            account: identity?.staffId || identity?.user || '已登录',
             mode: 'local',
         };
     }

package/dist/adapters/atlas/util/version.js

@@ -1 +1 @@
-export const ATLAS_VERSION = '0.7.4';
+export const ATLAS_VERSION = '0.7.6';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dreamor/atlas-cli",
-  "version": "0.7.4",
+  "version": "0.7.6",
   "description": "Atlas CLI - 斑马云图人力基线管理工具",
   "type": "module",
   "bin": {