@cloudbase/toolbox 0.7.17-beta.3 → 0.7.18

package/lib/auth/index.d.ts

@@ -47,6 +47,12 @@ export interface WebAuthOptions {
     getOAuthEndpoint?: DeviceFlowOptions['getOAuthEndpoint'];
     /** 静默模式，不打印任何日志 */
     silent?: boolean;
+    /**
+     * 自定义授权流程模式
+     * 为 true 时，device/code 和 token 接口的返回值没有外层 { code, result, reqId } 包装，
+     * 直接就是 result 本体；同时 verification_uri 直接使用接口返回值，不再由客户端拼接。
+     */
+    custom?: DeviceFlowOptions['custom'];
 }
 export interface LoginByApiSecretOptions {
     /**

package/lib/auth/index.js

@@ -82,7 +82,7 @@ class AuthSupervisor {
      */
     loginByWebAuth(options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode, getOAuthEndpoint, silent } = options;
+            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode, getOAuthEndpoint, silent, custom } = options;
             if (this.cacheCredential && this.needCache && !this.isCacheExpire()) {
                 return this.cacheCredential;
             }
@@ -100,7 +100,7 @@ class AuthSupervisor {
                 });
             }
             else {
-                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent });
+                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent, custom });
             }
             credential = (0, common_1.resolveCredential)(credential);
             try {

package/lib/auth/oauth.d.ts

@@ -13,5 +13,11 @@ export interface DeviceFlowOptions {
     getAuthUrl?: (rawUrl: string) => string;
     /** 静默模式，不打印任何日志 */
     silent?: boolean;
+    /**
+     * 自定义授权流程模式
+     * 为 true 时，device/code 和 token 接口的返回值没有外层 { code, result, reqId } 包装，
+     * 直接就是 result 本体；同时 verification_uri 直接使用接口返回值，不再由客户端拼接。
+     */
+    custom?: boolean;
 }
 export declare function getAuthTokenByDeviceFlow(options?: DeviceFlowOptions): Promise<Credential>;

package/lib/auth/oauth.js

@@ -51,25 +51,65 @@ function sleep(ms) {
         setTimeout(resolve, ms);
     });
 }
+/**
+ * 将接口原始返回值归一化为裸数据。
+ * - 标准模式：从 { code, result, reqId } 中解包，校验 code
+ * - custom 模式：返回值本身即为裸数据，直接透传
+ */
+function unwrapDeviceCodeResponse(raw, custom) {
+    console.log(raw);
+    if (custom) {
+        if (!raw || !raw.device_code) {
+            throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed (custom mode): 返回数据异常');
+        }
+        return { data: raw };
+    }
+    const resp = raw;
+    if (resp.code !== SUCCESS_CODE) {
+        throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed', {
+            code: resp.code,
+            requestId: resp.reqId,
+        });
+    }
+    return { data: resp.result, reqId: resp.reqId };
+}
+function unwrapTokenResponse(raw, custom) {
+    if (custom) {
+        return { data: raw };
+    }
+    const resp = raw;
+    // 标准模式下若外层 code 异常且无 result，直接抛错
+    if (resp.code !== SUCCESS_CODE && !resp.result) {
+        throw new error_1.CloudBaseError(`Device Flow 授权失败，错误码: ${resp.code}`, {
+            code: resp.code,
+            requestId: resp.reqId,
+        });
+    }
+    return { data: resp.result, reqId: resp.reqId };
+}
 function getAuthTokenByDeviceFlow(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent } = options;
+        const { client_id, onDeviceCode, getOAuthEndpoint, getAuthUrl, silent, custom } = options;
         const endpoint = getOAuthEndpoint ? getOAuthEndpoint(OAUTH_ENDPOINT) : OAUTH_ENDPOINT;
-        const deviceCodeResp = yield fetchDeviceCode({ client_id, endpoint });
-        if (deviceCodeResp.code !== SUCCESS_CODE) {
-            throw new error_1.CloudBaseError('Device Flow fetchDeviceCode failed', {
-                code: deviceCodeResp.code,
-                requestId: deviceCodeResp.reqId,
-            });
+        // ---- 获取 device code ----
+        const deviceCodeRaw = yield fetchDeviceCode({ client_id, endpoint });
+        const { data: deviceCodeData } = unwrapDeviceCodeResponse(deviceCodeRaw, !!custom);
+        const { device_code, user_code, expires_in, interval } = deviceCodeData;
+        // ---- 构造 verification_uri ----
+        let verification_uri;
+        if (custom) {
+            // custom 模式直接使用接口返回的 verification_uri
+            const rawUri = deviceCodeData.verification_uri || '';
+            verification_uri = getAuthUrl ? getAuthUrl(rawUri) : rawUri;
+        }
+        else {
+            // 标准模式由客户端拼接 verification_uri
+            const defaultVerificationUri = `${web_auth_1.CLI_AUTH_BASE_URL}#/cli-auth`;
+            // from=cli 后续考虑改用 client_id，因为 toolbox 作为公共依赖，可能被不同 client 所引用
+            const rawVerificationUri = `${defaultVerificationUri}?user_code=${user_code}&from=cli&flow=device`;
+            verification_uri = getAuthUrl ? getAuthUrl(rawVerificationUri) : rawVerificationUri;
         }
-        const { device_code, user_code, expires_in, interval } = deviceCodeResp.result;
-        // 暂时不消费 verification_uri，由客户端控制跳转
-        const defaultVerificationUri = `${web_auth_1.CLI_AUTH_BASE_URL}#/cli-auth`;
-        // from=cli 后续考虑改用 client_id，因为 toolbox 作为公共依赖，可能被不同 client 所引用
-        const rawVerificationUri = `${defaultVerificationUri}?user_code=${user_code}&from=cli&flow=device`;
-        const verification_uri = getAuthUrl ? getAuthUrl(rawVerificationUri) : rawVerificationUri;
         if (!silent) {
-            // 打印授权信息，引导用户操作
             console.log('\n\n若链接未自动打开，请手动复制至浏览器，或尝试其他登录方式:');
             console.log(`\n${verification_uri}`);
             console.log(`\n用户码: ${user_code}\n`);
@@ -79,21 +119,25 @@ function getAuthTokenByDeviceFlow(options = {}) {
         if (onDeviceCode) {
             onDeviceCode({ user_code, verification_uri, device_code, expires_in });
         }
+        // ---- 轮询 token ----
         let pollInterval = interval;
         const deadline = Date.now() + expires_in * 1000;
         while (Date.now() < deadline) {
             yield sleep(pollInterval * 1000);
-            let resp;
+            let tokenData;
+            let reqId;
             try {
-                resp = yield fetchPollToken({ device_code, interval: pollInterval, client_id, endpoint });
+                const tokenRaw = yield fetchPollToken({ device_code, interval: pollInterval, client_id, endpoint });
+                ({ data: tokenData, reqId } = unwrapTokenResponse(tokenRaw, !!custom));
             }
             catch (e) {
+                if (e instanceof error_1.CloudBaseError)
+                    throw e;
                 throw new error_1.CloudBaseError('Device Flow 轮询请求失败', { original: e });
             }
-            const { code, result } = resp;
-            // 服务端返回业务错误（result 中携带 error 字段）
-            if (result && 'error' in result) {
-                const { error, error_description } = result;
+            // 服务端返回业务错误（携带 error 字段）
+            if (tokenData && 'error' in tokenData) {
+                const { error, error_description } = tokenData;
                 if (error === POLL_ERROR_CODES.AUTHORIZATION_PENDING) {
                     continue;
                 }
@@ -109,17 +153,14 @@ function getAuthTokenByDeviceFlow(options = {}) {
                 }
                 throw new error_1.CloudBaseError(error_description || `Device Flow 授权失败，错误: ${error}`, {
                     code: error,
-                    requestId: resp.reqId,
+                    requestId: reqId,
                 });
             }
-            // 服务端返回成功的 Credential
-            if (code === SUCCESS_CODE && result) {
-                return result;
+            // 成功拿到 Credential
+            if (tokenData) {
+                return tokenData;
             }
-            throw new error_1.CloudBaseError(`Device Flow 授权失败，错误码: ${code}`, {
-                code,
-                requestId: resp.reqId,
-            });
+            throw new error_1.CloudBaseError('Device Flow 授权失败：返回数据异常', { requestId: reqId });
         }
         throw new error_1.CloudBaseError('授权超时，用户未在有效期内完成授权，请重试');
     });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/toolbox",
-    "version": "0.7.17-beta.3",
+    "version": "0.7.18",
     "description": "The toolbox for cloudbase",
     "main": "lib/index.js",
     "scripts": {
@@ -67,4 +67,4 @@
         }
     },
     "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
-}
+}