support specify login auth url

Author: chhpt

lib/auth/login.js

@@ -45,15 +45,15 @@ const LoginRes = {
         };
     }
 };
-function loginWithToken() {
+function loginWithToken(options) {
     return __awaiter(this, void 0, void 0, function* () {
         const isLogin = yield utils_1.checkAndGetCredential();
         if (isLogin) {
             return LoginRes.SUCCESS;
         }
         let credential;
         try {
-            credential = yield utils_1.getAuthTokenFromWeb();
+            credential = yield utils_1.getAuthTokenFromWeb(options);
         }
         catch (e) {
             return LoginRes.UNKNOWN_ERROR(e.message);
@@ -92,14 +92,14 @@ function loginWithKey(secretId, secretKey) {
     });
 }
 exports.loginWithKey = loginWithKey;
-function login(options) {
+function login(options = {}) {
     return __awaiter(this, void 0, void 0, function* () {
         if (options && options.key) {
             const { secretId, secretKey } = options;
             return yield loginWithKey(secretId, secretKey);
         }
         else {
-            return yield loginWithToken();
+            return yield loginWithToken(options);
         }
     });
 }

lib/utils/auth.js

@@ -141,8 +141,10 @@ function createLocalServer() {
         }));
     });
 }
-function getAuthTokenFromWeb() {
+function getAuthTokenFromWeb(options) {
     return __awaiter(this, void 0, void 0, function* () {
+        console.log(options);
+        const { authUrl } = options;
         return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             const loading = utils_1.loadingFactory();
             loading.start('正在打开腾讯云获取授权');
@@ -154,7 +156,8 @@ function getAuthTokenFromWeb() {
                 if (!mac) {
                     throw new error_1.CloudBaseError('获取 Mac 地址失败，无法登录！');
                 }
-                const CliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`;
+                const CliAuthUrl = authUrl ||
+                    `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`;
                 yield open_1.default(CliAuthUrl);
                 loading.succeed('已打开云开发 CLI 授权页面，请在云开发 CLI 授权页面同意授权！');
                 server.on('request', (req, res) => {

src/auth/login.ts

@@ -45,7 +45,7 @@ const LoginRes = {
 }
 
 // 打开腾讯云-云开发控制台，通过获取临时密钥登录，临时密钥可续期，最长时间为 1 个月
-export async function loginWithToken() {
+export async function loginWithToken(options: ILoginOptions) {
     const isLogin = await checkAndGetCredential()
 
     if (isLogin) {
@@ -55,7 +55,7 @@ export async function loginWithToken() {
     let credential
 
     try {
-        credential = await getAuthTokenFromWeb()
+        credential = await getAuthTokenFromWeb(options)
     } catch (e) {
         return LoginRes.UNKNOWN_ERROR(e.message)
     }
@@ -98,12 +98,12 @@ export async function loginWithKey(secretId?: string, secretKey?: string) {
 }
 
 export async function login(
-    options?: ILoginOptions
+    options: ILoginOptions = {}
 ): Promise<{ code: string; msg: string }> {
     if (options && options.key) {
         const { secretId, secretKey } = options
         return await loginWithKey(secretId, secretKey)
     } else {
-        return await loginWithToken()
+        return await loginWithToken(options)
     }
 }

src/types.ts

@@ -165,9 +165,11 @@ export interface IFunctionTriggerOptions {
 }
 
 export interface ILoginOptions {
-    key: boolean
+    key?: boolean
     secretId?: string
     secretKey?: string
+    // 浏览器登录打开的链接
+    authUrl?: string
 }
 
 export interface FunctionContext {

src/utils/auth.ts

@@ -6,7 +6,7 @@ import queryString from 'query-string'
 import open from 'open'
 import address from 'address'
 
-import { Credential, AuthSecret } from '../types'
+import { Credential, AuthSecret, ILoginOptions } from '../types'
 export { printHorizontalTable } from './cli-table'
 import { authStore } from './store'
 import { ConfigItems } from '../constant'
@@ -156,7 +156,11 @@ async function createLocalServer(): Promise<ServerRes> {
 }
 
 // 打开云开发控制台，获取授权
-export async function getAuthTokenFromWeb(): Promise<Credential> {
+export async function getAuthTokenFromWeb(
+    options: ILoginOptions
+): Promise<Credential> {
+    console.log(options)
+    const { authUrl } = options
     return new Promise(async (resolve, reject) => {
         const loading = loadingFactory()
         loading.start('正在打开腾讯云获取授权')
@@ -171,7 +175,9 @@ export async function getAuthTokenFromWeb(): Promise<Credential> {
                 throw new CloudBaseError('获取 Mac 地址失败，无法登录！')
             }
 
-            const CliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
+            const CliAuthUrl =
+                authUrl ||
+                `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
             await open(CliAuthUrl)
 
             loading.succeed(

test/login/index.test.ts

@@ -1,6 +1,8 @@
 import { login } from '../../src/auth'
 
 test('登录：cloudbase login', async () => {
-    const res = await login()
+    const res = await login({
+        authUrl: 'https://google.com'
+    })
     expect(res.code).toEqual('SUCCESS')
-})
+})

types/auth/login.d.ts

@@ -1,5 +1,5 @@
 import { ILoginOptions } from '../types';
-export declare function loginWithToken(): Promise<{
+export declare function loginWithToken(options: ILoginOptions): Promise<{
     code: string;
     msg: string;
 }>;

types/types.d.ts

@@ -135,9 +135,10 @@ export interface IFunctionTriggerOptions {
     envId: string;
 }
 export interface ILoginOptions {
-    key: boolean;
+    key?: boolean;
     secretId?: string;
     secretKey?: string;
+    authUrl?: string;
 }
 export interface FunctionContext {
     name: string;

types/utils/auth.d.ts

@@ -1,8 +1,8 @@
-import { Credential, AuthSecret } from '../types';
+import { Credential, AuthSecret, ILoginOptions } from '../types';
 export { printHorizontalTable } from './cli-table';
 export declare function refreshTmpToken(metaData: Credential & {
     isLogout?: boolean;
 }): Promise<Credential>;
 export declare function getCredentialData(): Credential;
 export declare function getCredentialWithoutCheck(): Promise<AuthSecret>;
-export declare function getAuthTokenFromWeb(): Promise<Credential>;
+export declare function getAuthTokenFromWeb(options: ILoginOptions): Promise<Credential>;