@optima-chat/commerce-cli 1.5.1 → 1.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/api/rest/auth.d.ts +0 -4
- package/dist/api/rest/auth.d.ts.map +1 -1
- package/dist/api/rest/auth.js +1 -17
- package/dist/api/rest/auth.js.map +1 -1
- package/dist/api/rest/base.d.ts +1 -1
- package/dist/api/rest/base.js +4 -4
- package/dist/api/rest/base.js.map +1 -1
- package/dist/commands/auth/index.d.ts.map +1 -1
- package/dist/commands/auth/index.js +1 -5
- package/dist/commands/auth/index.js.map +1 -1
- package/dist/commands/auth/login.d.ts.map +1 -1
- package/dist/commands/auth/login.js +61 -15
- package/dist/commands/auth/login.js.map +1 -1
- package/dist/commands/auth/logout.d.ts.map +1 -1
- package/dist/commands/auth/logout.js +10 -56
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/auth/whoami.d.ts.map +1 -1
- package/dist/commands/auth/whoami.js +34 -26
- package/dist/commands/auth/whoami.js.map +1 -1
- package/dist/utils/config.d.ts +13 -45
- package/dist/utils/config.d.ts.map +1 -1
- package/dist/utils/config.js +128 -214
- package/dist/utils/config.js.map +1 -1
- package/package.json +1 -2
- package/dist/commands/auth/switch.d.ts +0 -3
- package/dist/commands/auth/switch.d.ts.map +0 -1
- package/dist/commands/auth/switch.js +0 -111
- package/dist/commands/auth/switch.js.map +0 -1
- package/dist/commands/auth/test-refresh.d.ts +0 -3
- package/dist/commands/auth/test-refresh.d.ts.map +0 -1
- package/dist/commands/auth/test-refresh.js +0 -43
- package/dist/commands/auth/test-refresh.js.map +0 -1
package/dist/api/rest/auth.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/api/rest/auth.ts"],"names":[],"mappings":"AAYA,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,cAAM,aAAa;IACjB,OAAO,CAAC,MAAM,CAAgB;;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/api/rest/auth.ts"],"names":[],"mappings":"AAYA,UAAU,kBAAkB;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAC;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,aAAa;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,cAAM,aAAa;IACjB,OAAO,CAAC,MAAM,CAAgB;;IAO9B;;OAEG;IACH,YAAY,IAAI,IAAI;IAIpB;;OAEG;IACG,iBAAiB,IAAI,OAAO,CAAC,kBAAkB,CAAC;IAgBtD;;;OAGG;IACG,eAAe,CACnB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC;IA+EzB;;OAEG;IACG,cAAc,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC;IAShE;;OAEG;IACG,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB1C,OAAO,CAAC,KAAK;CAGd;AAGD,eAAO,MAAM,OAAO,eAAsB,CAAC"}
|
package/dist/api/rest/auth.js
CHANGED
|
@@ -10,8 +10,7 @@ function getClientId() {
|
|
|
10
10
|
class AuthApiClient {
|
|
11
11
|
client;
|
|
12
12
|
constructor() {
|
|
13
|
-
//
|
|
14
|
-
// 优先级：环境变量 > 配置文件 > 默认值
|
|
13
|
+
// 使用带认证的客户端
|
|
15
14
|
this.client = createAuthenticatedClient(getAuthUrl());
|
|
16
15
|
}
|
|
17
16
|
/**
|
|
@@ -112,21 +111,6 @@ class AuthApiClient {
|
|
|
112
111
|
});
|
|
113
112
|
return response.data;
|
|
114
113
|
}
|
|
115
|
-
/**
|
|
116
|
-
* 刷新 Token
|
|
117
|
-
*/
|
|
118
|
-
async refreshToken(refreshToken) {
|
|
119
|
-
const params = new URLSearchParams();
|
|
120
|
-
params.append('grant_type', 'refresh_token');
|
|
121
|
-
params.append('refresh_token', refreshToken);
|
|
122
|
-
params.append('client_id', getClientId());
|
|
123
|
-
const response = await this.client.post('/api/v1/oauth/token', params, {
|
|
124
|
-
headers: {
|
|
125
|
-
'Content-Type': 'application/x-www-form-urlencoded',
|
|
126
|
-
},
|
|
127
|
-
});
|
|
128
|
-
return response.data;
|
|
129
|
-
}
|
|
130
114
|
/**
|
|
131
115
|
* 登出（撤销 token）
|
|
132
116
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/rest/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAExE;;GAEG;AACH,SAAS,WAAW;IAClB,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;IACxC,OAAO,SAAS,CAAC,QAAQ,CAAC;AAC5B,CAAC;AA4BD,MAAM,aAAa;IACT,MAAM,CAAgB;IAE9B;QACE,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/api/rest/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/api/rest/base.d.ts
CHANGED
package/dist/api/rest/base.js
CHANGED
|
@@ -2,7 +2,7 @@ import axios from 'axios';
|
|
|
2
2
|
import { ensureValidToken } from '../../utils/config.js';
|
|
3
3
|
/**
|
|
4
4
|
* 创建带认证的 API 客户端
|
|
5
|
-
*
|
|
5
|
+
* 自动在请求前检查 token 有效性
|
|
6
6
|
*/
|
|
7
7
|
export function createAuthenticatedClient(baseURL) {
|
|
8
8
|
const client = axios.create({
|
|
@@ -24,8 +24,8 @@ export function createAuthenticatedClient(baseURL) {
|
|
|
24
24
|
if (skipAuth.some(path => url.includes(path))) {
|
|
25
25
|
return config;
|
|
26
26
|
}
|
|
27
|
-
// 获取有效 token
|
|
28
|
-
// 如果 token
|
|
27
|
+
// 获取有效 token
|
|
28
|
+
// 如果 token 过期，ensureValidToken() 会抛出 AuthenticationError
|
|
29
29
|
try {
|
|
30
30
|
const token = await ensureValidToken();
|
|
31
31
|
if (token) {
|
|
@@ -38,7 +38,7 @@ export function createAuthenticatedClient(baseURL) {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
catch (error) {
|
|
41
|
-
// Token
|
|
41
|
+
// Token 过期或未登录，直接拒绝请求
|
|
42
42
|
// 错误会被传递到命令的 catch 块，由 handleError() 统一处理
|
|
43
43
|
return Promise.reject(error);
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/api/rest/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC1B,OAAO;QACP,OAAO,EAAE,KAAK;QACd,OAAO,EAAE;YACP,YAAY,EAAE,kBAAkB;SACjC;KACF,CAAC,CAAC;IAEH,mBAAmB;IACnB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAC7B,KAAK,EAAE,MAAkC,EAAE,EAAE;QAC3C,aAAa;QACb,MAAM,QAAQ,GAAG;YACf,gCAAgC;YAChC,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;QAC7B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9C,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,
|
|
1
|
+
{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../src/api/rest/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAoD,MAAM,OAAO,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD;;;GAGG;AACH,MAAM,UAAU,yBAAyB,CAAC,OAAe;IACvD,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC;QAC1B,OAAO;QACP,OAAO,EAAE,KAAK;QACd,OAAO,EAAE;YACP,YAAY,EAAE,kBAAkB;SACjC;KACF,CAAC,CAAC;IAEH,mBAAmB;IACnB,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAC7B,KAAK,EAAE,MAAkC,EAAE,EAAE;QAC3C,aAAa;QACb,MAAM,QAAQ,GAAG;YACf,gCAAgC;YAChC,4BAA4B;YAC5B,qBAAqB;SACtB,CAAC;QAEF,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC;QAC7B,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YAC9C,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,aAAa;QACb,yDAAyD;QACzD,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,gBAAgB,EAAE,CAAC;YACvC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,CAAC,OAAO,CAAC,aAAa,GAAG,UAAU,KAAK,EAAE,CAAC;YACnD,CAAC;iBAAM,CAAC;gBACN,gBAAgB;gBAChB,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CAAC,CAAC;gBACrE,MAAM,IAAI,mBAAmB,CAAC,4BAA4B,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,sBAAsB;YACtB,0CAA0C;YAC1C,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC/B,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC,EACD,CAAC,KAAK,EAAE,EAAE;QACR,OAAO,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC,CACF,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAKpC,eAAO,MAAM,WAAW,SAII,CAAC"}
|
|
@@ -2,13 +2,9 @@ import { Command } from 'commander';
|
|
|
2
2
|
import { loginCommand } from './login.js';
|
|
3
3
|
import { logoutCommand } from './logout.js';
|
|
4
4
|
import { whoamiCommand } from './whoami.js';
|
|
5
|
-
import { switchCommand } from './switch.js';
|
|
6
|
-
import { testRefreshCommand } from './test-refresh.js';
|
|
7
5
|
export const authCommand = new Command('auth')
|
|
8
6
|
.description('认证管理')
|
|
9
7
|
.addCommand(loginCommand)
|
|
10
8
|
.addCommand(logoutCommand)
|
|
11
|
-
.addCommand(whoamiCommand)
|
|
12
|
-
.addCommand(switchCommand)
|
|
13
|
-
.addCommand(testRefreshCommand);
|
|
9
|
+
.addCommand(whoamiCommand);
|
|
14
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,MAAM,CAAC;KAC3C,WAAW,CAAC,MAAM,CAAC;KACnB,UAAU,CAAC,YAAY,CAAC;KACxB,UAAU,CAAC,aAAa,CAAC;KACzB,UAAU,CAAC,aAAa,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"login.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoQpC,eAAO,MAAM,YAAY,SAAM,CAAC"}
|
|
@@ -3,7 +3,7 @@ import chalk from 'chalk';
|
|
|
3
3
|
import open from 'open';
|
|
4
4
|
import { authApi } from '../../api/rest/auth.js';
|
|
5
5
|
import { commerceApi } from '../../api/rest/commerce.js';
|
|
6
|
-
import { saveTokens,
|
|
6
|
+
import { saveTokens, isAuthenticated, getUser, getCurrentEnvironment, ENV_CONFIG } from '../../utils/config.js';
|
|
7
7
|
import { output } from '../../utils/output.js';
|
|
8
8
|
import { addEnhancedHelp } from '../../utils/helpText.js';
|
|
9
9
|
const cmd = new Command('login')
|
|
@@ -19,24 +19,44 @@ const cmd = new Command('login')
|
|
|
19
19
|
console.log(chalk.gray(' 支持的环境: production, stage, development\n'));
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
|
-
//
|
|
23
|
-
|
|
24
|
-
// 重新初始化 API
|
|
22
|
+
// 获取目标环境配置
|
|
23
|
+
const envConfig = ENV_CONFIG[env];
|
|
24
|
+
// 重新初始化 API 客户端以使用目标环境的 URL
|
|
25
|
+
// 临时设置环境变量让 getAuthUrl/getApiUrl 返回目标环境的 URL
|
|
26
|
+
const originalAuthUrl = process.env.OPTIMA_AUTH_URL;
|
|
27
|
+
const originalApiUrl = process.env.OPTIMA_API_URL;
|
|
28
|
+
process.env.OPTIMA_AUTH_URL = envConfig.authUrl;
|
|
29
|
+
process.env.OPTIMA_API_URL = envConfig.apiUrl;
|
|
25
30
|
authApi.reinitialize();
|
|
26
31
|
commerceApi.reinitialize();
|
|
27
32
|
// 显示环境信息
|
|
28
|
-
const envConfig = ENV_CONFIG[env];
|
|
29
33
|
if (env !== 'production') {
|
|
30
34
|
console.log(chalk.yellow(`🔧 使用 ${env} 环境`));
|
|
31
35
|
console.log(chalk.gray(` Auth: ${envConfig.authUrl}`));
|
|
32
36
|
console.log(chalk.gray(` API: ${envConfig.apiUrl}\n`));
|
|
33
37
|
}
|
|
34
|
-
//
|
|
35
|
-
|
|
38
|
+
// 检查是否已登录到其他环境
|
|
39
|
+
const currentEnv = getCurrentEnvironment();
|
|
40
|
+
if (isAuthenticated() && currentEnv !== env) {
|
|
41
|
+
const user = getUser();
|
|
42
|
+
console.log(chalk.yellow(`\n⚠️ 当前已登录到 ${currentEnv} 环境`));
|
|
43
|
+
console.log(chalk.gray(` 当前用户: ${user?.email}`));
|
|
44
|
+
console.log(chalk.gray(` 继续登录将切换到 ${env} 环境\n`));
|
|
45
|
+
}
|
|
46
|
+
else if (isAuthenticated()) {
|
|
36
47
|
const user = getUser();
|
|
37
48
|
console.log(chalk.yellow('\n⚠️ 已登录'));
|
|
38
49
|
console.log(chalk.gray(` 当前用户: ${user?.email}`));
|
|
39
50
|
console.log(chalk.gray(' 使用 ') + chalk.cyan('commerce auth logout') + chalk.gray(' 退出登录\n'));
|
|
51
|
+
// 恢复环境变量
|
|
52
|
+
if (originalAuthUrl)
|
|
53
|
+
process.env.OPTIMA_AUTH_URL = originalAuthUrl;
|
|
54
|
+
else
|
|
55
|
+
delete process.env.OPTIMA_AUTH_URL;
|
|
56
|
+
if (originalApiUrl)
|
|
57
|
+
process.env.OPTIMA_API_URL = originalApiUrl;
|
|
58
|
+
else
|
|
59
|
+
delete process.env.OPTIMA_API_URL;
|
|
40
60
|
return;
|
|
41
61
|
}
|
|
42
62
|
// 步骤 1: 请求 Device Code
|
|
@@ -101,14 +121,41 @@ const cmd = new Command('login')
|
|
|
101
121
|
// 步骤 6: 保存 Token 和用户信息
|
|
102
122
|
if (!result.access_token || !result.refresh_token || !result.expires_in) {
|
|
103
123
|
console.log(chalk.red('\n❌ 获取 token 失败\n'));
|
|
124
|
+
// 恢复环境变量
|
|
125
|
+
if (originalAuthUrl)
|
|
126
|
+
process.env.OPTIMA_AUTH_URL = originalAuthUrl;
|
|
127
|
+
else
|
|
128
|
+
delete process.env.OPTIMA_AUTH_URL;
|
|
129
|
+
if (originalApiUrl)
|
|
130
|
+
process.env.OPTIMA_API_URL = originalApiUrl;
|
|
131
|
+
else
|
|
132
|
+
delete process.env.OPTIMA_API_URL;
|
|
104
133
|
return;
|
|
105
134
|
}
|
|
106
|
-
|
|
107
|
-
|
|
135
|
+
// 先保存 token（这样后续的 API 调用可以正常工作）
|
|
136
|
+
saveTokens(result.access_token, result.refresh_token, result.expires_in, env);
|
|
137
|
+
// 恢复环境变量（现在 token.json 已经有正确的 env 了）
|
|
138
|
+
if (originalAuthUrl)
|
|
139
|
+
process.env.OPTIMA_AUTH_URL = originalAuthUrl;
|
|
140
|
+
else
|
|
141
|
+
delete process.env.OPTIMA_AUTH_URL;
|
|
142
|
+
if (originalApiUrl)
|
|
143
|
+
process.env.OPTIMA_API_URL = originalApiUrl;
|
|
144
|
+
else
|
|
145
|
+
delete process.env.OPTIMA_API_URL;
|
|
146
|
+
// 重新初始化 API 客户端使用新保存的 token
|
|
147
|
+
authApi.reinitialize();
|
|
148
|
+
commerceApi.reinitialize();
|
|
149
|
+
// 获取用户信息并更新 token.json
|
|
108
150
|
let user;
|
|
109
151
|
try {
|
|
110
152
|
user = await authApi.getCurrentUser(result.access_token);
|
|
111
|
-
|
|
153
|
+
// 更新 token.json 添加用户信息
|
|
154
|
+
saveTokens(result.access_token, result.refresh_token, result.expires_in, env, {
|
|
155
|
+
id: user.id,
|
|
156
|
+
email: user.email,
|
|
157
|
+
name: user.name,
|
|
158
|
+
});
|
|
112
159
|
}
|
|
113
160
|
catch (error) {
|
|
114
161
|
console.log(chalk.yellow('\n⚠️ 无法获取用户信息，但 token 已保存'));
|
|
@@ -176,17 +223,16 @@ addEnhancedHelp(cmd, {
|
|
|
176
223
|
},
|
|
177
224
|
relatedCommands: [
|
|
178
225
|
{ command: 'auth whoami', description: 'Check login status and current environment' },
|
|
179
|
-
{ command: 'auth logout', description: 'Logout
|
|
180
|
-
{ command: 'auth switch', description: 'Switch between environments' },
|
|
226
|
+
{ command: 'auth logout', description: 'Logout and delete token' },
|
|
181
227
|
],
|
|
182
228
|
notes: [
|
|
183
229
|
'Opens browser for OAuth authorization',
|
|
184
|
-
'
|
|
185
|
-
'
|
|
230
|
+
'Credentials are stored in ~/.optima/token.json',
|
|
231
|
+
'Login to a different environment will overwrite the current token',
|
|
186
232
|
'Alternative: Set OPTIMA_TOKEN environment variable for non-interactive auth',
|
|
187
233
|
'Supported environments:',
|
|
188
234
|
' - production (default): auth.optima.shop + api.optima.shop',
|
|
189
|
-
' - stage: auth
|
|
235
|
+
' - stage: auth.stage.optima.onl + api-stage.optima.shop',
|
|
190
236
|
' - development: auth.optima.chat + api.optima.chat',
|
|
191
237
|
]
|
|
192
238
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,UAAU,EACV,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/commands/auth/login.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EACL,UAAU,EACV,eAAe,EACf,OAAO,EACP,qBAAqB,EACrB,UAAU,EAEX,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAM1D,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC;KAC7B,WAAW,CAAC,+DAA+D,CAAC;KAC5E,MAAM,CAAC,qBAAqB,EAAE,0DAA0D,EAAE,YAAY,CAAC;KACvG,MAAM,CAAC,KAAK,EAAE,OAAqB,EAAE,EAAE;IACtC,IAAI,CAAC;QACH,SAAS;QACT,MAAM,iBAAiB,GAAkB,CAAC,YAAY,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAChF,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,YAAY,CAAC;QAExC,IAAI,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,GAAG,EAAE,CAAC,CAAC,CAAC;YAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC,CAAC;YACtE,OAAO;QACT,CAAC;QAED,WAAW;QACX,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;QAElC,4BAA4B;QAC5B,6CAA6C;QAC7C,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACpD,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,SAAS,CAAC,OAAO,CAAC;QAChD,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,SAAS,CAAC,MAAM,CAAC;QAE9C,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,WAAW,CAAC,YAAY,EAAE,CAAC;QAE3B,SAAS;QACT,IAAI,GAAG,KAAK,YAAY,EAAE,CAAC;YACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC;YAC7C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,SAAS,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,eAAe;QACf,MAAM,UAAU,GAAG,qBAAqB,EAAE,CAAC;QAC3C,IAAI,eAAe,EAAE,IAAI,UAAU,KAAK,GAAG,EAAE,CAAC;YAC5C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,UAAU,KAAK,CAAC,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,CAAC,CAAC;QACrD,CAAC;aAAM,IAAI,eAAe,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;YACvB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC;YACvC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;YAC/F,SAAS;YACT,IAAI,eAAe;gBAAE,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;;gBAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACxC,IAAI,cAAc;gBAAE,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;;gBAC3D,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,OAAO;QACT,CAAC;QAED,uBAAuB;QACvB,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAE5C,IAAI,UAAU,CAAC;QACf,IAAI,CAAC;YACH,UAAU,GAAG,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;YAC/C,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC;gBAC5C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC;YAC9E,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACtD,CAAC;YACD,OAAO;QACT,CAAC;QAED,eAAe;QACf,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC7E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC;QAE7E,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;QAC9D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,cAAc,UAAU,CAAC,CAAC,CAAC;QAE9D,gBAAgB;QAChB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,UAAU,CAAC,yBAAyB,IAAI,UAAU,CAAC,gBAAgB,CAAC,CAAC;YAChF,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,gBAAgB;QAClB,CAAC;QAED,mBAAmB;QACnB,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,MAAM,CAAC;QACX,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,OAAO,CAAC,eAAe,CACpC,UAAU,CAAC,WAAW,EACtB,UAAU,CAAC,QAAQ,EACnB,UAAU,CAAC,UAAU,CACtB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;YACpD,OAAO;QACT,CAAC;QAED,WAAW,CAAC,IAAI,EAAE,CAAC;QAEnB,aAAa;QACb,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;YACjB,SAAS;YACT,QAAQ,MAAM,CAAC,KAAK,EAAE,CAAC;gBACrB,KAAK,eAAe;oBAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC;oBACzC,MAAM;gBACR,KAAK,eAAe;oBAClB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,CAAC;oBAC3E,MAAM;gBACR;oBACE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,iBAAiB,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;YACtF,CAAC;YACD,OAAO;QACT,CAAC;QAED,uBAAuB;QACvB,IAAI,CAAC,MAAM,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,aAAa,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YACxE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;YAC5C,SAAS;YACT,IAAI,eAAe;gBAAE,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;;gBAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;YACxC,IAAI,cAAc;gBAAE,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;;gBAC3D,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;YACvC,OAAO;QACT,CAAC;QAED,gCAAgC;QAChC,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;QAE9E,qCAAqC;QACrC,IAAI,eAAe;YAAE,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,eAAe,CAAC;;YAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;QACxC,IAAI,cAAc;YAAE,OAAO,CAAC,GAAG,CAAC,cAAc,GAAG,cAAc,CAAC;;YAC3D,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;QAEvC,4BAA4B;QAC5B,OAAO,CAAC,YAAY,EAAE,CAAC;QACvB,WAAW,CAAC,YAAY,EAAE,CAAC;QAE3B,uBAAuB;QACvB,IAAI,IAAI,CAAC;QACT,IAAI,CAAC;YACH,IAAI,GAAG,MAAM,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACzD,uBAAuB;YACvB,UAAU,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,UAAU,EAAE,GAAG,EAAE;gBAC5E,EAAE,EAAE,IAAI,CAAC,EAAE;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;aAChB,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAU,EAAE,CAAC;YACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAClD,IAAI,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC;gBACzB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC1E,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QAED,eAAe;QACf,IAAI,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;YACpB,MAAM,CAAC,OAAO,CAAC;gBACb,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE;oBACJ,KAAK,EAAE,IAAI,CAAC,KAAK;oBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,IAAI,EAAE,IAAI,CAAC,IAAI;iBAChB;gBACD,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;YACxC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;YACrC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAChD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAC/C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YAE/C,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,GAAG,EAAE,CAAC,CAAC;YAC/D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,iBAAiB,mBAAmB,KAAK,CAAC,CAAC,CAAC;YAEnE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;QAChG,CAAC;IAEH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,KAAK,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC;IACzD,CAAC;AACH,CAAC,CAAC,CAAC;AAEL,eAAe,CAAC,GAAG,EAAE;IACnB,QAAQ,EAAE;QACR,uCAAuC;QACvC,uBAAuB;QACvB,EAAE;QACF,8BAA8B;QAC9B,mCAAmC;QACnC,EAAE;QACF,oCAAoC;QACpC,yCAAyC;QACzC,EAAE;QACF,qDAAqD;QACrD,iCAAiC;KAClC;IACD,MAAM,EAAE;QACN,WAAW,EAAE,2DAA2D;QACxE,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC;YACtB,OAAO,EAAE,IAAI;YACb,IAAI,EAAE;gBACJ,IAAI,EAAE;oBACJ,KAAK,EAAE,kBAAkB;oBACzB,IAAI,EAAE,WAAW;oBACjB,IAAI,EAAE,UAAU;iBACjB;gBACD,UAAU,EAAE,GAAG;aAChB;SACF,EAAE,IAAI,EAAE,CAAC,CAAC;KACZ;IACD,eAAe,EAAE;QACf,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,4CAA4C,EAAE;QACrF,EAAE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,yBAAyB,EAAE;KACnE;IACD,KAAK,EAAE;QACL,uCAAuC;QACvC,gDAAgD;QAChD,mEAAmE;QACnE,6EAA6E;QAC7E,yBAAyB;QACzB,8DAA8D;QAC9D,0DAA0D;QAC1D,qDAAqD;KACtD;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAyFpC,eAAO,MAAM,aAAa,SAAM,CAAC"}
|
|
@@ -1,54 +1,16 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
-
import { clearConfig,
|
|
3
|
+
import { clearConfig, isAuthenticated, getUser, getAccessToken, getCurrentEnvironment, } from '../../utils/config.js';
|
|
4
4
|
import { authApi } from '../../api/rest/auth.js';
|
|
5
5
|
import { output } from '../../utils/output.js';
|
|
6
6
|
import { addEnhancedHelp } from '../../utils/helpText.js';
|
|
7
7
|
const cmd = new Command('logout')
|
|
8
|
-
.description('Logout and
|
|
9
|
-
.
|
|
10
|
-
.option('--all', 'Logout from all environments')
|
|
11
|
-
.action(async (options) => {
|
|
8
|
+
.description('Logout and delete token')
|
|
9
|
+
.action(async () => {
|
|
12
10
|
try {
|
|
13
|
-
// 处理 --all 选项
|
|
14
|
-
if (options.all) {
|
|
15
|
-
clearAllConfigs();
|
|
16
|
-
if (output.isJson()) {
|
|
17
|
-
output.success({
|
|
18
|
-
logged_out: true,
|
|
19
|
-
cleared_environments: ['production', 'stage', 'development']
|
|
20
|
-
});
|
|
21
|
-
}
|
|
22
|
-
else {
|
|
23
|
-
console.log(chalk.green('\n✓ 已从所有环境登出\n'));
|
|
24
|
-
}
|
|
25
|
-
return;
|
|
26
|
-
}
|
|
27
|
-
// 处理 --env 选项
|
|
28
|
-
if (options.env) {
|
|
29
|
-
const validEnvironments = ['production', 'stage', 'development'];
|
|
30
|
-
if (!validEnvironments.includes(options.env)) {
|
|
31
|
-
console.log(chalk.red(`\n❌ 无效的环境: ${options.env}`));
|
|
32
|
-
console.log(chalk.gray(' 支持的环境: production, stage, development\n'));
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
35
|
-
clearConfigForEnv(options.env);
|
|
36
|
-
if (output.isJson()) {
|
|
37
|
-
output.success({
|
|
38
|
-
logged_out: true,
|
|
39
|
-
environment: options.env
|
|
40
|
-
});
|
|
41
|
-
}
|
|
42
|
-
else {
|
|
43
|
-
console.log(chalk.green(`\n✓ 已从 ${options.env} 环境登出\n`));
|
|
44
|
-
}
|
|
45
|
-
return;
|
|
46
|
-
}
|
|
47
|
-
// 默认：登出当前环境
|
|
48
11
|
const currentEnv = getCurrentEnvironment();
|
|
49
12
|
if (!isAuthenticated()) {
|
|
50
|
-
console.log(chalk.yellow('\n⚠️
|
|
51
|
-
console.log(chalk.gray(` 当前环境: ${currentEnv}\n`));
|
|
13
|
+
console.log(chalk.yellow('\n⚠️ 未登录\n'));
|
|
52
14
|
return;
|
|
53
15
|
}
|
|
54
16
|
const user = getUser();
|
|
@@ -67,6 +29,7 @@ const cmd = new Command('logout')
|
|
|
67
29
|
spinner.warn(chalk.yellow('无法撤销 token，但本地凭证已清除'));
|
|
68
30
|
}
|
|
69
31
|
}
|
|
32
|
+
// 删除 ~/.optima/token.json
|
|
70
33
|
clearConfig();
|
|
71
34
|
if (output.isJson()) {
|
|
72
35
|
output.success({
|
|
@@ -80,7 +43,7 @@ const cmd = new Command('logout')
|
|
|
80
43
|
console.log(chalk.green('\n✓ 已登出'));
|
|
81
44
|
console.log(chalk.gray(` 环境: ${currentEnv}`));
|
|
82
45
|
console.log(chalk.gray(` 账号: ${user?.email}`));
|
|
83
|
-
console.log(chalk.gray('\n 使用 ') + chalk.cyan(
|
|
46
|
+
console.log(chalk.gray('\n 使用 ') + chalk.cyan('commerce auth login') + chalk.gray(' 重新登录\n'));
|
|
84
47
|
}
|
|
85
48
|
}
|
|
86
49
|
catch (error) {
|
|
@@ -89,17 +52,11 @@ const cmd = new Command('logout')
|
|
|
89
52
|
});
|
|
90
53
|
addEnhancedHelp(cmd, {
|
|
91
54
|
examples: [
|
|
92
|
-
'# Logout
|
|
55
|
+
'# Logout and delete token',
|
|
93
56
|
'$ commerce auth logout',
|
|
94
|
-
'',
|
|
95
|
-
'# Logout from specific environment',
|
|
96
|
-
'$ commerce auth logout --env stage',
|
|
97
|
-
'',
|
|
98
|
-
'# Logout from all environments',
|
|
99
|
-
'$ commerce auth logout --all',
|
|
100
57
|
],
|
|
101
58
|
output: {
|
|
102
|
-
description: 'Revokes access token and
|
|
59
|
+
description: 'Revokes access token and deletes ~/.optima/token.json',
|
|
103
60
|
example: JSON.stringify({
|
|
104
61
|
success: true,
|
|
105
62
|
data: {
|
|
@@ -113,13 +70,10 @@ addEnhancedHelp(cmd, {
|
|
|
113
70
|
relatedCommands: [
|
|
114
71
|
{ command: 'auth login', description: 'Login again' },
|
|
115
72
|
{ command: 'auth whoami', description: 'Check login status' },
|
|
116
|
-
{ command: 'auth switch', description: 'Switch between environments' },
|
|
117
73
|
],
|
|
118
74
|
notes: [
|
|
119
|
-
'Revokes access token on server
|
|
120
|
-
'
|
|
121
|
-
'Use --env to logout from a specific environment without revoking token',
|
|
122
|
-
'Use --all to clear all environment credentials at once',
|
|
75
|
+
'Revokes access token on server',
|
|
76
|
+
'Deletes ~/.optima/token.json',
|
|
123
77
|
]
|
|
124
78
|
});
|
|
125
79
|
export const logoutCommand = cmd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../../src/commands/auth/logout.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsIpC,eAAO,MAAM,aAAa,SAAM,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Command } from 'commander';
|
|
2
2
|
import chalk from 'chalk';
|
|
3
|
-
import { isAuthenticated, getUser, getConfigPath, getCurrentEnvironment, getCurrentEnvConfig } from '../../utils/config.js';
|
|
3
|
+
import { isAuthenticated, getUser, getConfigPath, getCurrentEnvironment, getCurrentEnvConfig, getTokenExpiresAt, } from '../../utils/config.js';
|
|
4
4
|
import { output } from '../../utils/output.js';
|
|
5
5
|
import { addEnhancedHelp } from '../../utils/helpText.js';
|
|
6
6
|
const cmd = new Command('whoami')
|
|
@@ -15,36 +15,26 @@ const cmd = new Command('whoami')
|
|
|
15
15
|
}
|
|
16
16
|
else {
|
|
17
17
|
console.log(chalk.yellow('\n⚠️ 未登录'));
|
|
18
|
-
console.log(chalk.gray(
|
|
19
|
-
console.log(chalk.gray(' 使用 ') + chalk.cyan(`commerce auth login --env ${currentEnv}`) + chalk.gray(' 登录\n'));
|
|
18
|
+
console.log(chalk.gray(' 使用 ') + chalk.cyan('commerce auth login') + chalk.gray(' 登录\n'));
|
|
20
19
|
process.exit(1);
|
|
21
20
|
}
|
|
22
21
|
return;
|
|
23
22
|
}
|
|
24
23
|
const user = getUser();
|
|
25
|
-
|
|
26
|
-
if (output.isJson()) {
|
|
27
|
-
output.error('无法获取用户信息', 'USER_INFO_ERROR');
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
console.log(chalk.red('\n❌ 无法获取用户信息\n'));
|
|
31
|
-
process.exit(1);
|
|
32
|
-
}
|
|
33
|
-
return;
|
|
34
|
-
}
|
|
24
|
+
const expiresAt = getTokenExpiresAt();
|
|
35
25
|
if (output.isJson()) {
|
|
36
26
|
// JSON 模式：输出结构化数据（包含环境信息）
|
|
37
27
|
output.success({
|
|
38
|
-
user: {
|
|
28
|
+
user: user ? {
|
|
39
29
|
id: user.id,
|
|
40
30
|
email: user.email,
|
|
41
31
|
name: user.name,
|
|
42
|
-
|
|
43
|
-
},
|
|
32
|
+
} : null,
|
|
44
33
|
environment: currentEnv,
|
|
45
34
|
auth_url: envConfig.authUrl,
|
|
46
35
|
api_url: envConfig.apiUrl,
|
|
47
36
|
store_domain: envConfig.storeDomain,
|
|
37
|
+
token_expires_at: expiresAt,
|
|
48
38
|
config_path: getConfigPath()
|
|
49
39
|
});
|
|
50
40
|
}
|
|
@@ -56,11 +46,28 @@ const cmd = new Command('whoami')
|
|
|
56
46
|
console.log(chalk.gray(` Auth URL: ${envConfig.authUrl}`));
|
|
57
47
|
console.log(chalk.gray(` API URL: ${envConfig.apiUrl}`));
|
|
58
48
|
console.log(chalk.gray(` 店铺域名: ${envConfig.storeDomain}`));
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
49
|
+
if (user) {
|
|
50
|
+
console.log(chalk.white('\n用户信息:'));
|
|
51
|
+
console.log(chalk.gray(` 邮箱: ${user.email}`));
|
|
52
|
+
if (user.name) {
|
|
53
|
+
console.log(chalk.gray(` 姓名: ${user.name}`));
|
|
54
|
+
}
|
|
55
|
+
console.log(chalk.gray(` ID: ${user.id}`));
|
|
56
|
+
}
|
|
57
|
+
if (expiresAt) {
|
|
58
|
+
const now = Date.now();
|
|
59
|
+
const remainingMs = expiresAt - now;
|
|
60
|
+
if (remainingMs > 0) {
|
|
61
|
+
const remainingMin = Math.floor(remainingMs / 1000 / 60);
|
|
62
|
+
console.log(chalk.white('\nToken 状态:'));
|
|
63
|
+
console.log(chalk.gray(` 过期时间: ${new Date(expiresAt).toLocaleString()}`));
|
|
64
|
+
console.log(chalk.gray(` 剩余时间: ${remainingMin} 分钟`));
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
console.log(chalk.white('\nToken 状态:'));
|
|
68
|
+
console.log(chalk.red(` 已过期，请重新登录`));
|
|
69
|
+
}
|
|
70
|
+
}
|
|
64
71
|
console.log(chalk.white('\n配置文件:'));
|
|
65
72
|
console.log(chalk.gray(` ${getConfigPath()}\n`));
|
|
66
73
|
}
|
|
@@ -91,26 +98,27 @@ addEnhancedHelp(cmd, {
|
|
|
91
98
|
id: 'uuid',
|
|
92
99
|
email: 'user@example.com',
|
|
93
100
|
name: 'User Name',
|
|
94
|
-
role: 'merchant'
|
|
95
101
|
},
|
|
96
102
|
environment: 'production',
|
|
97
103
|
auth_url: 'https://auth.optima.shop',
|
|
98
104
|
api_url: 'https://api.optima.shop',
|
|
99
105
|
store_domain: 'optima.shop',
|
|
100
|
-
|
|
106
|
+
token_expires_at: 1700000000000,
|
|
107
|
+
config_path: '~/.optima/token.json'
|
|
101
108
|
}
|
|
102
109
|
}, null, 2)
|
|
103
110
|
},
|
|
104
111
|
relatedCommands: [
|
|
105
112
|
{ command: 'auth login', description: 'Login if not authenticated' },
|
|
106
|
-
{ command: 'auth
|
|
113
|
+
{ command: 'auth logout', description: 'Logout and delete token' },
|
|
107
114
|
{ command: 'merchant info', description: 'View merchant account details' },
|
|
108
115
|
],
|
|
109
116
|
notes: [
|
|
110
117
|
'Returns error if not logged in',
|
|
111
118
|
'Shows current environment (production/stage/development)',
|
|
112
|
-
'Displays user email, name,
|
|
113
|
-
'Shows
|
|
119
|
+
'Displays user email, name, and ID',
|
|
120
|
+
'Shows token expiration time',
|
|
121
|
+
'Token is stored in ~/.optima/token.json',
|
|
114
122
|
]
|
|
115
123
|
});
|
|
116
124
|
export const whoamiCommand = cmd;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,OAAO,EACP,aAAa,EACb,qBAAqB,EACrB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../../src/commands/auth/whoami.ts"],"names":[],"mappings":"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"}
|