@cloudbase/cli 1.12.7-alpha.4 → 2.0.0

package/src/commands/account/login.ts

@@ -1,192 +1,192 @@
-import _ from 'lodash'
-import chalk from 'chalk'
-import inquirer from 'inquirer'
-import { Command, ICommand } from '../common'
-import { login } from '../../auth'
-import { listEnvs } from '../../env'
-import { CloudBaseError } from '../../error'
-import { InjectParams, ArgsOptions, Log, Logger } from '../../decorators'
-import {
-    loadingFactory,
-    usageStore,
-    collectAgree,
-    genClickableLink,
-    checkAndGetCredential
-} from '../../utils'
-
-function printSuggestion() {
-    const tips = `可使用下面命令继续操作：
-
-${chalk.gray('–')} 创建免费环境
-
-  ${chalk.cyan('$ tcb env create envName')}
-
-${chalk.gray('–')} 初始化云开发项目
-
-  ${chalk.cyan('$ tcb new')}
-
-${chalk.gray('–')} 部署云函数
-
-  ${chalk.cyan('$ tcb fn deploy')}
-
-${chalk.gray('–')} 查看命令使用介绍
-
-  ${chalk.cyan('$ tcb -h')}
-
-Tips：可以使用简写命令 tcb 代替 cloudbase`
-    console.log(tips)
-}
-
-async function askForCollectDataConfirm() {
-    const agree = await usageStore.get('agreeCollect')
-    if (agree) return
-    // 询问
-    const { confirm } = await inquirer.prompt({
-        type: 'confirm',
-        name: 'confirm',
-        message: '是否同意 Cloudbase CLI 收集您的使用数据以改进产品？',
-        default: true
-    })
-
-    if (confirm) {
-        await usageStore.set('agreeCollect', true)
-    }
-
-    await collectAgree(confirm)
-}
-
-@ICommand()
-export class LoginCommand extends Command {
-    get options() {
-        return {
-            cmd: 'login',
-            options: [
-                {
-                    flags: '-k, --key',
-                    desc: '使用永久密钥登录'
-                },
-                {
-                    flags: '--apiKeyId <apiKeyId>',
-                    desc: '腾讯云 API 秘钥 Id'
-                },
-                {
-                    flags: '--apiKey <apiKey>',
-                    desc: '腾讯云 API 秘钥 Key'
-                },
-                {
-                    flags: '--token [token]',
-                    desc: '腾讯云 API 临时秘钥 Token'
-                }
-            ],
-            desc: '登录腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@ArgsOptions() options, @Log() log: Logger) {
-        log.verbose(options)
-        const { apiKeyId, apiKey, token } = options
-        const loading = loadingFactory()
-        loading.start('检验登录状态')
-
-        const credential = await checkAndGetCredential()
-
-        if (!_.isEmpty(credential)) {
-            loading.succeed('您已登录，无需再次登录！')
-            return
-        } else {
-            loading.stop()
-        }
-
-        // 通过参数传入 API Key，适用于 CI 场景
-        if (apiKey && apiKeyId) {
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                token,
-                key: true,
-                secretKey: apiKey,
-                secretId: apiKeyId
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else if (options.key) {
-            // 兼容临时密钥和永久密钥登录
-            const clickableLink = genClickableLink('https://console.cloud.tencent.com/cam/capi')
-            console.log(`您可以访问 ${clickableLink} 获取 API 秘钥`)
-
-            // 使用永久密钥登录
-            const { secretId } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretId',
-                message: '请输入腾讯云 SecretID：'
-            })
-
-            const { secretKey } = await inquirer.prompt({
-                type: 'input',
-                name: 'secretKey',
-                message: '请输入腾讯云 SecretKey：'
-            })
-
-            if (!secretId || !secretKey) {
-                throw new CloudBaseError('SecretID 或 SecretKey 不能为空')
-            }
-
-            loading.start('正在验证腾讯云密钥...')
-
-            const res = await login({
-                key: true,
-                secretId,
-                secretKey
-            })
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
-                return process.exit(1)
-            }
-        } else {
-            // 使用临时密钥登录-支持自动续期
-            loading.start('获取授权中...')
-            const res = await login()
-
-            if (res.code === 'SUCCESS') {
-                loading.succeed('登录成功！')
-                await askForCollectDataConfirm()
-                printSuggestion()
-            } else {
-                loading.fail(res.msg)
-                console.log('Web 授权登录失败，秘钥校验失败！')
-                return process.exit(1)
-            }
-        }
-
-        // 检测用户是否存在，不存在则初始化
-        try {
-            const envs = await listEnvs()
-            if (!envs.length) {
-                log.warn('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境')
-            }
-        } catch (e) {
-            // 用户不存在
-            // 主账户可以直接使用 env:create 完成初始化工作
-            if (e.code === 'ResourceNotFound.UserNotExists') {
-                log.error('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境！')
-            } else {
-                console.error(e)
-                throw e
-            }
-        }
-    }
-}
+import _ from 'lodash'
+import chalk from 'chalk'
+import inquirer from 'inquirer'
+import { Command, ICommand } from '../common'
+import { login } from '../../auth'
+import { listEnvs } from '../../env'
+import { CloudBaseError } from '../../error'
+import { InjectParams, ArgsOptions, Log, Logger } from '../../decorators'
+import {
+    loadingFactory,
+    usageStore,
+    collectAgree,
+    genClickableLink,
+    checkAndGetCredential
+} from '../../utils'
+
+function printSuggestion() {
+    const tips = `可使用下面命令继续操作：
+
+${chalk.gray('–')} 创建免费环境
+
+  ${chalk.cyan('$ tcb env create envName')}
+
+${chalk.gray('–')} 初始化云开发项目
+
+  ${chalk.cyan('$ tcb new')}
+
+${chalk.gray('–')} 部署云函数
+
+  ${chalk.cyan('$ tcb fn deploy')}
+
+${chalk.gray('–')} 查看命令使用介绍
+
+  ${chalk.cyan('$ tcb -h')}
+
+Tips：可以使用简写命令 tcb 代替 cloudbase`
+    console.log(tips)
+}
+
+async function askForCollectDataConfirm() {
+    const agree = await usageStore.get('agreeCollect')
+    if (agree) return
+    // 询问
+    const { confirm } = await inquirer.prompt({
+        type: 'confirm',
+        name: 'confirm',
+        message: '是否同意 Cloudbase CLI 收集您的使用数据以改进产品？',
+        default: true
+    })
+
+    if (confirm) {
+        await usageStore.set('agreeCollect', true)
+    }
+
+    await collectAgree(confirm)
+}
+
+@ICommand()
+export class LoginCommand extends Command {
+    get options() {
+        return {
+            cmd: 'login',
+            options: [
+                {
+                    flags: '-k, --key',
+                    desc: '使用永久密钥登录'
+                },
+                {
+                    flags: '--apiKeyId <apiKeyId>',
+                    desc: '腾讯云 API 秘钥 Id'
+                },
+                {
+                    flags: '--apiKey <apiKey>',
+                    desc: '腾讯云 API 秘钥 Key'
+                },
+                {
+                    flags: '--token [token]',
+                    desc: '腾讯云 API 临时秘钥 Token'
+                }
+            ],
+            desc: '登录腾讯云账号',
+            requiredEnvId: false,
+            withoutAuth: true
+        }
+    }
+
+    @InjectParams()
+    async execute(@ArgsOptions() options, @Log() log: Logger) {
+        log.verbose(options)
+        const { apiKeyId, apiKey, token } = options
+        const loading = loadingFactory()
+        loading.start('检验登录状态')
+
+        const credential = await checkAndGetCredential()
+
+        if (!_.isEmpty(credential)) {
+            loading.succeed('您已登录，无需再次登录！')
+            return
+        } else {
+            loading.stop()
+        }
+
+        // 通过参数传入 API Key，适用于 CI 场景
+        if (apiKey && apiKeyId) {
+            loading.start('正在验证腾讯云密钥...')
+
+            const res = await login({
+                token,
+                key: true,
+                secretKey: apiKey,
+                secretId: apiKeyId
+            })
+
+            if (res.code === 'SUCCESS') {
+                loading.succeed('登录成功！')
+                printSuggestion()
+            } else {
+                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
+                return process.exit(1)
+            }
+        } else if (options.key) {
+            // 兼容临时密钥和永久密钥登录
+            const clickableLink = genClickableLink('https://console.cloud.tencent.com/cam/capi')
+            console.log(`您可以访问 ${clickableLink} 获取 API 秘钥`)
+
+            // 使用永久密钥登录
+            const { secretId } = await inquirer.prompt({
+                type: 'input',
+                name: 'secretId',
+                message: '请输入腾讯云 SecretID：'
+            })
+
+            const { secretKey } = await inquirer.prompt({
+                type: 'input',
+                name: 'secretKey',
+                message: '请输入腾讯云 SecretKey：'
+            })
+
+            if (!secretId || !secretKey) {
+                throw new CloudBaseError('SecretID 或 SecretKey 不能为空')
+            }
+
+            loading.start('正在验证腾讯云密钥...')
+
+            const res = await login({
+                key: true,
+                secretId,
+                secretKey
+            })
+
+            if (res.code === 'SUCCESS') {
+                loading.succeed('登录成功！')
+                await askForCollectDataConfirm()
+                printSuggestion()
+            } else {
+                loading.fail('腾讯云密钥验证失败，请检查密钥是否正确或终端网络是否可用！')
+                return process.exit(1)
+            }
+        } else {
+            // 使用临时密钥登录-支持自动续期
+            loading.start('获取授权中...')
+            const res = await login()
+
+            if (res.code === 'SUCCESS') {
+                loading.succeed('登录成功！')
+                await askForCollectDataConfirm()
+                printSuggestion()
+            } else {
+                loading.fail(res.msg)
+                console.log('Web 授权登录失败，秘钥校验失败！')
+                return process.exit(1)
+            }
+        }
+
+        // 检测用户是否存在，不存在则初始化
+        try {
+            const envs = await listEnvs()
+            if (!envs.length) {
+                log.warn('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境')
+            }
+        } catch (e) {
+            // 用户不存在
+            // 主账户可以直接使用 env:create 完成初始化工作
+            if (e.code === 'ResourceNotFound.UserNotExists') {
+                log.error('您还没有可用的环境，请使用 cloudbase env:create $name 创建环境！')
+            } else {
+                console.error(e)
+                throw e
+            }
+        }
+    }
+}

package/src/commands/account/logout.ts

@@ -1,24 +1,24 @@
-import { ICommand, Command } from '../common'
-
-import { logout } from '../../auth'
-import { InjectParams, Log, Logger } from '../../decorators'
-
-@ICommand()
-export class LogoutCommand extends Command {
-    get options() {
-        return {
-            cmd: 'logout',
-            options: [],
-            desc: '登出腾讯云账号',
-            requiredEnvId: false,
-            withoutAuth: true
-        }
-    }
-
-    @InjectParams()
-    async execute(@Log() log: Logger) {
-        await logout()
-
-        log.success('注销登录成功！')
-    }
-}
+import { ICommand, Command } from '../common'
+
+import { logout } from '../../auth'
+import { InjectParams, Log, Logger } from '../../decorators'
+
+@ICommand()
+export class LogoutCommand extends Command {
+    get options() {
+        return {
+            cmd: 'logout',
+            options: [],
+            desc: '登出腾讯云账号',
+            requiredEnvId: false,
+            withoutAuth: true
+        }
+    }
+
+    @InjectParams()
+    async execute(@Log() log: Logger) {
+        await logout()
+
+        log.success('注销登录成功！')
+    }
+}