gaoding-cli 1.0.0-alpha.11 → 1.0.0-alpha.13

package/README.md

@@ -4,7 +4,7 @@
 
 ## 安装
 
-需要 Node.js 24 或更高版本。使用 npm 或 pnpm 全局安装：
+需要 Node.js 20 或更高版本。使用 npm 或 pnpm 全局安装：
 
 ```bash
 npm install --global --allow-scripts=gaoding-cli gaoding-cli

package/dist/src/features/auth/sso-service.js

@@ -24,11 +24,11 @@ export function createSsoService(options) {
     const baseUrl = new URL(options.ssoApi);
     if (!baseUrl.pathname.endsWith("/"))
         baseUrl.pathname += "/";
-    async function request(relativeUrl, signal) {
+    async function request(relativeUrl, signal, method = "POST") {
         signal.throwIfAborted();
         try {
             return await options.fetch(new URL(relativeUrl, baseUrl), {
-                method: "POST",
+                method,
                 headers: { Accept: "application/json" },
                 signal: AbortSignal.any([
                     signal,
@@ -98,6 +98,21 @@ export function createSsoService(options) {
                 result.organizationId = organizationId;
             return result;
         },
+        async getIdentity(accessKey, signal) {
+            const query = new URLSearchParams({ ak: accessKey });
+            const response = await request(`oauth/device/identity?${query}`, signal, "GET");
+            if (!response.ok)
+                throw new SsoRequestError(response.status);
+            const body = await responseRecord(response);
+            const result = {};
+            const userId = identifier(body.userId);
+            if (userId)
+                result.account = { id: userId, name: userId };
+            const organizationId = identifier(body.orgId);
+            if (organizationId)
+                result.organizationId = organizationId;
+            return result;
+        },
         async bindOrganization(input, signal) {
             const timestamp = Math.floor(options.now().getTime() / 1000);
             const query = new URLSearchParams({

package/dist/src/features/auth/use-cases.js

@@ -71,20 +71,33 @@ export function createAuthUseCases(dependencies) {
                     interval += 5_000;
                     continue;
                 }
-                const state = {
+                let state = {
                     version: 1,
                     credential: token.credential,
                     ...(token.account ? { account: token.account } : {})
                 };
                 await dependencies.store.write(state);
-                if (!token.organizationId) {
+                let organizationId = token.organizationId;
+                try {
+                    const identity = await dependencies.sso.getIdentity(token.credential.accessKey, input.signal);
+                    organizationId = identity.organizationId ?? organizationId;
+                    if (!state.account && identity.account) {
+                        state = { ...state, account: identity.account };
+                        await dependencies.store.write(state);
+                    }
+                }
+                catch {
+                    if (input.signal.aborted)
+                        throw input.signal.reason;
+                }
+                if (!organizationId) {
                     input.interaction.warn("登录成功，请执行 gd-cli org switch 选择组织。");
                     return { status: "logged_in", organizationSelected: false };
                 }
                 try {
                     const organization = await dependencies.organizationBinder.bindAuthorizedOrganization({
                         credential: token.credential,
-                        organizationId: token.organizationId,
+                        organizationId,
                         signal: input.signal
                     });
                     if (!organization) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gaoding-cli",
-  "version": "1.0.0-alpha.11",
+  "version": "1.0.0-alpha.13",
   "description": "Gaoding command-line interface for agents and people.",
   "type": "module",
   "license": "MIT",
@@ -10,7 +10,7 @@
     "tag": "alpha"
   },
   "engines": {
-    "node": ">=24"
+    "node": ">=20.0.0"
   },
   "bin": {
     "gd-cli": "dist/bin/gd-cli.js"
@@ -26,7 +26,7 @@
     "ajv": "8.20.0",
     "ajv-formats": "3.0.1",
     "ali-oss": "6.23.0",
-    "commander": "15.0.0",
+    "commander": "14.0.3",
     "open": "11.0.0",
     "qrcode": "1.5.4",
     "semver": "7.8.5",