managed-deepagents 0.5.0-dev.83 → 0.5.0-dev.85
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 +4 -3
- package/dist/connectors/langsmith/routes.d.ts +1 -1
- package/dist/connectors/langsmith/routes.js +5 -5
- package/dist/connectors/langsmith/routes.js.map +1 -1
- package/dist/connectors/marketplace/load.d.ts +0 -1
- package/dist/connectors/marketplace/load.d.ts.map +1 -1
- package/dist/connectors/marketplace/load.js +4 -63
- package/dist/connectors/marketplace/load.js.map +1 -1
- package/dist/connectors/toolserver/index.d.ts +1 -1
- package/dist/connectors/toolserver/index.js +1 -1
- package/dist/connectors/toolserver/integrations.d.ts.map +1 -1
- package/dist/connectors/toolserver/integrations.js +14 -3
- package/dist/connectors/toolserver/integrations.js.map +1 -1
- package/dist/connectors/toolserver/load.d.ts +1 -1
- package/dist/connectors/toolserver/load.js +3 -4
- package/dist/connectors/toolserver/load.js.map +1 -1
- package/dist/identity/actor-subject.d.ts +2 -2
- package/dist/identity/actor-subject.js +2 -2
- package/dist/identity/byo-oauth.d.ts +30 -6
- package/dist/identity/byo-oauth.d.ts.map +1 -1
- package/dist/identity/byo-oauth.js +69 -24
- package/dist/identity/byo-oauth.js.map +1 -1
- package/dist/identity/connect-provider.js +1 -1
- package/dist/identity/connect-provider.js.map +1 -1
- package/dist/identity/define-fleet-connect.d.ts +53 -0
- package/dist/identity/define-fleet-connect.d.ts.map +1 -0
- package/dist/identity/define-fleet-connect.js +76 -0
- package/dist/identity/define-fleet-connect.js.map +1 -0
- package/dist/identity/fleet-connect-hint.d.ts +2 -0
- package/dist/identity/fleet-connect-hint.d.ts.map +1 -1
- package/dist/identity/fleet-connect-hint.js +58 -2
- package/dist/identity/fleet-connect-hint.js.map +1 -1
- package/dist/identity/fleet-connect.d.ts +1 -0
- package/dist/identity/fleet-connect.d.ts.map +1 -1
- package/dist/identity/fleet-connect.js +2 -2
- package/dist/identity/fleet-connect.js.map +1 -1
- package/dist/identity/fleet-integration-connect.js +1 -1
- package/dist/identity/fleet.d.ts.map +1 -1
- package/dist/identity/fleet.js +2 -4
- package/dist/identity/fleet.js.map +1 -1
- package/dist/identity/github/connect-http.d.ts.map +1 -1
- package/dist/identity/github/connect-http.js +2 -1
- package/dist/identity/github/connect-http.js.map +1 -1
- package/dist/identity/github/oauth.d.ts +17 -16
- package/dist/identity/github/oauth.d.ts.map +1 -1
- package/dist/identity/github/oauth.js +91 -71
- package/dist/identity/github/oauth.js.map +1 -1
- package/dist/identity/google/connect-http.d.ts +11 -12
- package/dist/identity/google/connect-http.d.ts.map +1 -1
- package/dist/identity/google/connect-http.js +20 -37
- package/dist/identity/google/connect-http.js.map +1 -1
- package/dist/identity/google/oauth.d.ts +1 -1
- package/dist/identity/google/oauth.d.ts.map +1 -1
- package/dist/identity/index.d.ts +3 -2
- package/dist/identity/index.d.ts.map +1 -1
- package/dist/identity/index.js +8 -7
- package/dist/identity/index.js.map +1 -1
- package/dist/identity/linkedin/connect-http.d.ts +11 -12
- package/dist/identity/linkedin/connect-http.d.ts.map +1 -1
- package/dist/identity/linkedin/connect-http.js +19 -37
- package/dist/identity/linkedin/connect-http.js.map +1 -1
- package/dist/identity/linkedin/oauth.d.ts +1 -1
- package/dist/identity/linkedin/oauth.d.ts.map +1 -1
- package/dist/identity/marketplace/connect.js +2 -2
- package/dist/identity/marketplace/connect.js.map +1 -1
- package/dist/identity/microsoft/connect-http.d.ts +11 -12
- package/dist/identity/microsoft/connect-http.d.ts.map +1 -1
- package/dist/identity/microsoft/connect-http.js +19 -37
- package/dist/identity/microsoft/connect-http.js.map +1 -1
- package/dist/identity/microsoft/oauth.d.ts +1 -1
- package/dist/identity/microsoft/oauth.d.ts.map +1 -1
- package/dist/identity/oauth-env.d.ts +42 -0
- package/dist/identity/oauth-env.d.ts.map +1 -0
- package/dist/identity/oauth-env.js +65 -0
- package/dist/identity/oauth-env.js.map +1 -0
- package/dist/identity/options.d.ts +21 -8
- package/dist/identity/options.d.ts.map +1 -1
- package/dist/identity/options.js +8 -8
- package/dist/identity/options.js.map +1 -1
- package/dist/identity/slack/connect-http.js +2 -2
- package/dist/identity/slack/connect-http.js.map +1 -1
- package/dist/identity/slack/oauth.d.ts +1 -30
- package/dist/identity/slack/oauth.d.ts.map +1 -1
- package/dist/identity/slack/oauth.js +2 -53
- package/dist/identity/slack/oauth.js.map +1 -1
- package/dist/identity/types.d.ts +22 -3
- package/dist/identity/types.d.ts.map +1 -1
- package/dist/identity/x/connect-http.d.ts +11 -12
- package/dist/identity/x/connect-http.d.ts.map +1 -1
- package/dist/identity/x/connect-http.js +19 -47
- package/dist/identity/x/connect-http.js.map +1 -1
- package/dist/runtime/auth.js +3 -3
- package/dist/runtime/auth.js.map +1 -1
- package/dist/runtime/cors.d.ts +11 -1
- package/dist/runtime/cors.d.ts.map +1 -1
- package/dist/runtime/cors.js +22 -3
- package/dist/runtime/cors.js.map +1 -1
- package/dist/runtime/identity-http.js +2 -2
- package/dist/runtime/identity-http.js.map +1 -1
- package/dist/runtime/identity-runtime.d.ts +2 -2
- package/dist/runtime/identity-runtime.d.ts.map +1 -1
- package/dist/runtime/identity-runtime.js +5 -5
- package/dist/runtime/identity-runtime.js.map +1 -1
- package/dist/runtime/memory/user-repo.js +1 -1
- package/dist/runtime/memory/user-repo.js.map +1 -1
- package/dist/runtime/validated-token.js +1 -1
- package/dist/runtime/validated-token.js.map +1 -1
- package/package.json +7 -7
|
@@ -8,8 +8,8 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import type { FleetVaultByoOauth, FleetVaultByoTokenResult } from "./fleet-connect.js";
|
|
10
10
|
import { type OauthTickets } from "./oauth-tickets.js";
|
|
11
|
-
import {
|
|
12
|
-
export { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, OAUTH_STATE_SIGNING_KEY_ENV, readOauthStateSigningKey, resolveSlackOauthRedirectBase, } from "./
|
|
11
|
+
import { resolveOauthRedirectBase } from "./oauth-env.js";
|
|
12
|
+
export { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, OAUTH_STATE_SIGNING_KEY_ENV, readOauthStateSigningKey, resolveOauthRedirectBase, resolveSlackOauthRedirectBase, } from "./oauth-env.js";
|
|
13
13
|
/** Shared BYO OAuth client configuration. */
|
|
14
14
|
export interface ByoOauthConfig {
|
|
15
15
|
clientId: string;
|
|
@@ -30,6 +30,8 @@ export interface ByoOauthEndpoints {
|
|
|
30
30
|
export interface ByoOauthUserInfo {
|
|
31
31
|
email?: string;
|
|
32
32
|
subject?: string;
|
|
33
|
+
/** Extra vault / provider metadata merged with {@link CreateByoOauthClientOptions.subjectMetadataKey}. */
|
|
34
|
+
metadata?: Record<string, unknown>;
|
|
33
35
|
}
|
|
34
36
|
export interface CreateByoOauthClientOptions {
|
|
35
37
|
/** Connect / ticket provider id, e.g. `"google"`. */
|
|
@@ -39,17 +41,39 @@ export interface CreateByoOauthClientOptions {
|
|
|
39
41
|
/**
|
|
40
42
|
* Env prefix without trailing underscore, e.g. `"GOOGLE_OAUTH"`.
|
|
41
43
|
* Reads `${prefix}_CLIENT_ID`, `_CLIENT_SECRET`, `_SCOPES`, `_AUTH_URL`,
|
|
42
|
-
* `_TOKEN_URL`, `_USERINFO_URL
|
|
44
|
+
* `_TOKEN_URL`, `_USERINFO_URL` unless overridden by {@link envKeys}.
|
|
43
45
|
*/
|
|
44
46
|
envPrefix: string;
|
|
47
|
+
/** Override individual env key names after prefix derivation (e.g. GitHub). */
|
|
48
|
+
envKeys?: Partial<ByoOauthEnvKeys>;
|
|
45
49
|
/** Default endpoints + scopes (may read extra env, e.g. tenant). */
|
|
46
50
|
defaultEndpoints: (env: NodeJS.ProcessEnv) => ByoOauthEndpoints;
|
|
47
51
|
/**
|
|
48
52
|
* Extra authorize query params merged after the shared OAuth code-grant
|
|
49
|
-
* fields. Defaults include `prompt=consent`
|
|
53
|
+
* fields. Defaults include `prompt=consent` unless {@link defaultPrompt} is
|
|
54
|
+
* `false`.
|
|
50
55
|
*/
|
|
51
56
|
authorizeParams?: Record<string, string>;
|
|
52
|
-
/**
|
|
57
|
+
/**
|
|
58
|
+
* Default authorize `prompt` value. Set `false` to omit (GitHub).
|
|
59
|
+
* @default "consent"
|
|
60
|
+
*/
|
|
61
|
+
defaultPrompt?: string | false;
|
|
62
|
+
/**
|
|
63
|
+
* Token exchange request shape. GitHub needs JSON + `Accept: application/json`;
|
|
64
|
+
* most IdPs use form-urlencoded.
|
|
65
|
+
*/
|
|
66
|
+
tokenRequest?: {
|
|
67
|
+
format?: "form" | "json";
|
|
68
|
+
headers?: Record<string, string>;
|
|
69
|
+
};
|
|
70
|
+
/** UserInfo /profile request options. */
|
|
71
|
+
userInfoRequest?: {
|
|
72
|
+
headers?: Record<string, string>;
|
|
73
|
+
/** When true, a failed or incomplete userinfo response throws. */
|
|
74
|
+
required?: boolean;
|
|
75
|
+
};
|
|
76
|
+
/** Map a userinfo /me JSON body to email + subject (+ optional metadata). */
|
|
53
77
|
parseUserInfo: (json: Record<string, unknown>) => ByoOauthUserInfo;
|
|
54
78
|
/** Vault metadata key for the IdP subject (e.g. `google_sub`). */
|
|
55
79
|
subjectMetadataKey: string;
|
|
@@ -68,7 +92,7 @@ export interface ByoOauthClient {
|
|
|
68
92
|
displayName: string;
|
|
69
93
|
env: ByoOauthEnvKeys;
|
|
70
94
|
tickets: OauthTickets;
|
|
71
|
-
resolveRedirectBase: typeof
|
|
95
|
+
resolveRedirectBase: typeof resolveOauthRedirectBase;
|
|
72
96
|
readConfig(env?: NodeJS.ProcessEnv): ByoOauthConfig | null;
|
|
73
97
|
buildAuthorizeUrl(config: ByoOauthConfig, state: string, redirectUri: string, scopes?: string): string;
|
|
74
98
|
exchangeCode(config: ByoOauthConfig, code: string, redirectUri: string, fetchImpl?: typeof fetch): Promise<FleetVaultByoTokenResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"byo-oauth.d.ts","sourceRoot":"","sources":["../../src/identity/byo-oauth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,KAAK,EACV,kBAAkB,EAClB,wBAAwB,EACzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAmB,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAGL,
|
|
1
|
+
{"version":3,"file":"byo-oauth.d.ts","sourceRoot":"","sources":["../../src/identity/byo-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,12 +8,12 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import { fetchWithTimeout, PROVIDER_HTTP_TIMEOUT_MS } from "../runtime/http.js";
|
|
10
10
|
import { oauthTicketsFor } from "./oauth-tickets.js";
|
|
11
|
-
import { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV,
|
|
12
|
-
export { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, OAUTH_STATE_SIGNING_KEY_ENV, readOauthStateSigningKey, resolveSlackOauthRedirectBase, } from "./
|
|
11
|
+
import { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, resolveOauthRedirectBase, } from "./oauth-env.js";
|
|
12
|
+
export { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, OAUTH_STATE_SIGNING_KEY_ENV, readOauthStateSigningKey, resolveOauthRedirectBase, resolveSlackOauthRedirectBase, } from "./oauth-env.js";
|
|
13
13
|
function stripSlash(value) {
|
|
14
14
|
return value.replace(/\/$/, "");
|
|
15
15
|
}
|
|
16
|
-
function
|
|
16
|
+
function envKeysFromPrefix(prefix) {
|
|
17
17
|
return {
|
|
18
18
|
clientId: `${prefix}_CLIENT_ID`,
|
|
19
19
|
clientSecret: `${prefix}_CLIENT_SECRET`,
|
|
@@ -25,12 +25,18 @@ function envKeys(prefix) {
|
|
|
25
25
|
}
|
|
26
26
|
/** Build a BYO OAuth client for one Fleet vault Connect integration. */
|
|
27
27
|
export function createByoOauthClient(options) {
|
|
28
|
-
const keys =
|
|
28
|
+
const keys = { ...envKeysFromPrefix(options.envPrefix), ...options.envKeys };
|
|
29
29
|
const tickets = oauthTicketsFor(options.providerId);
|
|
30
30
|
const authorizeExtras = {
|
|
31
|
-
|
|
31
|
+
...(options.defaultPrompt === false
|
|
32
|
+
? {}
|
|
33
|
+
: { prompt: options.defaultPrompt ?? "consent" }),
|
|
32
34
|
...options.authorizeParams,
|
|
33
35
|
};
|
|
36
|
+
const tokenFormat = options.tokenRequest?.format ?? "form";
|
|
37
|
+
const tokenHeaders = options.tokenRequest?.headers;
|
|
38
|
+
const userInfoHeaders = options.userInfoRequest?.headers;
|
|
39
|
+
const requireUserInfo = options.userInfoRequest?.required ?? false;
|
|
34
40
|
function readConfig(env = process.env) {
|
|
35
41
|
const clientId = env[keys.clientId]?.trim();
|
|
36
42
|
const clientSecret = env[keys.clientSecret]?.trim();
|
|
@@ -63,18 +69,35 @@ export function createByoOauthClient(options) {
|
|
|
63
69
|
return url.toString();
|
|
64
70
|
}
|
|
65
71
|
async function exchangeCode(config, code, redirectUri, fetchImpl = fetch) {
|
|
66
|
-
const
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
72
|
+
const tokenInit = tokenFormat === "json"
|
|
73
|
+
? {
|
|
74
|
+
method: "POST",
|
|
75
|
+
headers: {
|
|
76
|
+
"Content-Type": "application/json",
|
|
77
|
+
...tokenHeaders,
|
|
78
|
+
},
|
|
79
|
+
body: JSON.stringify({
|
|
80
|
+
client_id: config.clientId,
|
|
81
|
+
client_secret: config.clientSecret,
|
|
82
|
+
code,
|
|
83
|
+
redirect_uri: redirectUri,
|
|
84
|
+
}),
|
|
85
|
+
}
|
|
86
|
+
: {
|
|
87
|
+
method: "POST",
|
|
88
|
+
headers: {
|
|
89
|
+
"Content-Type": "application/x-www-form-urlencoded",
|
|
90
|
+
...tokenHeaders,
|
|
91
|
+
},
|
|
92
|
+
body: new URLSearchParams({
|
|
93
|
+
code,
|
|
94
|
+
client_id: config.clientId,
|
|
95
|
+
client_secret: config.clientSecret,
|
|
96
|
+
redirect_uri: redirectUri,
|
|
97
|
+
grant_type: "authorization_code",
|
|
98
|
+
}),
|
|
99
|
+
};
|
|
100
|
+
const tokenResponse = await fetchWithTimeout(config.tokenUrl, tokenInit, PROVIDER_HTTP_TIMEOUT_MS, fetchImpl);
|
|
78
101
|
const tokenJson = (await tokenResponse.json());
|
|
79
102
|
if (!tokenResponse.ok || !tokenJson.access_token) {
|
|
80
103
|
throw new Error(tokenJson.error_description ??
|
|
@@ -83,11 +106,21 @@ export function createByoOauthClient(options) {
|
|
|
83
106
|
}
|
|
84
107
|
let accountLabel;
|
|
85
108
|
let subject;
|
|
109
|
+
let extraMetadata;
|
|
86
110
|
try {
|
|
87
111
|
const userResponse = await fetchWithTimeout(config.userInfoUrl, {
|
|
88
|
-
headers: {
|
|
112
|
+
headers: {
|
|
113
|
+
Authorization: `Bearer ${tokenJson.access_token}`,
|
|
114
|
+
...userInfoHeaders,
|
|
115
|
+
},
|
|
89
116
|
}, PROVIDER_HTTP_TIMEOUT_MS, fetchImpl);
|
|
90
|
-
if (userResponse.ok) {
|
|
117
|
+
if (!userResponse.ok) {
|
|
118
|
+
if (requireUserInfo) {
|
|
119
|
+
const errJson = (await userResponse.json().catch(() => ({})));
|
|
120
|
+
throw new Error(errJson.message ?? `${options.displayName} userinfo lookup failed`);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
else {
|
|
91
124
|
const userJson = (await userResponse.json());
|
|
92
125
|
const parsed = options.parseUserInfo(userJson);
|
|
93
126
|
if (parsed.email) {
|
|
@@ -96,11 +129,24 @@ export function createByoOauthClient(options) {
|
|
|
96
129
|
if (parsed.subject) {
|
|
97
130
|
subject = parsed.subject;
|
|
98
131
|
}
|
|
132
|
+
if (parsed.metadata) {
|
|
133
|
+
extraMetadata = parsed.metadata;
|
|
134
|
+
}
|
|
135
|
+
if (requireUserInfo && !subject) {
|
|
136
|
+
throw new Error(`${options.displayName} userinfo missing subject`);
|
|
137
|
+
}
|
|
99
138
|
}
|
|
100
139
|
}
|
|
101
|
-
catch {
|
|
140
|
+
catch (error) {
|
|
141
|
+
if (requireUserInfo) {
|
|
142
|
+
throw error;
|
|
143
|
+
}
|
|
102
144
|
// Account label is optional for vault import.
|
|
103
145
|
}
|
|
146
|
+
const metadata = {
|
|
147
|
+
...extraMetadata,
|
|
148
|
+
...(subject ? { [options.subjectMetadataKey]: subject } : {}),
|
|
149
|
+
};
|
|
104
150
|
return {
|
|
105
151
|
accessToken: tokenJson.access_token,
|
|
106
152
|
...(tokenJson.refresh_token
|
|
@@ -110,10 +156,9 @@ export function createByoOauthClient(options) {
|
|
|
110
156
|
? { expiresInSeconds: tokenJson.expires_in }
|
|
111
157
|
: {}),
|
|
112
158
|
...(tokenJson.scope ? { scope: tokenJson.scope } : {}),
|
|
159
|
+
...(tokenJson.token_type ? { tokenType: tokenJson.token_type } : {}),
|
|
113
160
|
...(accountLabel ? { accountLabel } : {}),
|
|
114
|
-
...(
|
|
115
|
-
? { metadata: { [options.subjectMetadataKey]: subject } }
|
|
116
|
-
: {}),
|
|
161
|
+
...(Object.keys(metadata).length > 0 ? { metadata } : {}),
|
|
117
162
|
};
|
|
118
163
|
}
|
|
119
164
|
const byo = {
|
|
@@ -134,7 +179,7 @@ export function createByoOauthClient(options) {
|
|
|
134
179
|
displayName: options.displayName,
|
|
135
180
|
env: keys,
|
|
136
181
|
tickets,
|
|
137
|
-
resolveRedirectBase:
|
|
182
|
+
resolveRedirectBase: resolveOauthRedirectBase,
|
|
138
183
|
readConfig,
|
|
139
184
|
buildAuthorizeUrl,
|
|
140
185
|
exchangeCode,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"byo-oauth.js","sourceRoot":"","sources":["../../src/identity/byo-oauth.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAKhF,OAAO,EAAE,eAAe,EAAqB,MAAM,oBAAoB,CAAC;AACxE,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,
|
|
1
|
+
{"version":3,"file":"byo-oauth.js","sourceRoot":"","sources":["../../src/identity/byo-oauth.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import { identityConnectPaths } from "./connect-paths.js";
|
|
7
7
|
import { resolveRequestIdentity } from "../runtime/auth.js";
|
|
8
|
-
import { MDA_PUBLIC_APP_URL_ENV } from "./
|
|
8
|
+
import { MDA_PUBLIC_APP_URL_ENV } from "./oauth-env.js";
|
|
9
9
|
export { identityConnectPaths } from "./connect-paths.js";
|
|
10
10
|
export function identityConnectSettingsQueryKey(provider) {
|
|
11
11
|
return provider.settingsQueryKey?.trim() || provider.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect-provider.js","sourceRoot":"","sources":["../../src/identity/connect-provider.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAK1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"connect-provider.js","sourceRoot":"","sources":["../../src/identity/connect-provider.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAK1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAWxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAU1D,MAAM,UAAU,+BAA+B,CAC7C,QAAiC;IAEjC,OAAO,QAAQ,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,QAAQ,CAAC,EAAE,CAAC;AAC1D,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,6BAA6B,CAC3C,GAAS,EACT,GAAmB,EACnB,GAAgC,EAChC,OAAsC,EACtC,OAAO,GAMH,EAAE;IAEN,MAAM,QAAQ,GAAG,OAAO,CAAC,SAAS,IAAI,EAAE,CAAC;IACzC,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG;QACd,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7D,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;aACnD,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;KACtD,CAAC;IACF,KAAK,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,OAAO,EAAE,CAAC;QACzD,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC;YAC5D,SAAS;QACX,CAAC;QACD,+BAA+B,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;AACH,CAAC;AAED,SAAS,+BAA+B,CACtC,GAAS,EACT,GAAmB,EACnB,QAAiC,EACjC,OAAsC,EACtC,OAAuC;IAEvC,MAAM,KAAK,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAChD,MAAM,WAAW,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,YAAY,QAAQ,CAAC,EAAE,UAAU,CAAC;IAEhD,KAAK,MAAM,KAAK,IAAI;QAClB,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE;QACpD,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE;QACrD,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE;QACvD,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;KAC7C,EAAE,CAAC;QACX,OAAO,CAAC,IAAI,CAAC;YACX,SAAS,EAAE,KAAK;YAChB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,OAAO,EAAE,KAAK,CAAC,OAAO;SACvB,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAChC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,QAAQ,YAAY,QAAQ,EAAE,CAAC;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,CAAC;QAC7C,IAAI,MAAc,CAAC;QACnB,IAAI,MAAM,IAAI,QAAQ,CAAC,oBAAoB,EAAE,CAAC;YAC5C,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,QAAQ,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;YACvD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,MAAM,OAAO,GACX,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO;oBACrC,CAAC,CAAC,KAAK,CAAC,OAAO;oBACf,CAAC,CAAC,wBAAwB,CAAC;gBAC/B,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7D,IAAI,QAAQ,YAAY,QAAQ,EAAE,CAAC;gBACjC,OAAO,QAAQ,CAAC;YAClB,CAAC;YACD,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,CAAC;QACD,MAAM,WAAW,GAAG,mBAAmB,CACrC,QAAQ,EACR,CAAC,CAAC,GAAG,CAAC,GAAG,EACT,OAAO,CAAC,iBAAiB,CAC1B,CAAC;QACF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;QAClE,IAAI,eAAe,IAAI,MAAM,EAAE,CAAC;YAC9B,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,MAAM,SAAS,GACb,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,MAAM;YAChC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;QAC9D,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,MAAM,CAAC,YAAY,EAAE,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAClC,MAAM,SAAS,GACb,QAAQ,CAAC,mBAAmB,EAAE,EAAE;YAChC,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,SAAS;YAC5B,CAAC,CAAC,GAAG,SAAS,aAAa,WAAW,QAAQ;YAC9C,CAAC,CAAC,GAAG,CAAC;QACR,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACnC,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;YAC3C,CAAC;YACD,MAAM,WAAW,GAAG,mBAAmB,CACrC,QAAQ,EACR,CAAC,CAAC,GAAG,CAAC,GAAG,EACT,OAAO,CAAC,iBAAiB,CAC1B,CAAC;YACF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CACzD,IAAI,EACJ,KAAK,EACL,WAAW,CACZ,CAAC;YACF,OAAO,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;QAC1C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,SAAS,QAAQ,CAAC,EAAE,yBAAyB,EAAE,KAAK,CAAC,CAAC;YACpE,OAAO,CAAC,CAAC,QAAQ,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;QACvC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,QAAQ,GAAG,MAAM,qBAAqB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAC7D,IAAI,QAAQ,YAAY,QAAQ,EAAE,CAAC;YACjC,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACxC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACnC,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,mBAAmB,CAC1B,QAAiC,EACjC,OAAgB,EAChB,iBAA0B;IAE1B,MAAM,IAAI,GAAG,QAAQ,CAAC,mBAAmB,CAAC;QACxC,UAAU,EAAE,OAAO,CAAC,GAAG;QACvB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,iBAAiB;KAClB,CAAC,CAAC;IACH,OAAO,GAAG,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChE,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,GAAmB,EACnB,OAAgB;IAEhB,IAAI,CAAC;QACH,OAAO,MAAM,sBAAsB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GACV,OAAQ,KAA8B,CAAC,MAAM,KAAK,QAAQ;YACxD,CAAC,CAAE,KAA4B,CAAC,MAAM;YACtC,CAAC,CAAC,GAAG,CAAC;QACV,MAAM,OAAO,GACX,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC;QAC3E,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,EAAE;YACtD,MAAM;YACN,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;SAChD,CAAC,CAAC;IACL,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Factory for thin Connect-with-X adapters over Fleet vault integrations.
|
|
3
|
+
*
|
|
4
|
+
* Google / Microsoft / LinkedIn share the same PATH constants, actor-subject
|
|
5
|
+
* toggles, and `connect()` wiring — only the integration + BYO client differ.
|
|
6
|
+
* X is the vault-only variant (no local BYO client).
|
|
7
|
+
*/
|
|
8
|
+
import type { FleetOAuthIntegration } from "../connectors/toolserver/integrations.js";
|
|
9
|
+
import type { ByoOauthClient } from "./byo-oauth.js";
|
|
10
|
+
import { identityConnectPaths } from "./connect-paths.js";
|
|
11
|
+
import type { IdentityConnectMountContext, IdentityConnectProvider } from "./connect-provider-types.js";
|
|
12
|
+
import { type FleetVaultConnectProviderOptions } from "./fleet-connect.js";
|
|
13
|
+
import { type FleetIntegrationConnectProviderOptions } from "./fleet-integration-connect.js";
|
|
14
|
+
/** Shared surface returned by {@link defineFleetIntegrationConnect}. */
|
|
15
|
+
export interface FleetIntegrationConnectAdapter {
|
|
16
|
+
readonly paths: ReturnType<typeof identityConnectPaths>;
|
|
17
|
+
isActorSubjectEnabled(): boolean;
|
|
18
|
+
enableActorSubject(): void;
|
|
19
|
+
enableActorSubjectFromConnectors(connectorKinds: readonly (string | undefined)[] | undefined, scope?: IdentityConnectMountContext["scope"]): void;
|
|
20
|
+
resetActorSubjectEnabledForTests(): void;
|
|
21
|
+
isConnectConfigured(env?: NodeJS.ProcessEnv): boolean;
|
|
22
|
+
connectUrl(publicAppUrl: string): string;
|
|
23
|
+
createProvider(options?: FleetIntegrationConnectProviderOptions): IdentityConnectProvider;
|
|
24
|
+
readonly provider: IdentityConnectProvider;
|
|
25
|
+
connect(options?: FleetIntegrationConnectProviderOptions): IdentityConnectProvider;
|
|
26
|
+
}
|
|
27
|
+
/** Shared surface returned by {@link defineFleetVaultConnect}. */
|
|
28
|
+
export interface FleetVaultConnectAdapter {
|
|
29
|
+
readonly paths: ReturnType<typeof identityConnectPaths>;
|
|
30
|
+
isActorSubjectEnabled(): boolean;
|
|
31
|
+
enableActorSubject(): void;
|
|
32
|
+
enableActorSubjectFromConnectors(connectorKinds: readonly (string | undefined)[] | undefined, scope?: IdentityConnectMountContext["scope"]): void;
|
|
33
|
+
resetActorSubjectEnabledForTests(): void;
|
|
34
|
+
isConnectConfigured(env?: NodeJS.ProcessEnv): boolean;
|
|
35
|
+
connectUrl(publicAppUrl: string): string;
|
|
36
|
+
createProvider(options?: Pick<FleetVaultConnectProviderOptions, "providerSlug" | "scopes" | "fleet">): IdentityConnectProvider;
|
|
37
|
+
readonly provider: IdentityConnectProvider;
|
|
38
|
+
connect(options?: Pick<FleetVaultConnectProviderOptions, "providerSlug" | "scopes" | "fleet">): IdentityConnectProvider;
|
|
39
|
+
}
|
|
40
|
+
/** Build the Google/Microsoft/LinkedIn-style BYO + Fleet Connect adapter. */
|
|
41
|
+
export declare function defineFleetIntegrationConnect(options: {
|
|
42
|
+
integration: FleetOAuthIntegration;
|
|
43
|
+
byoClient: ByoOauthClient;
|
|
44
|
+
fallbackScopes?: readonly string[];
|
|
45
|
+
}): FleetIntegrationConnectAdapter;
|
|
46
|
+
/**
|
|
47
|
+
* Build a vault-only Connect adapter (no local BYO client), e.g. Connect-with-X.
|
|
48
|
+
*/
|
|
49
|
+
export declare function defineFleetVaultConnect(options: {
|
|
50
|
+
integration: FleetOAuthIntegration;
|
|
51
|
+
resolveProviderSlug: () => string;
|
|
52
|
+
}): FleetVaultConnectAdapter;
|
|
53
|
+
//# sourceMappingURL=define-fleet-connect.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-fleet-connect.d.ts","sourceRoot":"","sources":["../../src/identity/define-fleet-connect.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0CAA0C,CAAC;AAOtF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,KAAK,EACV,2BAA2B,EAC3B,uBAAuB,EACxB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAIL,KAAK,gCAAgC,EACtC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAIL,KAAK,sCAAsC,EAC5C,MAAM,gCAAgC,CAAC;AAMxC,wEAAwE;AACxE,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;IACxD,qBAAqB,IAAI,OAAO,CAAC;IACjC,kBAAkB,IAAI,IAAI,CAAC;IAC3B,gCAAgC,CAC9B,cAAc,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EAC3D,KAAK,CAAC,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAC3C,IAAI,CAAC;IACR,gCAAgC,IAAI,IAAI,CAAC;IACzC,mBAAmB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IACtD,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,cAAc,CACZ,OAAO,CAAC,EAAE,sCAAsC,GAC/C,uBAAuB,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,OAAO,CACL,OAAO,CAAC,EAAE,sCAAsC,GAC/C,uBAAuB,CAAC;CAC5B;AAED,kEAAkE;AAClE,MAAM,WAAW,wBAAwB;IACvC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,OAAO,oBAAoB,CAAC,CAAC;IACxD,qBAAqB,IAAI,OAAO,CAAC;IACjC,kBAAkB,IAAI,IAAI,CAAC;IAC3B,gCAAgC,CAC9B,cAAc,EAAE,SAAS,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,GAAG,SAAS,EAC3D,KAAK,CAAC,EAAE,2BAA2B,CAAC,OAAO,CAAC,GAC3C,IAAI,CAAC;IACR,gCAAgC,IAAI,IAAI,CAAC;IACzC,mBAAmB,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,OAAO,CAAC;IACtD,UAAU,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,cAAc,CACZ,OAAO,CAAC,EAAE,IAAI,CACZ,gCAAgC,EAChC,cAAc,GAAG,QAAQ,GAAG,OAAO,CACpC,GACA,uBAAuB,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;IAC3C,OAAO,CACL,OAAO,CAAC,EAAE,IAAI,CACZ,gCAAgC,EAChC,cAAc,GAAG,QAAQ,GAAG,OAAO,CACpC,GACA,uBAAuB,CAAC;CAC5B;AAED,6EAA6E;AAC7E,wBAAgB,6BAA6B,CAAC,OAAO,EAAE;IACrD,WAAW,EAAE,qBAAqB,CAAC;IACnC,SAAS,EAAE,cAAc,CAAC;IAC1B,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC,GAAG,8BAA8B,CA0CjC;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,WAAW,EAAE,qBAAqB,CAAC;IACnC,mBAAmB,EAAE,MAAM,MAAM,CAAC;CACnC,GAAG,wBAAwB,CAmD3B"}
|
|
@@ -0,0 +1,76 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Factory for thin Connect-with-X adapters over Fleet vault integrations.
|
|
3
|
+
*
|
|
4
|
+
* Google / Microsoft / LinkedIn share the same PATH constants, actor-subject
|
|
5
|
+
* toggles, and `connect()` wiring — only the integration + BYO client differ.
|
|
6
|
+
* X is the vault-only variant (no local BYO client).
|
|
7
|
+
*/
|
|
8
|
+
import { enableActorSubjectIntegration, enableActorSubjectIntegrationFromConnectors, isActorSubjectIntegrationEnabled, resetActorSubjectEnabledForTests, } from "./actor-subject.js";
|
|
9
|
+
import { identityConnectPaths } from "./connect-paths.js";
|
|
10
|
+
import { createFleetVaultConnectProvider, fleetConnectUrl, isFleetVaultConnectConfigured, } from "./fleet-connect.js";
|
|
11
|
+
import { createFleetIntegrationConnectProvider, fleetIntegrationConnectUrl, isFleetIntegrationConnectConfigured, } from "./fleet-integration-connect.js";
|
|
12
|
+
import { MDA_PUBLIC_APP_URL_ENV, resolveOauthRedirectBase, } from "./oauth-env.js";
|
|
13
|
+
/** Build the Google/Microsoft/LinkedIn-style BYO + Fleet Connect adapter. */
|
|
14
|
+
export function defineFleetIntegrationConnect(options) {
|
|
15
|
+
const { integration, byoClient, fallbackScopes } = options;
|
|
16
|
+
const paths = identityConnectPaths(integration.connectId);
|
|
17
|
+
function createProvider(providerOptions = {}) {
|
|
18
|
+
return createFleetIntegrationConnectProvider(integration, byoClient, providerOptions, fallbackScopes);
|
|
19
|
+
}
|
|
20
|
+
const provider = createProvider();
|
|
21
|
+
return {
|
|
22
|
+
paths,
|
|
23
|
+
isActorSubjectEnabled: () => isActorSubjectIntegrationEnabled(integration.connectId),
|
|
24
|
+
enableActorSubject: () => enableActorSubjectIntegration(integration.connectId),
|
|
25
|
+
enableActorSubjectFromConnectors(connectorKinds, scope) {
|
|
26
|
+
enableActorSubjectIntegrationFromConnectors(integration, connectorKinds, scope);
|
|
27
|
+
},
|
|
28
|
+
resetActorSubjectEnabledForTests,
|
|
29
|
+
isConnectConfigured: (env = process.env) => isFleetIntegrationConnectConfigured(byoClient, env),
|
|
30
|
+
connectUrl: (publicAppUrl) => fleetIntegrationConnectUrl(integration, publicAppUrl),
|
|
31
|
+
createProvider,
|
|
32
|
+
provider,
|
|
33
|
+
connect(providerOptions) {
|
|
34
|
+
enableActorSubjectIntegration(integration.connectId);
|
|
35
|
+
return providerOptions ? createProvider(providerOptions) : provider;
|
|
36
|
+
},
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* Build a vault-only Connect adapter (no local BYO client), e.g. Connect-with-X.
|
|
41
|
+
*/
|
|
42
|
+
export function defineFleetVaultConnect(options) {
|
|
43
|
+
const { integration, resolveProviderSlug } = options;
|
|
44
|
+
const paths = identityConnectPaths(integration.connectId);
|
|
45
|
+
function createProvider(providerOptions = {}) {
|
|
46
|
+
return createFleetVaultConnectProvider({
|
|
47
|
+
integration,
|
|
48
|
+
providerSlug: providerOptions.providerSlug?.trim() || resolveProviderSlug(),
|
|
49
|
+
...(providerOptions.scopes ? { scopes: providerOptions.scopes } : {}),
|
|
50
|
+
...(providerOptions.fleet ? { fleet: providerOptions.fleet } : {}),
|
|
51
|
+
resolveRedirectBase: resolveOauthRedirectBase,
|
|
52
|
+
resolvePublicAppUrl() {
|
|
53
|
+
return process.env[MDA_PUBLIC_APP_URL_ENV]?.replace(/\/$/, "");
|
|
54
|
+
},
|
|
55
|
+
});
|
|
56
|
+
}
|
|
57
|
+
const provider = createProvider();
|
|
58
|
+
return {
|
|
59
|
+
paths,
|
|
60
|
+
isActorSubjectEnabled: () => isActorSubjectIntegrationEnabled(integration.connectId),
|
|
61
|
+
enableActorSubject: () => enableActorSubjectIntegration(integration.connectId),
|
|
62
|
+
enableActorSubjectFromConnectors(connectorKinds, scope) {
|
|
63
|
+
enableActorSubjectIntegrationFromConnectors(integration, connectorKinds, scope);
|
|
64
|
+
},
|
|
65
|
+
resetActorSubjectEnabledForTests,
|
|
66
|
+
isConnectConfigured: (env = process.env) => isFleetVaultConnectConfigured(undefined, env),
|
|
67
|
+
connectUrl: (publicAppUrl) => fleetConnectUrl(integration, publicAppUrl),
|
|
68
|
+
createProvider,
|
|
69
|
+
provider,
|
|
70
|
+
connect(providerOptions) {
|
|
71
|
+
enableActorSubjectIntegration(integration.connectId);
|
|
72
|
+
return providerOptions ? createProvider(providerOptions) : provider;
|
|
73
|
+
},
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
//# sourceMappingURL=define-fleet-connect.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define-fleet-connect.js","sourceRoot":"","sources":["../../src/identity/define-fleet-connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,8 @@ export interface FleetConnectHintMiddlewareOptions {
|
|
|
18
18
|
/** Optional public-app resolver (BYO OAuth publicAppUrl). */
|
|
19
19
|
resolvePublicAppUrl?: (env?: NodeJS.ProcessEnv) => string | undefined;
|
|
20
20
|
}
|
|
21
|
+
/** Drop cached Connect status (tests only). */
|
|
22
|
+
export declare function clearFleetConnectHintCacheForTests(): void;
|
|
21
23
|
/**
|
|
22
24
|
* Absolute Connect start URL for agent hints.
|
|
23
25
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-connect-hint.d.ts","sourceRoot":"","sources":["../../src/identity/fleet-connect-hint.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAS1E,OAAO,EAAE,oBAAoB,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAQ3E,MAAM,WAAW,iCAAiC;IAChD,WAAW,EAAE,qBAAqB,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,kBAAkB,GAAG;QAC3B,IAAI,CAAC,EAAE,OAAO,oBAAoB,CAAC;KACpC,CAAC;IACF,sCAAsC;IACtC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,6DAA6D;IAC7D,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,KAAK,MAAM,GAAG,SAAS,CAAC;CACvE;
|
|
1
|
+
{"version":3,"file":"fleet-connect-hint.d.ts","sourceRoot":"","sources":["../../src/identity/fleet-connect-hint.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAEL,KAAK,qBAAqB,EAC3B,MAAM,0CAA0C,CAAC;AAClD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AAS1E,OAAO,EAAE,oBAAoB,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAQ3E,MAAM,WAAW,iCAAiC;IAChD,WAAW,EAAE,qBAAqB,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,CAAC,EAAE,kBAAkB,GAAG;QAC3B,IAAI,CAAC,EAAE,OAAO,oBAAoB,CAAC;KACpC,CAAC;IACF,sCAAsC;IACtC,WAAW,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACnD,6DAA6D;IAC7D,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,KAAK,MAAM,GAAG,SAAS,CAAC;CACvE;AA2DD,+CAA+C;AAC/C,wBAAgB,kCAAkC,IAAI,IAAI,CAEzD;AAED;;;;;;;;GAQG;AACH,wBAAsB,mBAAmB,CACvC,WAAW,EAAE,qBAAqB,EAClC,GAAG,GAAE,MAAM,CAAC,UAAwB,EACpC,MAAM,CAAC,EAAE,MAAM,EACf,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,KAAK,MAAM,GAAG,SAAS,GACpE,OAAO,CAAC,MAAM,CAAC,CA+BjB;AAoBD;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,iBAAiB,CAwEnB;AAED,2EAA2E;AAC3E,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,WAAW,EAAE,qBAAqB,EAClC,mBAAmB,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,KAAK,MAAM,GAAG,SAAS,GACpE,KAAK,CAgCP;AAED,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,qBAAqB,GACjC,OAAO,CAET"}
|
|
@@ -11,10 +11,52 @@ import { identityConnectPaths } from "./connect-paths.js";
|
|
|
11
11
|
import { fleetConnectUrl } from "./fleet-connect.js";
|
|
12
12
|
import { listAgentConnections } from "./fleet.js";
|
|
13
13
|
import { oauthTicketsFor } from "./oauth-tickets.js";
|
|
14
|
-
import { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, readOauthStateSigningKey, } from "./
|
|
14
|
+
import { MDA_PUBLIC_API_URL_ENV, MDA_PUBLIC_APP_URL_ENV, readOauthStateSigningKey, } from "./oauth-env.js";
|
|
15
15
|
function hintPrefix(integration) {
|
|
16
16
|
return `User has not connected ${integration.displayName}`;
|
|
17
17
|
}
|
|
18
|
+
/** Short TTL so connected callers skip Fleet on every model turn. */
|
|
19
|
+
const CONNECT_STATUS_TTL_MS = 30_000;
|
|
20
|
+
const connectionStatusCache = new Map();
|
|
21
|
+
function cacheKey(userId, providerSlug) {
|
|
22
|
+
return `${userId}\0${providerSlug}`;
|
|
23
|
+
}
|
|
24
|
+
/** Drop expired entries so one-shot callers do not retain forever. */
|
|
25
|
+
function evictExpiredCacheEntries(now = Date.now()) {
|
|
26
|
+
for (const [key, entry] of connectionStatusCache) {
|
|
27
|
+
if (now >= entry.expiresAt) {
|
|
28
|
+
connectionStatusCache.delete(key);
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
function cachedConnected(userId, providerSlug) {
|
|
33
|
+
const entry = connectionStatusCache.get(cacheKey(userId, providerSlug));
|
|
34
|
+
if (!entry) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
37
|
+
if (Date.now() >= entry.expiresAt) {
|
|
38
|
+
connectionStatusCache.delete(cacheKey(userId, providerSlug));
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
41
|
+
return entry.connected;
|
|
42
|
+
}
|
|
43
|
+
function storeConnected(userId, providerSlug, connected) {
|
|
44
|
+
const now = Date.now();
|
|
45
|
+
evictExpiredCacheEntries(now);
|
|
46
|
+
// Only cache positives: a just-completed Connect must be visible on retry
|
|
47
|
+
// within the TTL window, not masked by a prior disconnected observation.
|
|
48
|
+
if (!connected) {
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
connectionStatusCache.set(cacheKey(userId, providerSlug), {
|
|
52
|
+
expiresAt: now + CONNECT_STATUS_TTL_MS,
|
|
53
|
+
connected: true,
|
|
54
|
+
});
|
|
55
|
+
}
|
|
56
|
+
/** Drop cached Connect status (tests only). */
|
|
57
|
+
export function clearFleetConnectHintCacheForTests() {
|
|
58
|
+
connectionStatusCache.clear();
|
|
59
|
+
}
|
|
18
60
|
/**
|
|
19
61
|
* Absolute Connect start URL for agent hints.
|
|
20
62
|
*
|
|
@@ -69,9 +111,16 @@ export function createFleetConnectHintMiddleware(options) {
|
|
|
69
111
|
if (options.isConnected) {
|
|
70
112
|
return !(await options.isConnected(userId));
|
|
71
113
|
}
|
|
114
|
+
const slug = providerSlug();
|
|
115
|
+
const cached = cachedConnected(userId, slug);
|
|
116
|
+
if (cached !== undefined) {
|
|
117
|
+
return !cached;
|
|
118
|
+
}
|
|
72
119
|
const agentId = agentIdFromActor(userId);
|
|
73
120
|
const connections = await list(agentId, options.fleet ?? {});
|
|
74
|
-
|
|
121
|
+
const isDisconnected = !connections.some((c) => c.provider_id === slug);
|
|
122
|
+
storeConnected(userId, slug, !isDisconnected);
|
|
123
|
+
return isDisconnected;
|
|
75
124
|
}
|
|
76
125
|
return {
|
|
77
126
|
name: `mda-${integration.id}-connect-hint`,
|
|
@@ -114,6 +163,13 @@ export function createFleetConnectHintMiddleware(options) {
|
|
|
114
163
|
export function rewriteFleetToolError(error, integration, resolvePublicAppUrl) {
|
|
115
164
|
const message = error instanceof Error ? error.message : String(error);
|
|
116
165
|
if (/connection_required|token_expired|no connection|AgentAuthRequired|428|not connected/i.test(message)) {
|
|
166
|
+
// Per-caller Connect-with-X only exists on user-scoped deployments. Agent /
|
|
167
|
+
// no-identity projects use the shared vault from `mda connect`.
|
|
168
|
+
if (!isActorSubjectIntegrationEnabled(integration.id)) {
|
|
169
|
+
return new Error(`${integration.displayName} is not connected in the shared LangSmith vault. ` +
|
|
170
|
+
`Run \`mda connect\` for a ${integration.displayName} connector, or connect it ` +
|
|
171
|
+
`under LangSmith Settings → Integrations. (Original: ${message})`);
|
|
172
|
+
}
|
|
117
173
|
const apiBase = process.env[MDA_PUBLIC_API_URL_ENV]
|
|
118
174
|
?.trim()
|
|
119
175
|
.replace(/\/$/, "");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-connect-hint.js","sourceRoot":"","sources":["../../src/identity/fleet-connect-hint.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EACL,2BAA2B,GAE5B,MAAM,0CAA0C,CAAC;AAGlD,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EACL,gBAAgB,EAChB,gCAAgC,GACjC,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAA2B,MAAM,YAAY,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,wBAAwB,GACzB,MAAM,
|
|
1
|
+
{"version":3,"file":"fleet-connect-hint.js","sourceRoot":"","sources":["../../src/identity/fleet-connect-hint.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ export interface FleetVaultByoTokenResult {
|
|
|
13
13
|
refreshToken?: string;
|
|
14
14
|
expiresInSeconds?: number;
|
|
15
15
|
scope?: string;
|
|
16
|
+
tokenType?: string;
|
|
16
17
|
/** Shown on status (e.g. email). */
|
|
17
18
|
accountLabel?: string;
|
|
18
19
|
/** Merged into vault token metadata (plus `mda_actor_user_id`). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-connect.d.ts","sourceRoot":"","sources":["../../src/identity/fleet-connect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"fleet-connect.d.ts","sourceRoot":"","sources":["../../src/identity/fleet-connect.ts"],"names":[],"mappings":"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"}
|