@cloudbase/toolbox 0.7.17-beta.0 → 0.7.17-beta.2

package/lib/auth/index.d.ts

@@ -22,7 +22,7 @@ export interface AuthSupervisorOptions {
      */
     throwError?: boolean;
 }
-export type AuthFlowType = 'default' | 'web' | 'device';
+export type AuthFlow = 'web' | 'device';
 export interface WebAuthOptions {
     /**
      * 请在初始化实例时指定
@@ -31,12 +31,11 @@ export interface WebAuthOptions {
     throwError?: boolean;
     /**
      * 授权方式
-     * - 'default': 自动选择，优先 web，浏览器打开失败或无浏览器环境时降级到 device
-     * - 'web': 强制使用网页回调授权
-     * - 'device': 强制使用 Device Flow 授权
-     * @default 'default'
+     * - 'web': 使用网页回调授权
+     * - 'device': 使用 Device Flow 授权
+     * @default 'device'
      */
-    mode?: AuthFlowType;
+    flow?: AuthFlow;
     getAuthUrl?: (rawUrl: string) => string;
     noBrowser?: boolean;
     callbackTimeout?: number;

package/lib/auth/index.js

@@ -28,7 +28,6 @@ const web_auth_1 = require("./web-auth");
 const oauth_1 = require("./oauth");
 const common_1 = require("./common");
 const credential_1 = require("./credential");
-const web_1 = require("../web");
 const error_1 = require("../error");
 __exportStar(require("./common"), exports);
 __exportStar(require("./credential"), exports);
@@ -83,7 +82,7 @@ class AuthSupervisor {
      */
     loginByWebAuth(options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { getAuthUrl, throwError, noBrowser, callbackTimeout, mode: authFlowType, client_id, onDeviceCode } = options;
+            const { getAuthUrl, throwError, noBrowser, callbackTimeout, flow = 'device', client_id, onDeviceCode } = options;
             if (this.cacheCredential && this.needCache && !this.isCacheExpire()) {
                 return this.cacheCredential;
             }
@@ -92,42 +91,15 @@ class AuthSupervisor {
             if (credential)
                 return credential;
             // 根据授权方式获取凭证
-            switch (authFlowType) {
-                case 'device':
-                    credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode });
-                    break;
-                case 'web':
-                    credential = yield (0, web_auth_1.getAuthTokenFromWeb)({
-                        getAuthUrl,
-                        noBrowser,
-                        callbackTimeout
-                    });
-                    break;
-                case 'default':
-                default: {
-                    const isNoBrowser = noBrowser || (0, web_1.isTruthyFlag)(process.env.TCB_NO_BROWSER);
-                    if (isNoBrowser) {
-                        credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode });
-                    }
-                    else {
-                        try {
-                            credential = yield (0, web_auth_1.getAuthTokenFromWeb)({
-                                getAuthUrl,
-                                callbackTimeout,
-                                onOpenFailed: () => { }
-                            });
-                        }
-                        catch (e) {
-                            if ((e === null || e === void 0 ? void 0 : e.code) === 'BROWSER_OPEN_FAILED') {
-                                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode });
-                            }
-                            else {
-                                throw e;
-                            }
-                        }
-                    }
-                    break;
-                }
+            if (flow === 'web') {
+                credential = yield (0, web_auth_1.getAuthTokenFromWeb)({
+                    getAuthUrl,
+                    noBrowser,
+                    callbackTimeout
+                });
+            }
+            else {
+                credential = yield (0, oauth_1.getAuthTokenByDeviceFlow)({ client_id, onDeviceCode });
             }
             credential = (0, common_1.resolveCredential)(credential);
             try {

package/lib/auth/web-auth.d.ts

@@ -4,5 +4,4 @@ export declare function getAuthTokenFromWeb(options?: {
     getAuthUrl?: (rawUrl: string) => string;
     noBrowser?: boolean;
     callbackTimeout?: number;
-    onOpenFailed?: () => void;
 }): Promise<Credential>;

package/lib/auth/web-auth.js

@@ -18,7 +18,7 @@ exports.CLI_AUTH_BASE_URL = 'https://tcb.cloud.tencent.com/dev';
 // 打开云开发控制台，获取授权
 function getAuthTokenFromWeb(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { getAuthUrl, noBrowser, callbackTimeout, onOpenFailed } = options;
+        const { getAuthUrl, noBrowser, callbackTimeout } = options;
         const mac = yield (0, system_1.getMacAddress)();
         const os = (0, system_1.getOSInfo)();
         const macHash = (0, coding_1.md5Encoding)(mac);
@@ -44,8 +44,7 @@ function getAuthTokenFromWeb(options = {}) {
             return cliAuthUrl;
         }, 'login', {
             noBrowser,
-            callbackTimeout,
-            onOpenFailed
+            callbackTimeout
         });
         const credential = (0, common_1.resolveCredential)(query);
         return credential;

package/lib/web/web.d.ts

@@ -6,11 +6,7 @@ export type CheckFn = (query: IQuery) => Promise<void>;
 export interface GetDataFromWebOptions {
     noBrowser?: boolean;
     callbackTimeout?: number;
-    /** 浏览器打开失败时的回调，若提供则中止等待并抛出错误 */
-    onOpenFailed?: () => void;
 }
 export declare function isTruthyFlag(value?: string): boolean;
-export declare function openUrl(url: string, options?: {
-    skipBrowserFallback?: boolean;
-}): Promise<boolean>;
+export declare function openUrl(url: string): Promise<boolean>;
 export declare function getDataFromWeb<T extends IQuery>(getUrl: GetUrlFn, type: 'login' | 'getData', options?: GetDataFromWebOptions): Promise<T>;

package/lib/web/web.js

@@ -94,12 +94,11 @@ function openUrlByBrowserEnv(url) {
 function shouldUseBrowserEnvFallback() {
     return process.platform === 'linux' && isVSCodeEnvironment();
 }
-function openUrl(url, options = {}) {
+function openUrl(url) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { skipBrowserFallback = false } = options;
         try {
             const child = yield (0, open_1.default)(url, { url: true });
-            if ((child === null || child === void 0 ? void 0 : child.once) && !skipBrowserFallback) {
+            if (child === null || child === void 0 ? void 0 : child.once) {
                 child.once('error', (error) => __awaiter(this, void 0, void 0, function* () {
                     if (shouldUseBrowserEnvFallback()) {
                         yield openUrlByBrowserEnv(url);
@@ -109,7 +108,7 @@ function openUrl(url, options = {}) {
             return true;
         }
         catch (e) {
-            if (!skipBrowserFallback && shouldUseBrowserEnvFallback()) {
+            if (shouldUseBrowserEnvFallback()) {
                 return openUrlByBrowserEnv(url);
             }
             return false;
@@ -134,13 +133,7 @@ function getDataFromWeb(getUrl, type, options = {}) {
             // 对 url 转码, 避免 wsl 无法正常打开地址
             // https://www.npmjs.com/package/open#url
             // https://github.com/sindresorhus/open/blob/master/index.js#L48
-            const skipBrowserFallback = !!options.onOpenFailed;
-            const opened = yield openUrl(url, { skipBrowserFallback });
-            if (!opened && options.onOpenFailed) {
-                server.close();
-                options.onOpenFailed();
-                throw new error_1.CloudBaseError('浏览器打开失败', { code: 'BROWSER_OPEN_FAILED' });
-            }
+            yield openUrl(url);
         }
         return new Promise((resolve, reject) => {
             let finished = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/toolbox",
-    "version": "0.7.17-beta.0",
+    "version": "0.7.17-beta.2",
     "description": "The toolbox for cloudbase",
     "main": "lib/index.js",
     "scripts": {