integrate-sdk 0.7.48 → 0.7.49
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/adapters/auto-routes.d.ts.map +1 -1
- package/dist/adapters/auto-routes.js +380 -24
- package/dist/adapters/base-handler.d.ts +50 -6
- package/dist/adapters/base-handler.d.ts.map +1 -1
- package/dist/adapters/base-handler.js +368 -18
- package/dist/adapters/context-cookie.d.ts +85 -0
- package/dist/adapters/context-cookie.d.ts.map +1 -0
- package/dist/adapters/context-cookie.js +152 -0
- package/dist/adapters/index.js +399 -37
- package/dist/adapters/nextjs.d.ts.map +1 -1
- package/dist/adapters/nextjs.js +387 -31
- package/dist/adapters/node.d.ts.map +1 -1
- package/dist/adapters/node.js +380 -24
- package/dist/adapters/session-detector.d.ts +37 -0
- package/dist/adapters/session-detector.d.ts.map +1 -0
- package/dist/adapters/session-detector.js +157 -0
- package/dist/adapters/solid-start.js +387 -31
- package/dist/adapters/svelte-kit.js +387 -31
- package/dist/index.js +392 -30
- package/dist/oauth.js +380 -24
- package/dist/server.js +401 -33
- package/dist/src/adapters/auto-routes.d.ts.map +1 -1
- package/dist/src/adapters/base-handler.d.ts +50 -6
- package/dist/src/adapters/base-handler.d.ts.map +1 -1
- package/dist/src/adapters/context-cookie.d.ts +85 -0
- package/dist/src/adapters/context-cookie.d.ts.map +1 -0
- package/dist/src/adapters/nextjs.d.ts.map +1 -1
- package/dist/src/adapters/node.d.ts.map +1 -1
- package/dist/src/adapters/session-detector.d.ts +37 -0
- package/dist/src/adapters/session-detector.d.ts.map +1 -0
- package/dist/src/config/types.d.ts +24 -0
- package/dist/src/config/types.d.ts.map +1 -1
- package/dist/src/server.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -10,6 +10,280 @@ var __export = (target, all) => {
|
|
|
10
10
|
};
|
|
11
11
|
var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
|
|
12
12
|
|
|
13
|
+
// session-detector.ts
|
|
14
|
+
var exports_session_detector = {};
|
|
15
|
+
__export(exports_session_detector, {
|
|
16
|
+
tryDecodeJWT: () => tryDecodeJWT,
|
|
17
|
+
detectSessionContext: () => detectSessionContext
|
|
18
|
+
});
|
|
19
|
+
function tryDecodeJWT(token) {
|
|
20
|
+
try {
|
|
21
|
+
const parts = token.split(".");
|
|
22
|
+
if (parts.length !== 3) {
|
|
23
|
+
return;
|
|
24
|
+
}
|
|
25
|
+
const payloadPart = parts[1];
|
|
26
|
+
if (!payloadPart) {
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const base64 = payloadPart.replace(/-/g, "+").replace(/_/g, "/");
|
|
30
|
+
const jsonPayload = decodeURIComponent(atob(base64).split("").map((c) => "%" + ("00" + c.charCodeAt(0).toString(16)).slice(-2)).join(""));
|
|
31
|
+
return JSON.parse(jsonPayload);
|
|
32
|
+
} catch (error) {
|
|
33
|
+
return;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
function getCookies(request) {
|
|
37
|
+
const cookies = new Map;
|
|
38
|
+
const cookieHeader = request.headers.get("cookie");
|
|
39
|
+
if (!cookieHeader) {
|
|
40
|
+
return cookies;
|
|
41
|
+
}
|
|
42
|
+
const pairs = cookieHeader.split(";");
|
|
43
|
+
for (const pair of pairs) {
|
|
44
|
+
const [name, ...valueParts] = pair.split("=");
|
|
45
|
+
if (name && valueParts.length > 0) {
|
|
46
|
+
const trimmedName = name.trim();
|
|
47
|
+
const value = valueParts.join("=").trim();
|
|
48
|
+
cookies.set(trimmedName, value);
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return cookies;
|
|
52
|
+
}
|
|
53
|
+
function tryBetterAuth(cookies) {
|
|
54
|
+
const sessionToken = cookies.get("better-auth.session_token");
|
|
55
|
+
if (!sessionToken) {
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const payload = tryDecodeJWT(sessionToken);
|
|
59
|
+
if (!payload) {
|
|
60
|
+
return;
|
|
61
|
+
}
|
|
62
|
+
const userId = payload.sub || payload.userId || payload.user_id || payload.id;
|
|
63
|
+
if (!userId) {
|
|
64
|
+
return;
|
|
65
|
+
}
|
|
66
|
+
return {
|
|
67
|
+
userId,
|
|
68
|
+
sessionId: payload.jti || payload.sessionId
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
function tryNextAuth(cookies) {
|
|
72
|
+
const sessionToken = cookies.get("__Secure-next-auth.session-token") || cookies.get("next-auth.session-token");
|
|
73
|
+
if (!sessionToken) {
|
|
74
|
+
return;
|
|
75
|
+
}
|
|
76
|
+
if (sessionToken.includes(".")) {
|
|
77
|
+
const payload = tryDecodeJWT(sessionToken);
|
|
78
|
+
if (payload) {
|
|
79
|
+
return {
|
|
80
|
+
userId: payload.sub || payload.userId || payload.user_id || payload.id,
|
|
81
|
+
sessionId: payload.jti
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
return;
|
|
86
|
+
}
|
|
87
|
+
function tryClerk(cookies) {
|
|
88
|
+
const sessionToken = cookies.get("__session");
|
|
89
|
+
if (!sessionToken) {
|
|
90
|
+
return;
|
|
91
|
+
}
|
|
92
|
+
const payload = tryDecodeJWT(sessionToken);
|
|
93
|
+
if (!payload) {
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
return {
|
|
97
|
+
userId: payload.sub || payload.userId,
|
|
98
|
+
organizationId: payload.org_id || payload.organizationId,
|
|
99
|
+
sessionId: payload.sid || payload.sessionId
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
function tryLucia(cookies) {
|
|
103
|
+
const sessionToken = cookies.get("lucia_session");
|
|
104
|
+
if (!sessionToken) {
|
|
105
|
+
return;
|
|
106
|
+
}
|
|
107
|
+
return {
|
|
108
|
+
sessionId: sessionToken
|
|
109
|
+
};
|
|
110
|
+
}
|
|
111
|
+
function tryGenericSession(cookies) {
|
|
112
|
+
const sessionToken = cookies.get("auth_session") || cookies.get("session");
|
|
113
|
+
if (!sessionToken) {
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
if (sessionToken.includes(".")) {
|
|
117
|
+
const payload = tryDecodeJWT(sessionToken);
|
|
118
|
+
if (payload) {
|
|
119
|
+
return {
|
|
120
|
+
userId: payload.sub || payload.userId || payload.user_id || payload.id,
|
|
121
|
+
sessionId: payload.jti || payload.sessionId || payload.sid
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
return {
|
|
126
|
+
sessionId: sessionToken
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
async function detectSessionContext(request) {
|
|
130
|
+
const cookies = getCookies(request);
|
|
131
|
+
let context;
|
|
132
|
+
context = tryBetterAuth(cookies);
|
|
133
|
+
if (context?.userId) {
|
|
134
|
+
return context;
|
|
135
|
+
}
|
|
136
|
+
context = tryNextAuth(cookies);
|
|
137
|
+
if (context?.userId) {
|
|
138
|
+
return context;
|
|
139
|
+
}
|
|
140
|
+
context = tryClerk(cookies);
|
|
141
|
+
if (context?.userId) {
|
|
142
|
+
return context;
|
|
143
|
+
}
|
|
144
|
+
context = tryLucia(cookies);
|
|
145
|
+
if (context?.userId) {
|
|
146
|
+
return context;
|
|
147
|
+
}
|
|
148
|
+
context = tryGenericSession(cookies);
|
|
149
|
+
if (context?.userId) {
|
|
150
|
+
return context;
|
|
151
|
+
}
|
|
152
|
+
return;
|
|
153
|
+
}
|
|
154
|
+
|
|
155
|
+
// context-cookie.ts
|
|
156
|
+
var exports_context_cookie = {};
|
|
157
|
+
__export(exports_context_cookie, {
|
|
158
|
+
readContextCookie: () => readContextCookie,
|
|
159
|
+
getSetCookieHeader: () => getSetCookieHeader,
|
|
160
|
+
getContextCookieFromRequest: () => getContextCookieFromRequest,
|
|
161
|
+
getClearCookieHeader: () => getClearCookieHeader,
|
|
162
|
+
createContextCookie: () => createContextCookie,
|
|
163
|
+
CONTEXT_COOKIE_NAME: () => CONTEXT_COOKIE_NAME,
|
|
164
|
+
CONTEXT_COOKIE_MAX_AGE: () => CONTEXT_COOKIE_MAX_AGE
|
|
165
|
+
});
|
|
166
|
+
async function deriveKey(secret) {
|
|
167
|
+
const encoder = new TextEncoder;
|
|
168
|
+
const secretData = encoder.encode(secret);
|
|
169
|
+
const keyMaterial = await crypto.subtle.importKey("raw", secretData, { name: "PBKDF2" }, false, ["deriveBits", "deriveKey"]);
|
|
170
|
+
const salt = encoder.encode("integrate-oauth-context-v1");
|
|
171
|
+
return await crypto.subtle.deriveKey({
|
|
172
|
+
name: "PBKDF2",
|
|
173
|
+
salt,
|
|
174
|
+
iterations: 1e5,
|
|
175
|
+
hash: "SHA-256"
|
|
176
|
+
}, keyMaterial, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
|
|
177
|
+
}
|
|
178
|
+
async function encryptPayload(payload, secret) {
|
|
179
|
+
const key = await deriveKey(secret);
|
|
180
|
+
const iv = crypto.getRandomValues(new Uint8Array(12));
|
|
181
|
+
const encoder = new TextEncoder;
|
|
182
|
+
const data = encoder.encode(JSON.stringify(payload));
|
|
183
|
+
const encrypted = await crypto.subtle.encrypt({
|
|
184
|
+
name: "AES-GCM",
|
|
185
|
+
iv
|
|
186
|
+
}, key, data);
|
|
187
|
+
const combined = new Uint8Array(iv.length + encrypted.byteLength);
|
|
188
|
+
combined.set(iv, 0);
|
|
189
|
+
combined.set(new Uint8Array(encrypted), iv.length);
|
|
190
|
+
return base64UrlEncode(combined);
|
|
191
|
+
}
|
|
192
|
+
async function decryptPayload(cookieValue, secret) {
|
|
193
|
+
try {
|
|
194
|
+
const combined = base64UrlDecode(cookieValue);
|
|
195
|
+
const iv = combined.slice(0, 12);
|
|
196
|
+
const encrypted = combined.slice(12);
|
|
197
|
+
const key = await deriveKey(secret);
|
|
198
|
+
const decrypted = await crypto.subtle.decrypt({
|
|
199
|
+
name: "AES-GCM",
|
|
200
|
+
iv
|
|
201
|
+
}, key, encrypted);
|
|
202
|
+
const decoder = new TextDecoder;
|
|
203
|
+
const json = decoder.decode(decrypted);
|
|
204
|
+
const payload = JSON.parse(json);
|
|
205
|
+
const age = Date.now() - payload.timestamp;
|
|
206
|
+
if (age > CONTEXT_COOKIE_MAX_AGE * 1000) {
|
|
207
|
+
return;
|
|
208
|
+
}
|
|
209
|
+
return payload;
|
|
210
|
+
} catch (error) {
|
|
211
|
+
return;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
function base64UrlEncode(data) {
|
|
215
|
+
const base64 = btoa(String.fromCharCode(...data));
|
|
216
|
+
return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
|
|
217
|
+
}
|
|
218
|
+
function base64UrlDecode(str) {
|
|
219
|
+
let base64 = str.replace(/-/g, "+").replace(/_/g, "/");
|
|
220
|
+
const padding = base64.length % 4;
|
|
221
|
+
if (padding) {
|
|
222
|
+
base64 += "=".repeat(4 - padding);
|
|
223
|
+
}
|
|
224
|
+
const binary = atob(base64);
|
|
225
|
+
const bytes = new Uint8Array(binary.length);
|
|
226
|
+
for (let i = 0;i < binary.length; i++) {
|
|
227
|
+
bytes[i] = binary.charCodeAt(i);
|
|
228
|
+
}
|
|
229
|
+
return bytes;
|
|
230
|
+
}
|
|
231
|
+
async function createContextCookie(context, provider, secret) {
|
|
232
|
+
const payload = {
|
|
233
|
+
context,
|
|
234
|
+
provider,
|
|
235
|
+
timestamp: Date.now()
|
|
236
|
+
};
|
|
237
|
+
return await encryptPayload(payload, secret);
|
|
238
|
+
}
|
|
239
|
+
async function readContextCookie(cookieValue, secret) {
|
|
240
|
+
const payload = await decryptPayload(cookieValue, secret);
|
|
241
|
+
if (!payload) {
|
|
242
|
+
return;
|
|
243
|
+
}
|
|
244
|
+
return {
|
|
245
|
+
context: payload.context,
|
|
246
|
+
provider: payload.provider
|
|
247
|
+
};
|
|
248
|
+
}
|
|
249
|
+
function getSetCookieHeader(cookieValue, maxAge = CONTEXT_COOKIE_MAX_AGE) {
|
|
250
|
+
const attributes = [
|
|
251
|
+
`${CONTEXT_COOKIE_NAME}=${cookieValue}`,
|
|
252
|
+
`Max-Age=${maxAge}`,
|
|
253
|
+
"HttpOnly",
|
|
254
|
+
"Secure",
|
|
255
|
+
"SameSite=Lax",
|
|
256
|
+
"Path=/"
|
|
257
|
+
];
|
|
258
|
+
return attributes.join("; ");
|
|
259
|
+
}
|
|
260
|
+
function getClearCookieHeader() {
|
|
261
|
+
const attributes = [
|
|
262
|
+
`${CONTEXT_COOKIE_NAME}=`,
|
|
263
|
+
"Max-Age=0",
|
|
264
|
+
"HttpOnly",
|
|
265
|
+
"Secure",
|
|
266
|
+
"SameSite=Lax",
|
|
267
|
+
"Path=/"
|
|
268
|
+
];
|
|
269
|
+
return attributes.join("; ");
|
|
270
|
+
}
|
|
271
|
+
function getContextCookieFromRequest(request) {
|
|
272
|
+
const cookieHeader = request.headers.get("cookie");
|
|
273
|
+
if (!cookieHeader) {
|
|
274
|
+
return;
|
|
275
|
+
}
|
|
276
|
+
const cookies = cookieHeader.split(";");
|
|
277
|
+
for (const cookie of cookies) {
|
|
278
|
+
const [name, ...valueParts] = cookie.split("=");
|
|
279
|
+
if (name && name.trim() === CONTEXT_COOKIE_NAME) {
|
|
280
|
+
return valueParts.join("=").trim();
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
return;
|
|
284
|
+
}
|
|
285
|
+
var CONTEXT_COOKIE_NAME = "__integrate_oauth_ctx", CONTEXT_COOKIE_MAX_AGE = 300;
|
|
286
|
+
|
|
13
287
|
// base-handler.ts
|
|
14
288
|
class OAuthHandler {
|
|
15
289
|
config;
|
|
@@ -33,25 +307,35 @@ class OAuthHandler {
|
|
|
33
307
|
return headers;
|
|
34
308
|
}
|
|
35
309
|
async handleAuthorize(request) {
|
|
36
|
-
|
|
310
|
+
let webRequest;
|
|
311
|
+
let authorizeRequest;
|
|
312
|
+
if (request instanceof Request) {
|
|
313
|
+
webRequest = request;
|
|
314
|
+
authorizeRequest = await request.json();
|
|
315
|
+
} else if (typeof request === "object" && "json" in request && typeof request.json === "function") {
|
|
316
|
+
authorizeRequest = await request.json();
|
|
317
|
+
} else {
|
|
318
|
+
authorizeRequest = request;
|
|
319
|
+
}
|
|
320
|
+
const providerConfig = this.config.providers[authorizeRequest.provider];
|
|
37
321
|
if (!providerConfig) {
|
|
38
|
-
throw new Error(`Provider ${
|
|
322
|
+
throw new Error(`Provider ${authorizeRequest.provider} not configured. Add OAuth credentials to your API route configuration.`);
|
|
39
323
|
}
|
|
40
324
|
if (!providerConfig.clientId || !providerConfig.clientSecret) {
|
|
41
|
-
throw new Error(`Missing OAuth credentials for ${
|
|
325
|
+
throw new Error(`Missing OAuth credentials for ${authorizeRequest.provider}. Check your environment variables.`);
|
|
42
326
|
}
|
|
43
327
|
const url = new URL("/oauth/authorize", this.serverUrl);
|
|
44
|
-
url.searchParams.set("provider",
|
|
328
|
+
url.searchParams.set("provider", authorizeRequest.provider);
|
|
45
329
|
url.searchParams.set("client_id", providerConfig.clientId);
|
|
46
330
|
url.searchParams.set("client_secret", providerConfig.clientSecret);
|
|
47
|
-
const scopes =
|
|
331
|
+
const scopes = authorizeRequest.scopes || providerConfig.scopes || [];
|
|
48
332
|
if (scopes.length > 0) {
|
|
49
333
|
url.searchParams.set("scope", scopes.join(","));
|
|
50
334
|
}
|
|
51
|
-
url.searchParams.set("state",
|
|
52
|
-
url.searchParams.set("code_challenge",
|
|
53
|
-
url.searchParams.set("code_challenge_method",
|
|
54
|
-
const redirectUri =
|
|
335
|
+
url.searchParams.set("state", authorizeRequest.state);
|
|
336
|
+
url.searchParams.set("code_challenge", authorizeRequest.codeChallenge);
|
|
337
|
+
url.searchParams.set("code_challenge_method", authorizeRequest.codeChallengeMethod);
|
|
338
|
+
const redirectUri = authorizeRequest.redirectUri || providerConfig.redirectUri;
|
|
55
339
|
if (redirectUri) {
|
|
56
340
|
url.searchParams.set("redirect_uri", redirectUri);
|
|
57
341
|
}
|
|
@@ -64,15 +348,62 @@ class OAuthHandler {
|
|
|
64
348
|
throw new Error(`MCP server failed to generate authorization URL: ${error}`);
|
|
65
349
|
}
|
|
66
350
|
const data = await response.json();
|
|
67
|
-
|
|
351
|
+
const result = data;
|
|
352
|
+
if (webRequest) {
|
|
353
|
+
try {
|
|
354
|
+
const { detectSessionContext: detectSessionContext2 } = await Promise.resolve().then(() => exports_session_detector);
|
|
355
|
+
const { createContextCookie: createContextCookie2, getSetCookieHeader: getSetCookieHeader2 } = await Promise.resolve().then(() => exports_context_cookie);
|
|
356
|
+
let context;
|
|
357
|
+
if (this.config.getSessionContext) {
|
|
358
|
+
context = await this.config.getSessionContext(webRequest);
|
|
359
|
+
}
|
|
360
|
+
if (!context || !context.userId) {
|
|
361
|
+
context = await detectSessionContext2(webRequest);
|
|
362
|
+
}
|
|
363
|
+
if (context && context.userId) {
|
|
364
|
+
const secret = this.apiKey || providerConfig.clientSecret;
|
|
365
|
+
const cookieValue = await createContextCookie2(context, authorizeRequest.provider, secret);
|
|
366
|
+
result.setCookie = getSetCookieHeader2(cookieValue);
|
|
367
|
+
}
|
|
368
|
+
} catch (error) {
|
|
369
|
+
console.warn("[OAuth] Failed to capture user context:", error);
|
|
370
|
+
}
|
|
371
|
+
}
|
|
372
|
+
return result;
|
|
68
373
|
}
|
|
69
374
|
async handleCallback(request) {
|
|
70
|
-
|
|
375
|
+
let webRequest;
|
|
376
|
+
let callbackRequest;
|
|
377
|
+
if (request instanceof Request) {
|
|
378
|
+
webRequest = request;
|
|
379
|
+
callbackRequest = await request.json();
|
|
380
|
+
} else if (typeof request === "object" && "json" in request && typeof request.json === "function") {
|
|
381
|
+
callbackRequest = await request.json();
|
|
382
|
+
} else {
|
|
383
|
+
callbackRequest = request;
|
|
384
|
+
}
|
|
385
|
+
const providerConfig = this.config.providers[callbackRequest.provider];
|
|
71
386
|
if (!providerConfig) {
|
|
72
|
-
throw new Error(`Provider ${
|
|
387
|
+
throw new Error(`Provider ${callbackRequest.provider} not configured. Add OAuth credentials to your API route configuration.`);
|
|
73
388
|
}
|
|
74
389
|
if (!providerConfig.clientId || !providerConfig.clientSecret) {
|
|
75
|
-
throw new Error(`Missing OAuth credentials for ${
|
|
390
|
+
throw new Error(`Missing OAuth credentials for ${callbackRequest.provider}. Check your environment variables.`);
|
|
391
|
+
}
|
|
392
|
+
let context;
|
|
393
|
+
if (webRequest) {
|
|
394
|
+
try {
|
|
395
|
+
const { getContextCookieFromRequest: getContextCookieFromRequest2, readContextCookie: readContextCookie2 } = await Promise.resolve().then(() => exports_context_cookie);
|
|
396
|
+
const cookieValue = getContextCookieFromRequest2(webRequest);
|
|
397
|
+
if (cookieValue) {
|
|
398
|
+
const secret = this.apiKey || providerConfig.clientSecret;
|
|
399
|
+
const contextData = await readContextCookie2(cookieValue, secret);
|
|
400
|
+
if (contextData && contextData.provider === callbackRequest.provider) {
|
|
401
|
+
context = contextData.context;
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
} catch (error) {
|
|
405
|
+
console.warn("[OAuth] Failed to restore user context:", error);
|
|
406
|
+
}
|
|
76
407
|
}
|
|
77
408
|
const url = new URL("/oauth/callback", this.serverUrl);
|
|
78
409
|
const response = await fetch(url.toString(), {
|
|
@@ -81,10 +412,10 @@ class OAuthHandler {
|
|
|
81
412
|
"Content-Type": "application/json"
|
|
82
413
|
}),
|
|
83
414
|
body: JSON.stringify({
|
|
84
|
-
provider:
|
|
85
|
-
code:
|
|
86
|
-
code_verifier:
|
|
87
|
-
state:
|
|
415
|
+
provider: callbackRequest.provider,
|
|
416
|
+
code: callbackRequest.code,
|
|
417
|
+
code_verifier: callbackRequest.codeVerifier,
|
|
418
|
+
state: callbackRequest.state,
|
|
88
419
|
client_id: providerConfig.clientId,
|
|
89
420
|
client_secret: providerConfig.clientSecret,
|
|
90
421
|
redirect_uri: providerConfig.redirectUri
|
|
@@ -95,7 +426,26 @@ class OAuthHandler {
|
|
|
95
426
|
throw new Error(`MCP server failed to exchange authorization code: ${error}`);
|
|
96
427
|
}
|
|
97
428
|
const data = await response.json();
|
|
98
|
-
|
|
429
|
+
const result = data;
|
|
430
|
+
if (this.config.setProviderToken && context) {
|
|
431
|
+
try {
|
|
432
|
+
const tokenData = {
|
|
433
|
+
accessToken: result.accessToken,
|
|
434
|
+
refreshToken: result.refreshToken,
|
|
435
|
+
tokenType: result.tokenType,
|
|
436
|
+
expiresIn: result.expiresIn,
|
|
437
|
+
expiresAt: result.expiresAt
|
|
438
|
+
};
|
|
439
|
+
await this.config.setProviderToken(callbackRequest.provider, tokenData, context);
|
|
440
|
+
} catch (error) {
|
|
441
|
+
console.error("[OAuth] Failed to save provider token:", error);
|
|
442
|
+
}
|
|
443
|
+
}
|
|
444
|
+
if (webRequest) {
|
|
445
|
+
const { getClearCookieHeader: getClearCookieHeader2 } = await Promise.resolve().then(() => exports_context_cookie);
|
|
446
|
+
result.clearCookie = getClearCookieHeader2();
|
|
447
|
+
}
|
|
448
|
+
return result;
|
|
99
449
|
}
|
|
100
450
|
async handleStatus(provider, accessToken) {
|
|
101
451
|
const url = new URL("/oauth/status", this.serverUrl);
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Context Cookie Manager
|
|
3
|
+
* Securely store and retrieve user context between OAuth authorization and callback
|
|
4
|
+
*/
|
|
5
|
+
import type { MCPContext } from '../config/types.js';
|
|
6
|
+
/**
|
|
7
|
+
* Cookie name for storing OAuth context
|
|
8
|
+
*/
|
|
9
|
+
export declare const CONTEXT_COOKIE_NAME = "__integrate_oauth_ctx";
|
|
10
|
+
/**
|
|
11
|
+
* Cookie TTL in seconds (5 minutes - enough for OAuth flow)
|
|
12
|
+
*/
|
|
13
|
+
export declare const CONTEXT_COOKIE_MAX_AGE = 300;
|
|
14
|
+
/**
|
|
15
|
+
* Create an encrypted context cookie value
|
|
16
|
+
*
|
|
17
|
+
* @param context - User context to store
|
|
18
|
+
* @param provider - OAuth provider name
|
|
19
|
+
* @param secret - Secret for encryption (API key or provider secret)
|
|
20
|
+
* @returns Encrypted cookie value
|
|
21
|
+
*
|
|
22
|
+
* @example
|
|
23
|
+
* ```typescript
|
|
24
|
+
* const cookieValue = await createContextCookie(
|
|
25
|
+
* { userId: 'user123' },
|
|
26
|
+
* 'github',
|
|
27
|
+
* process.env.API_KEY
|
|
28
|
+
* );
|
|
29
|
+
* ```
|
|
30
|
+
*/
|
|
31
|
+
export declare function createContextCookie(context: MCPContext, provider: string, secret: string): Promise<string>;
|
|
32
|
+
/**
|
|
33
|
+
* Read and decrypt a context cookie
|
|
34
|
+
*
|
|
35
|
+
* @param cookieValue - Encrypted cookie value
|
|
36
|
+
* @param secret - Secret for decryption
|
|
37
|
+
* @returns Decrypted context and provider, or undefined if invalid/expired
|
|
38
|
+
*
|
|
39
|
+
* @example
|
|
40
|
+
* ```typescript
|
|
41
|
+
* const result = await readContextCookie(cookieValue, process.env.API_KEY);
|
|
42
|
+
* if (result) {
|
|
43
|
+
* console.log('User ID:', result.context.userId);
|
|
44
|
+
* console.log('Provider:', result.provider);
|
|
45
|
+
* }
|
|
46
|
+
* ```
|
|
47
|
+
*/
|
|
48
|
+
export declare function readContextCookie(cookieValue: string, secret: string): Promise<{
|
|
49
|
+
context: MCPContext;
|
|
50
|
+
provider: string;
|
|
51
|
+
} | undefined>;
|
|
52
|
+
/**
|
|
53
|
+
* Generate a Set-Cookie header value for the context cookie
|
|
54
|
+
*
|
|
55
|
+
* @param cookieValue - Encrypted cookie value
|
|
56
|
+
* @param maxAge - Cookie max age in seconds (default: 300 = 5 minutes)
|
|
57
|
+
* @returns Set-Cookie header value
|
|
58
|
+
*
|
|
59
|
+
* @example
|
|
60
|
+
* ```typescript
|
|
61
|
+
* const setCookieHeader = getSetCookieHeader(cookieValue);
|
|
62
|
+
* response.headers.set('Set-Cookie', setCookieHeader);
|
|
63
|
+
* ```
|
|
64
|
+
*/
|
|
65
|
+
export declare function getSetCookieHeader(cookieValue: string, maxAge?: number): string;
|
|
66
|
+
/**
|
|
67
|
+
* Generate a Set-Cookie header value to clear the context cookie
|
|
68
|
+
*
|
|
69
|
+
* @returns Set-Cookie header value that clears the cookie
|
|
70
|
+
*
|
|
71
|
+
* @example
|
|
72
|
+
* ```typescript
|
|
73
|
+
* const clearCookieHeader = getClearCookieHeader();
|
|
74
|
+
* response.headers.set('Set-Cookie', clearCookieHeader);
|
|
75
|
+
* ```
|
|
76
|
+
*/
|
|
77
|
+
export declare function getClearCookieHeader(): string;
|
|
78
|
+
/**
|
|
79
|
+
* Extract the context cookie value from a Request
|
|
80
|
+
*
|
|
81
|
+
* @param request - Web Request object
|
|
82
|
+
* @returns Cookie value or undefined if not present
|
|
83
|
+
*/
|
|
84
|
+
export declare function getContextCookieFromRequest(request: Request): string | undefined;
|
|
85
|
+
//# sourceMappingURL=context-cookie.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context-cookie.d.ts","sourceRoot":"","sources":["../../../src/adapters/context-cookie.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAErD;;GAEG;AACH,eAAO,MAAM,mBAAmB,0BAA0B,CAAC;AAE3D;;GAEG;AACH,eAAO,MAAM,sBAAsB,MAAM,CAAC;AAmL1C;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,UAAU,EACnB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,EACnB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC;IAAE,OAAO,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAAC,CAUhE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,kBAAkB,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,GAAE,MAA+B,GAAG,MAAM,CAWvG;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAW7C;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgBhF"}
|
|
@@ -0,0 +1,152 @@
|
|
|
1
|
+
var __defProp = Object.defineProperty;
|
|
2
|
+
var __export = (target, all) => {
|
|
3
|
+
for (var name in all)
|
|
4
|
+
__defProp(target, name, {
|
|
5
|
+
get: all[name],
|
|
6
|
+
enumerable: true,
|
|
7
|
+
configurable: true,
|
|
8
|
+
set: (newValue) => all[name] = () => newValue
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
|
|
12
|
+
|
|
13
|
+
// context-cookie.ts
|
|
14
|
+
var exports_context_cookie = {};
|
|
15
|
+
__export(exports_context_cookie, {
|
|
16
|
+
readContextCookie: () => readContextCookie,
|
|
17
|
+
getSetCookieHeader: () => getSetCookieHeader,
|
|
18
|
+
getContextCookieFromRequest: () => getContextCookieFromRequest,
|
|
19
|
+
getClearCookieHeader: () => getClearCookieHeader,
|
|
20
|
+
createContextCookie: () => createContextCookie,
|
|
21
|
+
CONTEXT_COOKIE_NAME: () => CONTEXT_COOKIE_NAME,
|
|
22
|
+
CONTEXT_COOKIE_MAX_AGE: () => CONTEXT_COOKIE_MAX_AGE
|
|
23
|
+
});
|
|
24
|
+
async function deriveKey(secret) {
|
|
25
|
+
const encoder = new TextEncoder;
|
|
26
|
+
const secretData = encoder.encode(secret);
|
|
27
|
+
const keyMaterial = await crypto.subtle.importKey("raw", secretData, { name: "PBKDF2" }, false, ["deriveBits", "deriveKey"]);
|
|
28
|
+
const salt = encoder.encode("integrate-oauth-context-v1");
|
|
29
|
+
return await crypto.subtle.deriveKey({
|
|
30
|
+
name: "PBKDF2",
|
|
31
|
+
salt,
|
|
32
|
+
iterations: 1e5,
|
|
33
|
+
hash: "SHA-256"
|
|
34
|
+
}, keyMaterial, { name: "AES-GCM", length: 256 }, false, ["encrypt", "decrypt"]);
|
|
35
|
+
}
|
|
36
|
+
async function encryptPayload(payload, secret) {
|
|
37
|
+
const key = await deriveKey(secret);
|
|
38
|
+
const iv = crypto.getRandomValues(new Uint8Array(12));
|
|
39
|
+
const encoder = new TextEncoder;
|
|
40
|
+
const data = encoder.encode(JSON.stringify(payload));
|
|
41
|
+
const encrypted = await crypto.subtle.encrypt({
|
|
42
|
+
name: "AES-GCM",
|
|
43
|
+
iv
|
|
44
|
+
}, key, data);
|
|
45
|
+
const combined = new Uint8Array(iv.length + encrypted.byteLength);
|
|
46
|
+
combined.set(iv, 0);
|
|
47
|
+
combined.set(new Uint8Array(encrypted), iv.length);
|
|
48
|
+
return base64UrlEncode(combined);
|
|
49
|
+
}
|
|
50
|
+
async function decryptPayload(cookieValue, secret) {
|
|
51
|
+
try {
|
|
52
|
+
const combined = base64UrlDecode(cookieValue);
|
|
53
|
+
const iv = combined.slice(0, 12);
|
|
54
|
+
const encrypted = combined.slice(12);
|
|
55
|
+
const key = await deriveKey(secret);
|
|
56
|
+
const decrypted = await crypto.subtle.decrypt({
|
|
57
|
+
name: "AES-GCM",
|
|
58
|
+
iv
|
|
59
|
+
}, key, encrypted);
|
|
60
|
+
const decoder = new TextDecoder;
|
|
61
|
+
const json = decoder.decode(decrypted);
|
|
62
|
+
const payload = JSON.parse(json);
|
|
63
|
+
const age = Date.now() - payload.timestamp;
|
|
64
|
+
if (age > CONTEXT_COOKIE_MAX_AGE * 1000) {
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
return payload;
|
|
68
|
+
} catch (error) {
|
|
69
|
+
return;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
function base64UrlEncode(data) {
|
|
73
|
+
const base64 = btoa(String.fromCharCode(...data));
|
|
74
|
+
return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
|
|
75
|
+
}
|
|
76
|
+
function base64UrlDecode(str) {
|
|
77
|
+
let base64 = str.replace(/-/g, "+").replace(/_/g, "/");
|
|
78
|
+
const padding = base64.length % 4;
|
|
79
|
+
if (padding) {
|
|
80
|
+
base64 += "=".repeat(4 - padding);
|
|
81
|
+
}
|
|
82
|
+
const binary = atob(base64);
|
|
83
|
+
const bytes = new Uint8Array(binary.length);
|
|
84
|
+
for (let i = 0;i < binary.length; i++) {
|
|
85
|
+
bytes[i] = binary.charCodeAt(i);
|
|
86
|
+
}
|
|
87
|
+
return bytes;
|
|
88
|
+
}
|
|
89
|
+
async function createContextCookie(context, provider, secret) {
|
|
90
|
+
const payload = {
|
|
91
|
+
context,
|
|
92
|
+
provider,
|
|
93
|
+
timestamp: Date.now()
|
|
94
|
+
};
|
|
95
|
+
return await encryptPayload(payload, secret);
|
|
96
|
+
}
|
|
97
|
+
async function readContextCookie(cookieValue, secret) {
|
|
98
|
+
const payload = await decryptPayload(cookieValue, secret);
|
|
99
|
+
if (!payload) {
|
|
100
|
+
return;
|
|
101
|
+
}
|
|
102
|
+
return {
|
|
103
|
+
context: payload.context,
|
|
104
|
+
provider: payload.provider
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
function getSetCookieHeader(cookieValue, maxAge = CONTEXT_COOKIE_MAX_AGE) {
|
|
108
|
+
const attributes = [
|
|
109
|
+
`${CONTEXT_COOKIE_NAME}=${cookieValue}`,
|
|
110
|
+
`Max-Age=${maxAge}`,
|
|
111
|
+
"HttpOnly",
|
|
112
|
+
"Secure",
|
|
113
|
+
"SameSite=Lax",
|
|
114
|
+
"Path=/"
|
|
115
|
+
];
|
|
116
|
+
return attributes.join("; ");
|
|
117
|
+
}
|
|
118
|
+
function getClearCookieHeader() {
|
|
119
|
+
const attributes = [
|
|
120
|
+
`${CONTEXT_COOKIE_NAME}=`,
|
|
121
|
+
"Max-Age=0",
|
|
122
|
+
"HttpOnly",
|
|
123
|
+
"Secure",
|
|
124
|
+
"SameSite=Lax",
|
|
125
|
+
"Path=/"
|
|
126
|
+
];
|
|
127
|
+
return attributes.join("; ");
|
|
128
|
+
}
|
|
129
|
+
function getContextCookieFromRequest(request) {
|
|
130
|
+
const cookieHeader = request.headers.get("cookie");
|
|
131
|
+
if (!cookieHeader) {
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
const cookies = cookieHeader.split(";");
|
|
135
|
+
for (const cookie of cookies) {
|
|
136
|
+
const [name, ...valueParts] = cookie.split("=");
|
|
137
|
+
if (name && name.trim() === CONTEXT_COOKIE_NAME) {
|
|
138
|
+
return valueParts.join("=").trim();
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
return;
|
|
142
|
+
}
|
|
143
|
+
var CONTEXT_COOKIE_NAME = "__integrate_oauth_ctx", CONTEXT_COOKIE_MAX_AGE = 300;
|
|
144
|
+
export {
|
|
145
|
+
readContextCookie,
|
|
146
|
+
getSetCookieHeader,
|
|
147
|
+
getContextCookieFromRequest,
|
|
148
|
+
getClearCookieHeader,
|
|
149
|
+
createContextCookie,
|
|
150
|
+
CONTEXT_COOKIE_NAME,
|
|
151
|
+
CONTEXT_COOKIE_MAX_AGE
|
|
152
|
+
};
|