cxgrd 0.1.25 → 0.1.26
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-session.d.ts","sourceRoot":"","sources":["../../src/auth/auth-session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAiB,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAW7C,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,cAAc,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;CACf;
|
|
1
|
+
{"version":3,"file":"auth-session.d.ts","sourceRoot":"","sources":["../../src/auth/auth-session.ts"],"names":[],"mappings":"AAEA,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EAAiB,KAAK,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAW7C,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,gBAAgB,CAAC;IACvB,MAAM,EAAE,WAAW,GAAG,WAAW,GAAG,cAAc,CAAC;IACnD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,OAAO,CAAC;CACf;AAcD,wBAAsB,oBAAoB,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAmD1E;AAED,wBAAsB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA4D5E;AAED,wBAAgB,kBAAkB,IAAI,MAAM,CAE3C;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAGzD"}
|
|
@@ -16,6 +16,19 @@ function normalizeRole(role) {
|
|
|
16
16
|
}
|
|
17
17
|
const POLL_INTERVAL_MS = 2000;
|
|
18
18
|
const POLL_TIMEOUT_MS = 5 * 60 * 1000;
|
|
19
|
+
// Decode JWT payload without verifying signature — safe here because
|
|
20
|
+
// we're just reading claims for local use. The server always re-verifies.
|
|
21
|
+
function decodeJwtPayload(token) {
|
|
22
|
+
try {
|
|
23
|
+
const parts = token.split('.');
|
|
24
|
+
if (parts.length !== 3)
|
|
25
|
+
return null;
|
|
26
|
+
return JSON.parse(Buffer.from(parts[1], 'base64url').toString('utf8'));
|
|
27
|
+
}
|
|
28
|
+
catch {
|
|
29
|
+
return null;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
19
32
|
async function resolveActiveSession() {
|
|
20
33
|
// 1. Dev override (local dev only)
|
|
21
34
|
const devPlan = (0, env_1.envString)('CXGRD_DEV_PLAN');
|
|
@@ -33,8 +46,6 @@ async function resolveActiveSession() {
|
|
|
33
46
|
}
|
|
34
47
|
}
|
|
35
48
|
// 2. CI environment — CXGRD_AUTH_TOKEN set as GitHub Actions secret
|
|
36
|
-
// No auth file exists in CI, so we read the JWT directly from the env var
|
|
37
|
-
// and decode plan/orgId/role from it without hitting the network.
|
|
38
49
|
const envToken = process.env.CXGRD_AUTH_TOKEN;
|
|
39
50
|
if (envToken) {
|
|
40
51
|
const decoded = decodeJwtPayload(envToken);
|
|
@@ -44,7 +55,6 @@ async function resolveActiveSession() {
|
|
|
44
55
|
source: 'env_token',
|
|
45
56
|
email: decoded?.email,
|
|
46
57
|
orgId: decoded?.team_id,
|
|
47
|
-
orgName: undefined,
|
|
48
58
|
role: normalizeRole(decoded?.team_role),
|
|
49
59
|
};
|
|
50
60
|
}
|
|
@@ -52,30 +62,22 @@ async function resolveActiveSession() {
|
|
|
52
62
|
const stored = await (0, auth_store_1.readAuth)();
|
|
53
63
|
if (!stored)
|
|
54
64
|
return null;
|
|
65
|
+
// If role is missing or wrong in auth.json (stale JWT), decode from token
|
|
66
|
+
const decoded = decodeJwtPayload(stored.token);
|
|
67
|
+
const role = stored.role && stored.role !== 'dev'
|
|
68
|
+
? stored.role
|
|
69
|
+
: normalizeRole(decoded?.team_role);
|
|
70
|
+
const orgId = stored.orgId ?? decoded?.team_id;
|
|
55
71
|
return {
|
|
56
72
|
token: stored.token,
|
|
57
73
|
plan: stored.plan,
|
|
58
74
|
source: 'auth_file',
|
|
59
75
|
email: stored.email,
|
|
60
|
-
orgId
|
|
76
|
+
orgId,
|
|
61
77
|
orgName: stored.orgName,
|
|
62
|
-
role
|
|
78
|
+
role,
|
|
63
79
|
};
|
|
64
80
|
}
|
|
65
|
-
// Decode JWT payload without verifying signature — safe here because
|
|
66
|
-
// we're just reading claims for local use. The server always re-verifies.
|
|
67
|
-
function decodeJwtPayload(token) {
|
|
68
|
-
try {
|
|
69
|
-
const parts = token.split('.');
|
|
70
|
-
if (parts.length !== 3)
|
|
71
|
-
return null;
|
|
72
|
-
const decoded = Buffer.from(parts[1], 'base64url').toString('utf8');
|
|
73
|
-
return JSON.parse(decoded);
|
|
74
|
-
}
|
|
75
|
-
catch {
|
|
76
|
-
return null;
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
81
|
async function pollAuthSession(sessionId) {
|
|
80
82
|
const baseUrl = (0, env_1.envString)('CXGRD_AUTH_BASE_URL', 'https://cxgrd.com').replace(/\/$/, '');
|
|
81
83
|
const url = `${baseUrl}/api/auth/cli/session/${sessionId}`;
|
|
@@ -83,18 +85,14 @@ async function pollAuthSession(sessionId) {
|
|
|
83
85
|
while (Date.now() - started < POLL_TIMEOUT_MS) {
|
|
84
86
|
let response;
|
|
85
87
|
try {
|
|
86
|
-
response = await fetch(url, {
|
|
87
|
-
method: 'GET',
|
|
88
|
-
headers: { Accept: 'application/json' },
|
|
89
|
-
});
|
|
88
|
+
response = await fetch(url, { method: 'GET', headers: { Accept: 'application/json' } });
|
|
90
89
|
}
|
|
91
90
|
catch {
|
|
92
91
|
await sleep(POLL_INTERVAL_MS);
|
|
93
92
|
continue;
|
|
94
93
|
}
|
|
95
|
-
if (response.status === 501)
|
|
94
|
+
if (response.status === 501)
|
|
96
95
|
throw new Error('Auth API is not available yet. For local dev set CXGRD_DEV_PLAN=pro in .env');
|
|
97
|
-
}
|
|
98
96
|
if (response.status === 404) {
|
|
99
97
|
await sleep(POLL_INTERVAL_MS);
|
|
100
98
|
continue;
|
|
@@ -103,26 +101,29 @@ async function pollAuthSession(sessionId) {
|
|
|
103
101
|
await sleep(POLL_INTERVAL_MS);
|
|
104
102
|
continue;
|
|
105
103
|
}
|
|
106
|
-
if (response.status === 410)
|
|
104
|
+
if (response.status === 410)
|
|
107
105
|
throw new Error('Session expired. Run cxgrd auth login again.');
|
|
108
|
-
}
|
|
109
106
|
if (!response.ok) {
|
|
110
107
|
const body = await response.text().catch(() => '');
|
|
111
108
|
throw new Error(`Auth poll failed (${response.status}): ${body || response.statusText}`);
|
|
112
109
|
}
|
|
113
|
-
const data =
|
|
110
|
+
const data = await response.json();
|
|
114
111
|
const token = data.token || data.access_token;
|
|
115
112
|
if (!token) {
|
|
116
113
|
await sleep(POLL_INTERVAL_MS);
|
|
117
114
|
continue;
|
|
118
115
|
}
|
|
116
|
+
// Decode JWT as fallback for any fields the server didn't return
|
|
117
|
+
const decoded = decodeJwtPayload(token);
|
|
118
|
+
const role = normalizeRole(data.role ?? decoded?.team_role);
|
|
119
|
+
const orgId = data.org_id ?? data.orgId ?? decoded?.team_id;
|
|
119
120
|
return {
|
|
120
121
|
token,
|
|
121
|
-
plan: (0, plans_1.normalizePlan)(data.plan),
|
|
122
|
-
email: data.email,
|
|
123
|
-
orgId
|
|
122
|
+
plan: (0, plans_1.normalizePlan)(data.plan ?? decoded?.plan),
|
|
123
|
+
email: data.email ?? decoded?.email,
|
|
124
|
+
orgId,
|
|
124
125
|
orgName: data.org_name ?? data.orgName,
|
|
125
|
-
role
|
|
126
|
+
role,
|
|
126
127
|
expiresAt: normalizeExpiry(data.expires_at ?? data.expiresAt),
|
|
127
128
|
obtainedAt: Date.now(),
|
|
128
129
|
};
|
|
@@ -137,7 +138,7 @@ function buildCliAuthUrl(sessionId) {
|
|
|
137
138
|
return `${baseUrl}/auth/cli?session=${encodeURIComponent(sessionId)}`;
|
|
138
139
|
}
|
|
139
140
|
function sleep(ms) {
|
|
140
|
-
return new Promise(
|
|
141
|
+
return new Promise(resolve => setTimeout(resolve, ms));
|
|
141
142
|
}
|
|
142
143
|
function normalizeExpiry(expiresAt) {
|
|
143
144
|
if (!expiresAt || Number.isNaN(expiresAt))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-session.js","sourceRoot":"","sources":["../../src/auth/auth-session.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"auth-session.js","sourceRoot":"","sources":["../../src/auth/auth-session.ts"],"names":[],"mappings":"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"}
|