support login get url function

Author: chhpt

lib/utils/auth.js

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

src/types.ts

@@ -168,8 +168,8 @@ export interface ILoginOptions {
     key?: boolean
     secretId?: string
     secretKey?: string
-    // 浏览器登录打开的链接
-    authUrl?: string
+    // 修改浏览器登录打开的链接
+    getAuthUrl?: (url: string) => string
 }
 
 export interface FunctionContext {

src/utils/auth.ts

@@ -156,11 +156,8 @@ async function createLocalServer(): Promise<ServerRes> {
 }
 
 // 打开云开发控制台，获取授权
-export async function getAuthTokenFromWeb(
-    options: ILoginOptions
-): Promise<Credential> {
-    console.log(options)
-    const { authUrl } = options
+export async function getAuthTokenFromWeb(options: ILoginOptions): Promise<Credential> {
+    const { getAuthUrl } = options
     return new Promise(async (resolve, reject) => {
         const loading = loadingFactory()
         loading.start('正在打开腾讯云获取授权')
@@ -175,39 +172,43 @@ export async function getAuthTokenFromWeb(
                 throw new CloudBaseError('获取 Mac 地址失败，无法登录！')
             }
 
-            const CliAuthUrl =
-                authUrl ||
-                `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
-            await open(CliAuthUrl)
-
-            loading.succeed(
-                '已打开云开发 CLI 授权页面，请在云开发 CLI 授权页面同意授权！'
-            )
-
-            server.on(
-                'request',
-                (req: IncomingMessage, res: ServerResponse) => {
-                    const { url } = req
-                    const { query } = queryString.parseUrl(url)
-
-                    // CORS
-                    res.writeHead(200, {
-                        'Access-Control-Allow-Origin': '*',
-                        'Content-Type': 'text/plain',
-                        // 立即关闭 http 连接
-                        Connection: 'close'
-                    })
-
-                    res.end('ok')
-
-                    // 防止接受到异常请求导致本地服务关闭
-                    if (query && query.tmpToken) {
-                        server.close()
-                    }
-
-                    resolve(query as Credential)
+            let cliAuthUrl = `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
+
+            if (getAuthUrl) {
+                try {
+                    cliAuthUrl = getAuthUrl(
+                        `${CliAuthBaseUrl}?port=${port}&hash=${hash}&mac=${mac}&os=${os}`
+                    )
+                } catch (error) {
+                    // 忽略错误
                 }
-            )
+            }
+
+            await open(cliAuthUrl)
+
+            loading.succeed('已打开云开发 CLI 授权页面，请在云开发 CLI 授权页面同意授权！')
+
+            server.on('request', (req: IncomingMessage, res: ServerResponse) => {
+                const { url } = req
+                const { query } = queryString.parseUrl(url)
+
+                // CORS
+                res.writeHead(200, {
+                    'Access-Control-Allow-Origin': '*',
+                    'Content-Type': 'text/plain',
+                    // 立即关闭 http 连接
+                    Connection: 'close'
+                })
+
+                res.end('ok')
+
+                // 防止接受到异常请求导致本地服务关闭
+                if (query && query.tmpToken) {
+                    server.close()
+                }
+
+                resolve(query as Credential)
+            })
         } catch (err) {
             logger.error(err.message)
             loading.fail('获取授权失败！')

test/login/index.test.ts

@@ -2,7 +2,10 @@ import { login } from '../../src/auth'
 
 test('登录：cloudbase login', async () => {
     const res = await login({
-        authUrl: 'https://google.com'
+        getAuthUrl: url => {
+            console.log(url)
+            return url
+        }
     })
     expect(res.code).toEqual('SUCCESS')
-})
+})

types/types.d.ts

@@ -138,7 +138,7 @@ export interface ILoginOptions {
     key?: boolean;
     secretId?: string;
     secretKey?: string;
-    authUrl?: string;
+    getAuthUrl?: (url: string) => string;
 }
 export interface FunctionContext {
     name: string;