@experiture/xyra-cli 0.5.1 → 0.6.1
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/README.md +30 -10
- package/dist/auth/administrationSession.js +25 -0
- package/dist/auth/administrationSession.js.map +1 -0
- package/dist/auth/oauthClient.js +13 -3
- package/dist/auth/oauthClient.js.map +1 -1
- package/dist/auth/session.js +50 -12
- package/dist/auth/session.js.map +1 -1
- package/dist/chat/runtimeChatClient.js +23217 -0
- package/dist/chat/runtimeChatClient.js.map +7 -0
- package/dist/commands/chat.js +175 -0
- package/dist/commands/chat.js.map +1 -0
- package/dist/commands/generatedCommandRegistry.js +17 -2
- package/dist/commands/generatedCommandRegistry.js.map +1 -1
- package/dist/commands/login.js +5 -1
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/mcpContext.js +7 -3
- package/dist/commands/mcpContext.js.map +1 -1
- package/dist/commands/session.js +13 -6
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/tools.js +1 -1
- package/dist/commands/tools.js.map +1 -1
- package/dist/config/configStore.js +669 -86
- package/dist/config/configStore.js.map +7 -1
- package/dist/config/environments.js +13 -0
- package/dist/config/environments.js.map +1 -1
- package/dist/errors/CliError.js +4 -1
- package/dist/errors/CliError.js.map +1 -1
- package/dist/evaluation/localSession.js +62 -0
- package/dist/evaluation/localSession.js.map +1 -0
- package/dist/index.js +55 -20
- package/dist/index.js.map +1 -1
- package/dist/mcp/confirmation.js +14 -17
- package/dist/mcp/confirmation.js.map +1 -1
- package/dist/mcp/mcpClient.js +274 -114
- package/dist/mcp/mcpClient.js.map +7 -1
- package/dist/output/console.js +3 -1
- package/dist/output/console.js.map +1 -1
- package/package.json +9 -3
package/README.md
CHANGED
|
@@ -32,9 +32,10 @@ xyra --version
|
|
|
32
32
|
|
|
33
33
|
Releases are published to public npm from a versioned `xyra-cli-v*` Git tag.
|
|
34
34
|
The workflow builds, tests, packs, publishes with npm trusted publishing, and
|
|
35
|
-
smoke-installs the exact public package. The
|
|
36
|
-
|
|
37
|
-
|
|
35
|
+
smoke-installs the exact public package. The npm package is bound to
|
|
36
|
+
`Experiture-git-ORG/ExperitureAI-Headless` and
|
|
37
|
+
`.github/workflows/publish-xyra-cli.yml` as its GitHub OIDC trusted publisher;
|
|
38
|
+
no long-lived npm publish token is stored in GitHub.
|
|
38
39
|
|
|
39
40
|
For local smoke testing before publishing, install from a packed tarball
|
|
40
41
|
(keychain support installs automatically where the native module builds,
|
|
@@ -42,7 +43,7 @@ otherwise the CLI falls back per the security model below):
|
|
|
42
43
|
|
|
43
44
|
```bash
|
|
44
45
|
npm pack --workspace=apps/xyra-cli --pack-destination /tmp
|
|
45
|
-
npm install -g /tmp/experiture-xyra-cli-0.
|
|
46
|
+
npm install -g /tmp/experiture-xyra-cli-0.6.0.tgz
|
|
46
47
|
xyra --version
|
|
47
48
|
```
|
|
48
49
|
|
|
@@ -67,16 +68,21 @@ pointing at your working tree.
|
|
|
67
68
|
encrypted-file fallback is disabled unless
|
|
68
69
|
`XYRA_CLI_ALLOW_INSECURE_TOKEN_STORE=true` (dev only). Tokens are never
|
|
69
70
|
printed or logged; diagnostic output is redacted.
|
|
70
|
-
- **
|
|
71
|
-
|
|
71
|
+
- **Tools use MCP. Chat uses Orchestrator.** `xyra tools` discovers and runs
|
|
72
|
+
tools through the MCP server. `xyra chat` creates and continues a
|
|
73
|
+
conversation through Orchestrator's public runtime. Neither path invents
|
|
74
|
+
identity headers or calls a product API directly. Requires Node 20 or newer.
|
|
72
75
|
|
|
73
76
|
## Commands
|
|
74
77
|
|
|
75
78
|
```bash
|
|
76
|
-
xyra env list | env use <name> | env show # connection profiles (dev, local)
|
|
77
|
-
xyra login [--no-browser]
|
|
78
|
-
xyra whoami [--json]
|
|
79
|
-
xyra logout
|
|
79
|
+
xyra env list | env use <name> | env show # connection profiles (dev, staging, local)
|
|
80
|
+
xyra login [--no-browser] [--session <name>] # delegated OAuth sign-in
|
|
81
|
+
xyra whoami [--json] [--session <name>] # inspect the selected login without printing tokens
|
|
82
|
+
xyra logout [--session <name>] # remove only the selected login
|
|
83
|
+
xyra chat start [--title <text>] [--json] # create a conversation
|
|
84
|
+
xyra chat send --conversation <id> "<message>" # continue one conversation
|
|
85
|
+
xyra chat send --new "<message>" # create, then send one turn
|
|
80
86
|
xyra mcp metadata [--json] # public OAuth resource metadata (no login)
|
|
81
87
|
xyra mcp initialize [--json] # MCP handshake / capabilities
|
|
82
88
|
xyra tools list [--domain <id>] [--task <k>] [--limit <n>] [--json]
|
|
@@ -89,6 +95,15 @@ xyra --timings tools list --limit 1
|
|
|
89
95
|
xyra --timings-json tools call <toolKey> --arg k=v
|
|
90
96
|
```
|
|
91
97
|
|
|
98
|
+
Named logins store independent credentials under the existing secure token store;
|
|
99
|
+
refreshing or removing one does not replace the other.
|
|
100
|
+
Names use up to 64 lowercase letters, numbers, hyphens or underscores and begin
|
|
101
|
+
with a letter. Changing a named session's configured Auth or runtime destination
|
|
102
|
+
requires signing in again. A session name does not approve an identity or grant
|
|
103
|
+
permissions. Commands without `--session` use the ordinary login; the named
|
|
104
|
+
selector is available on login, whoami and logout. Evaluations run through the
|
|
105
|
+
browser and managed worker, so this CLI has no separate evaluation command.
|
|
106
|
+
|
|
92
107
|
Live tool visibility is owned by MCP, not by a duplicated CLI policy layer:
|
|
93
108
|
`tools/list` returns only the tools visible to the current token's concrete
|
|
94
109
|
permissions, and `tools/call` still goes through the governed MCP execution rail
|
|
@@ -127,6 +142,11 @@ safety-net exception: fields whose **names** are secret-bearing (`access_token`,
|
|
|
127
142
|
practice output is byte-for-byte the server payload; the redaction only ever
|
|
128
143
|
triggers on genuinely secret-named keys.
|
|
129
144
|
|
|
145
|
+
Ordinary fields named `code`, including Xyra error codes and JSON Schema
|
|
146
|
+
properties, are not secrets and remain unchanged. OAuth authorization codes are
|
|
147
|
+
protected at the login callback and token-exchange boundary and never enter the
|
|
148
|
+
generic command-output path.
|
|
149
|
+
|
|
130
150
|
## Test
|
|
131
151
|
|
|
132
152
|
```bash
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.assertTokenPurpose = assertTokenPurpose;
|
|
4
|
+
const oauthClient_1 = require("./oauthClient");
|
|
5
|
+
const CliError_1 = require("../errors/CliError");
|
|
6
|
+
/** Local anti-confusion check only. The resource server verifies JWT/provenance and fresh Auth authority. */
|
|
7
|
+
function assertTokenPurpose(env, token) {
|
|
8
|
+
const claims = (0, oauthClient_1.decodeJwtClaims)(token.accessToken), administrative = env.accessPurpose === 'administration';
|
|
9
|
+
if (!administrative) {
|
|
10
|
+
if (claims.resource_access_purpose === 'administration')
|
|
11
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'An administration credential cannot bootstrap the runtime.');
|
|
12
|
+
return;
|
|
13
|
+
}
|
|
14
|
+
const audience = claims.aud, validAudience = audience === env.oauthResource || (Array.isArray(audience)
|
|
15
|
+
&& audience.length > 0 && audience.every(value => typeof value === 'string') && new Set(audience).size === audience.length && audience.includes(env.oauthResource));
|
|
16
|
+
const subject = claims.sub, client = claims.client_id ?? claims.azp;
|
|
17
|
+
if (token.subjectType !== 'user' || claims.sub_type === 'client' || claims.resource_access_purpose !== 'administration'
|
|
18
|
+
|| claims.oauth_resource !== env.oauthResource || claims.resource_product_id !== 'xyra-ai' || !validAudience || client !== env.clientId
|
|
19
|
+
|| (claims.client_id !== undefined && claims.azp !== undefined && claims.client_id !== claims.azp)
|
|
20
|
+
|| typeof subject !== 'string' || !/^[a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[89ab][a-f0-9]{3}-[a-f0-9]{12}$/i.test(subject)
|
|
21
|
+
|| ['runtime_identity', 'runtime_identity_v2', 'license_source_product_id', 'licensed_product_id', 'license_owner_tenant_id',
|
|
22
|
+
'license_binding_id', 'entitlement_id', 'edition_id', 'host_tenant_id', 'host_user_id'].some(field => claims[field] != null))
|
|
23
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InsufficientScope, 'The credential does not match this administration client, human, resource or purpose.', 'Sign in using the separately registered Xyra-owned administration CLI profile. Local claims never confer authority.');
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=administrationSession.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"administrationSession.js","sourceRoot":"","sources":["../../src/auth/administrationSession.ts"],"names":[],"mappings":";;AAMA,gDAkBC;AAtBD,+CAA8C;AAC9C,iDAA0D;AAE1D,6GAA6G;AAC7G,SAAgB,kBAAkB,CAAC,GAAmB,EAAC,KAAiB;IACvE,MAAM,MAAM,GAAC,IAAA,6BAAe,EAAC,KAAK,CAAC,WAAW,CAAC,EAAC,cAAc,GAAC,GAAG,CAAC,aAAa,KAAG,gBAAgB,CAAC;IACpG,IAAG,CAAC,cAAc,EAAC,CAAC;QACnB,IAAG,MAAM,CAAC,uBAAuB,KAAG,gBAAgB;YAAC,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,iBAAiB,EACtG,4DAA4D,CAAC,CAAC;QAC/D,OAAO;IACR,CAAC;IACD,MAAM,QAAQ,GAAC,MAAM,CAAC,GAAG,EAAC,aAAa,GAAC,QAAQ,KAAG,GAAG,CAAC,aAAa,IAAE,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;WAC3F,QAAQ,CAAC,MAAM,GAAC,CAAC,IAAE,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAA,EAAE,CAAA,OAAO,KAAK,KAAG,QAAQ,CAAC,IAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAG,QAAQ,CAAC,MAAM,IAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC;IACtJ,MAAM,OAAO,GAAC,MAAM,CAAC,GAAG,EAAC,MAAM,GAAC,MAAM,CAAC,SAAS,IAAE,MAAM,CAAC,GAAG,CAAC;IAC7D,IAAG,KAAK,CAAC,WAAW,KAAG,MAAM,IAAE,MAAM,CAAC,QAAQ,KAAG,QAAQ,IAAE,MAAM,CAAC,uBAAuB,KAAG,gBAAgB;WACzG,MAAM,CAAC,cAAc,KAAG,GAAG,CAAC,aAAa,IAAE,MAAM,CAAC,mBAAmB,KAAG,SAAS,IAAE,CAAC,aAAa,IAAE,MAAM,KAAG,GAAG,CAAC,QAAQ;WACxH,CAAC,MAAM,CAAC,SAAS,KAAG,SAAS,IAAE,MAAM,CAAC,GAAG,KAAG,SAAS,IAAE,MAAM,CAAC,SAAS,KAAG,MAAM,CAAC,GAAG,CAAC;WACrF,OAAO,OAAO,KAAG,QAAQ,IAAE,CAAC,4EAA4E,CAAC,IAAI,CAAC,OAAO,CAAC;WACtH,CAAC,kBAAkB,EAAC,qBAAqB,EAAC,2BAA2B,EAAC,qBAAqB,EAAC,yBAAyB;YACtH,oBAAoB,EAAC,gBAAgB,EAAC,YAAY,EAAC,gBAAgB,EAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAA,EAAE,CAAA,MAAM,CAAC,KAAK,CAAC,IAAE,IAAI,CAAC;QACrH,MAAM,IAAI,mBAAQ,CAAC,wBAAa,CAAC,iBAAiB,EAAC,uFAAuF,EACzI,qHAAqH,CAAC,CAAC;AAC1H,CAAC"}
|
package/dist/auth/oauthClient.js
CHANGED
|
@@ -1,11 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ACCESS_TOKEN_OPERATION_SAFETY_SECONDS = void 0;
|
|
3
4
|
exports.buildAuthorizeUrl = buildAuthorizeUrl;
|
|
4
5
|
exports.exchangeCode = exchangeCode;
|
|
5
6
|
exports.refreshToken = refreshToken;
|
|
6
7
|
exports.decodeJwtClaims = decodeJwtClaims;
|
|
7
8
|
exports.toStoredToken = toStoredToken;
|
|
8
9
|
const CliError_1 = require("../errors/CliError");
|
|
10
|
+
/**
|
|
11
|
+
* Keep enough access-token lifetime for one long-running Xyra operation.
|
|
12
|
+
*
|
|
13
|
+
* Authentication is checked before a command starts, while a streamed turn can
|
|
14
|
+
* legitimately continue for more than one minute. Refreshing two minutes
|
|
15
|
+
* before the issuer's expiry prevents a token that was valid at dispatch from
|
|
16
|
+
* expiring during owner-API calls later in the same turn.
|
|
17
|
+
*/
|
|
18
|
+
exports.ACCESS_TOKEN_OPERATION_SAFETY_SECONDS = 120;
|
|
9
19
|
/** Build the browser authorization URL (authorization_code + PKCE, public client). */
|
|
10
20
|
function buildAuthorizeUrl(env, params) {
|
|
11
21
|
const url = new URL(env.authorizationEndpoint);
|
|
@@ -69,7 +79,7 @@ function refreshToken(env, refresh) {
|
|
|
69
79
|
});
|
|
70
80
|
return postToken(env, body);
|
|
71
81
|
}
|
|
72
|
-
/** Decode
|
|
82
|
+
/** Decode untrusted claims for display/anti-confusion only; the resource server owns verification and authority. */
|
|
73
83
|
function decodeJwtClaims(accessToken) {
|
|
74
84
|
const parts = accessToken.split('.');
|
|
75
85
|
if (parts.length !== 3)
|
|
@@ -90,8 +100,8 @@ function toStoredToken(response) {
|
|
|
90
100
|
refreshToken: response.refresh_token,
|
|
91
101
|
tokenType: response.token_type || 'Bearer',
|
|
92
102
|
scope: response.scope,
|
|
93
|
-
|
|
94
|
-
|
|
103
|
+
expiresAt: Date.now()
|
|
104
|
+
+ Math.max(0, response.expires_in - exports.ACCESS_TOKEN_OPERATION_SAFETY_SECONDS) * 1000,
|
|
95
105
|
subjectType,
|
|
96
106
|
};
|
|
97
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/session.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.accountKey = accountKey;
|
|
4
|
+
exports.saveSessionToken = saveSessionToken;
|
|
5
|
+
exports.deleteSessionToken = deleteSessionToken;
|
|
4
6
|
exports.getValidToken = getValidToken;
|
|
5
7
|
const CliError_1 = require("../errors/CliError");
|
|
6
8
|
const oauthClient_1 = require("./oauthClient");
|
|
@@ -9,9 +11,29 @@ const node_fs_1 = require("node:fs");
|
|
|
9
11
|
const node_os_1 = require("node:os");
|
|
10
12
|
const node_path_1 = require("node:path");
|
|
11
13
|
const latency_1 = require("../diagnostics/latency");
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
const administrationSession_1 = require("./administrationSession");
|
|
15
|
+
/** Named sessions separate concurrent identities; their names confer no authority. */
|
|
16
|
+
function accountKey(env, sessionName) {
|
|
17
|
+
if (env.accessPurpose === 'administration') {
|
|
18
|
+
if (sessionName !== undefined && !/^[a-z][a-z0-9_-]{0,63}$/.test(sessionName))
|
|
19
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Invalid session name.');
|
|
20
|
+
return `administration:v1:${(0, node_crypto_1.createHash)('sha256').update(JSON.stringify([env.name, sessionName ?? null, env.authorizationEndpoint,
|
|
21
|
+
env.tokenEndpoint, env.oauthResource, env.mcpUrl, env.clientId, env.redirectPath])).digest('hex')}`;
|
|
22
|
+
}
|
|
23
|
+
if (sessionName === undefined)
|
|
24
|
+
return `${env.name}:${env.clientId}`;
|
|
25
|
+
if (!/^[a-z][a-z0-9_-]{0,63}$/.test(sessionName)) {
|
|
26
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.InvalidArguments, 'Session names must start with a lowercase letter and contain at most 64 lowercase letters, numbers, hyphens or underscores.');
|
|
27
|
+
}
|
|
28
|
+
// A renamed destination must require its own login rather than sending an
|
|
29
|
+
// existing subject's bearer or refresh token to the replacement endpoint.
|
|
30
|
+
const destination = (0, node_crypto_1.createHash)('sha256').update(JSON.stringify([
|
|
31
|
+
env.name, sessionName, env.authorizationEndpoint, env.tokenEndpoint, env.oauthResource,
|
|
32
|
+
env.mcpUrl, env.orchestratorUrl, env.clientId,
|
|
33
|
+
])).digest('hex');
|
|
34
|
+
// FileTokenStore encodes account keys into filenames, so the whole named
|
|
35
|
+
// account must remain bounded even for long valid names and client IDs.
|
|
36
|
+
return `session:v1:${destination}`;
|
|
15
37
|
}
|
|
16
38
|
const REFRESH_LOCK_TIMEOUT_MS = 20_000;
|
|
17
39
|
const REFRESH_LOCK_STALE_MS = 60_000;
|
|
@@ -28,7 +50,7 @@ function writeRefreshLockHeartbeat(fd) {
|
|
|
28
50
|
(0, node_fs_1.ftruncateSync)(fd, 0);
|
|
29
51
|
(0, node_fs_1.writeSync)(fd, JSON.stringify({ pid: process.pid, updatedAt: new Date().toISOString() }), 0, 'utf8');
|
|
30
52
|
}
|
|
31
|
-
async function
|
|
53
|
+
async function withSessionLock(account, action) {
|
|
32
54
|
const path = refreshLockPath(account);
|
|
33
55
|
(0, node_fs_1.mkdirSync)(REFRESH_LOCK_DIR, { recursive: true, mode: 0o700 });
|
|
34
56
|
const startedAt = Date.now();
|
|
@@ -58,7 +80,7 @@ async function withRefreshLock(account, action) {
|
|
|
58
80
|
continue;
|
|
59
81
|
}
|
|
60
82
|
if (Date.now() - startedAt > REFRESH_LOCK_TIMEOUT_MS) {
|
|
61
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, 'Timed out waiting for another Xyra CLI process to
|
|
83
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, 'Timed out waiting for another Xyra CLI process to update the session.', 'Retry the command. If this repeats, run xyra logout then xyra login.');
|
|
62
84
|
}
|
|
63
85
|
await sleep(150);
|
|
64
86
|
}
|
|
@@ -83,39 +105,55 @@ async function withRefreshLock(account, action) {
|
|
|
83
105
|
}
|
|
84
106
|
}
|
|
85
107
|
}
|
|
108
|
+
/** Serialize login replacement with refresh, so an older refresh cannot overwrite it. */
|
|
109
|
+
async function saveSessionToken(env, store, token, sessionName) {
|
|
110
|
+
const key = accountKey(env, sessionName);
|
|
111
|
+
(0, administrationSession_1.assertTokenPurpose)(env, token);
|
|
112
|
+
await withSessionLock(key, () => store.set(key, token));
|
|
113
|
+
}
|
|
114
|
+
/** Logout waits for an in-flight refresh before deleting its resulting credential. */
|
|
115
|
+
async function deleteSessionToken(env, store, sessionName) {
|
|
116
|
+
const key = accountKey(env, sessionName);
|
|
117
|
+
await withSessionLock(key, () => store.delete(key));
|
|
118
|
+
}
|
|
86
119
|
/**
|
|
87
120
|
* Return a non-expired access token for the environment, silently refreshing
|
|
88
121
|
* with the refresh token when the 300s access token has lapsed (gate G2).
|
|
89
122
|
* Throws NotAuthenticated when there is no usable session.
|
|
90
123
|
*/
|
|
91
|
-
async function getValidToken(env, store) {
|
|
92
|
-
const key = accountKey(env);
|
|
124
|
+
async function getValidToken(env, store, sessionName) {
|
|
125
|
+
const key = accountKey(env, sessionName);
|
|
126
|
+
const sessionLabel = sessionName === undefined ? `'${env.name}'` : `'${env.name}' session '${sessionName}'`;
|
|
127
|
+
const loginHint = sessionName === undefined ? "Run 'xyra login'." : `Run 'xyra login --session ${sessionName}'.`;
|
|
93
128
|
const stored = await store.get(key);
|
|
94
129
|
if (!stored) {
|
|
95
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to
|
|
130
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
|
|
96
131
|
}
|
|
132
|
+
(0, administrationSession_1.assertTokenPurpose)(env, stored);
|
|
97
133
|
if (Date.now() < stored.expiresAt) {
|
|
98
134
|
return stored;
|
|
99
135
|
}
|
|
100
136
|
if (!stored.refreshToken) {
|
|
101
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `
|
|
137
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Login for ${sessionLabel} expired and no refresh token is available.`, loginHint);
|
|
102
138
|
}
|
|
103
|
-
return
|
|
139
|
+
return withSessionLock(key, async () => {
|
|
104
140
|
const latest = await store.get(key);
|
|
105
141
|
if (!latest) {
|
|
106
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to
|
|
142
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
|
|
107
143
|
}
|
|
144
|
+
(0, administrationSession_1.assertTokenPurpose)(env, latest);
|
|
108
145
|
if (Date.now() < latest.expiresAt) {
|
|
109
146
|
return latest;
|
|
110
147
|
}
|
|
111
148
|
if (!latest.refreshToken) {
|
|
112
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `
|
|
149
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Login for ${sessionLabel} expired and no refresh token is available.`, loginHint);
|
|
113
150
|
}
|
|
114
151
|
const refreshed = (0, oauthClient_1.toStoredToken)(await (0, latency_1.measureLatencyPhase)('auth.token_refresh', () => (0, oauthClient_1.refreshToken)(env, latest.refreshToken)));
|
|
115
152
|
// Keep the prior refresh token only for non-rotating providers. Auth returns
|
|
116
153
|
// a rotated refresh_token; persisting it here is mandatory.
|
|
117
154
|
if (!refreshed.refreshToken)
|
|
118
155
|
refreshed.refreshToken = latest.refreshToken;
|
|
156
|
+
(0, administrationSession_1.assertTokenPurpose)(env, refreshed);
|
|
119
157
|
await store.set(key, refreshed);
|
|
120
158
|
return refreshed;
|
|
121
159
|
});
|
package/dist/auth/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
|