@superblocksteam/shared 0.9595.3 → 0.9596.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/types/datasource/auth.d.ts.map +1 -1
- package/dist/types/datasource/auth.js +22 -1
- package/dist/types/datasource/auth.js.map +1 -1
- package/dist/types/datasource/auth.test.js +37 -0
- package/dist/types/datasource/auth.test.js.map +1 -1
- package/dist-esm/types/datasource/auth.d.ts.map +1 -1
- package/dist-esm/types/datasource/auth.js +22 -1
- package/dist-esm/types/datasource/auth.js.map +1 -1
- package/dist-esm/types/datasource/auth.test.js +37 -0
- package/dist-esm/types/datasource/auth.test.js.map +1 -1
- package/package.json +1 -1
- package/src/types/datasource/auth.test.ts +56 -0
- package/src/types/datasource/auth.ts +22 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAC5C,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAC5D,eAAO,MAAM,0BAA0B,4BAA4B,CAAC;AACpE,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAEhD,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAM5B,wBAAgB,SAAS,CACvB,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,aAAa,CAAC,EAAE,MAAM,EACtB,0BAA0B,CAAC,EAAE,MAAM,GAClC,MAAM,CAER;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -73,7 +73,13 @@ function getClientId(authType, config, integrationId, integrationConfigurationId
|
|
|
73
73
|
}
|
|
74
74
|
case IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE: {
|
|
75
75
|
const tokenExchangeConfig = config;
|
|
76
|
-
|
|
76
|
+
// tokenUrl is part of the key: each endpoint issues tokens scoped to its own environment, so two
|
|
77
|
+
// configs sharing clientId/scope/audience but exchanging at different endpoints must not share a token (ENG-4431).
|
|
78
|
+
const fieldsToHash = [
|
|
79
|
+
tokenExchangeConfig.scope?.split(' ').sort().join(' '),
|
|
80
|
+
tokenExchangeConfig.audience,
|
|
81
|
+
normalizeUrlForAuthId(tokenExchangeConfig.tokenUrl)
|
|
82
|
+
];
|
|
77
83
|
if (tokenExchangeConfig.subjectTokenSource === 'SUBJECT_TOKEN_SOURCE_STATIC_TOKEN') {
|
|
78
84
|
fieldsToHash.push(tokenExchangeConfig.subjectTokenSourceStaticToken);
|
|
79
85
|
}
|
|
@@ -331,6 +337,21 @@ const insecureHash = (s) => {
|
|
|
331
337
|
}
|
|
332
338
|
return hash.toString();
|
|
333
339
|
};
|
|
340
|
+
// Canonicalizes a token endpoint URL for the cache key so DNS-equivalent variants
|
|
341
|
+
// (trailing slash, host/scheme case, default port) map to one key. Path and query are
|
|
342
|
+
// preserved, so genuinely distinct endpoints never collapse; unparseable input falls
|
|
343
|
+
// back to the raw value.
|
|
344
|
+
const normalizeUrlForAuthId = (url) => {
|
|
345
|
+
if (!url) {
|
|
346
|
+
return url;
|
|
347
|
+
}
|
|
348
|
+
try {
|
|
349
|
+
return new URL(url).href;
|
|
350
|
+
}
|
|
351
|
+
catch {
|
|
352
|
+
return url;
|
|
353
|
+
}
|
|
354
|
+
};
|
|
334
355
|
function isExchangeCodeResponse(obj) {
|
|
335
356
|
return 'successful' in obj;
|
|
336
357
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":";;;;;;AAqBA,8BAOC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -123,4 +123,41 @@ const auth_js_1 = require("./auth.js");
|
|
|
123
123
|
(0, vitest_1.expect)(authId).toMatch(/^oauth-token-exchange\.my-client/);
|
|
124
124
|
});
|
|
125
125
|
});
|
|
126
|
+
(0, vitest_1.describe)('getAuthId scopes OAUTH2_TOKEN_EXCHANGE by token endpoint (ENG-4431)', () => {
|
|
127
|
+
// Two configurations of one integration that share clientId, scope, and audience
|
|
128
|
+
// but exchange at different token endpoints (environments) must NOT share a cached
|
|
129
|
+
// OBO token: each endpoint issues tokens scoped to its own environment, so one config's
|
|
130
|
+
// token is rejected by the other's downstream API (401). The token endpoint is the
|
|
131
|
+
// environment discriminator, so it must be part of the auth id.
|
|
132
|
+
const base = {
|
|
133
|
+
clientId: 'shared-client',
|
|
134
|
+
scope: 'read write',
|
|
135
|
+
audience: 'https://api.example.com'
|
|
136
|
+
};
|
|
137
|
+
(0, vitest_1.test)('distinct tokenUrl yields distinct authId', () => {
|
|
138
|
+
const ace = (0, auth_js_1.getAuthId)(auth_js_1.IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl: 'https://ace.example.com/oauth/token' }, 'int-1', 'cfg-ace');
|
|
139
|
+
const integrations = (0, auth_js_1.getAuthId)(auth_js_1.IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl: 'https://integrations.example.com/oauth/token' }, 'int-1', 'cfg-integrations');
|
|
140
|
+
(0, vitest_1.expect)(ace).not.toBe(integrations);
|
|
141
|
+
});
|
|
142
|
+
(0, vitest_1.test)('identical config yields a stable authId', () => {
|
|
143
|
+
const config = { ...base, tokenUrl: 'https://ace.example.com/oauth/token' };
|
|
144
|
+
(0, vitest_1.expect)((0, auth_js_1.getAuthId)(auth_js_1.IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace')).toBe((0, auth_js_1.getAuthId)(auth_js_1.IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace'));
|
|
145
|
+
});
|
|
146
|
+
});
|
|
147
|
+
(0, vitest_1.describe)('getAuthId normalizes the OBO token endpoint before hashing (ENG-4431)', () => {
|
|
148
|
+
const base = { clientId: 'shared-client', scope: 'read write', audience: 'https://api.example.com' };
|
|
149
|
+
const authId = (tokenUrl) => (0, auth_js_1.getAuthId)(auth_js_1.IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl }, 'int-1', 'cfg');
|
|
150
|
+
(0, vitest_1.test)('treats DNS-equivalent endpoints as the same (trailing slash, host/scheme case)', () => {
|
|
151
|
+
// Cosmetic variants of one endpoint should share a cached token, not force a redundant exchange.
|
|
152
|
+
(0, vitest_1.expect)(authId('https://token.example.com')).toBe(authId('https://token.example.com/'));
|
|
153
|
+
(0, vitest_1.expect)(authId('https://Token.Example.com/oauth/token')).toBe(authId('https://token.example.com/oauth/token'));
|
|
154
|
+
});
|
|
155
|
+
(0, vitest_1.test)('keeps genuinely-distinct endpoints distinct (path is preserved, never collapsed)', () => {
|
|
156
|
+
(0, vitest_1.expect)(authId('https://token.example.com/a')).not.toBe(authId('https://token.example.com/b'));
|
|
157
|
+
});
|
|
158
|
+
(0, vitest_1.test)('falls back to the raw value for an unparseable tokenUrl without throwing', () => {
|
|
159
|
+
(0, vitest_1.expect)(() => authId('not a url')).not.toThrow();
|
|
160
|
+
(0, vitest_1.expect)(authId('not a url')).toBe(authId('not a url'));
|
|
161
|
+
});
|
|
162
|
+
});
|
|
126
163
|
//# sourceMappingURL=auth.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAC1E,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAEjD,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AACpD,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAC1D,eAAO,MAAM,gBAAgB,cAAc,CAAC;AAC5C,eAAO,MAAM,kBAAkB,gBAAgB,CAAC;AAChD,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAC5D,eAAO,MAAM,0BAA0B,4BAA4B,CAAC;AACpE,eAAO,MAAM,aAAa,qBAAqB,CAAC;AAEhD,MAAM,MAAM,MAAM,GAAG,MAAM,CAAC;AAM5B,wBAAgB,SAAS,CACvB,QAAQ,EAAE,QAAQ,GAAG,SAAS,EAC9B,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,aAAa,CAAC,EAAE,MAAM,EACtB,0BAA0B,CAAC,EAAE,MAAM,GAClC,MAAM,CAER;
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,13 @@ function getClientId(authType, config, integrationId, integrationConfigurationId
|
|
|
61
61
|
}
|
|
62
62
|
case IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE: {
|
|
63
63
|
const tokenExchangeConfig = config;
|
|
64
|
-
|
|
64
|
+
// tokenUrl is part of the key: each endpoint issues tokens scoped to its own environment, so two
|
|
65
|
+
// configs sharing clientId/scope/audience but exchanging at different endpoints must not share a token (ENG-4431).
|
|
66
|
+
const fieldsToHash = [
|
|
67
|
+
tokenExchangeConfig.scope?.split(' ').sort().join(' '),
|
|
68
|
+
tokenExchangeConfig.audience,
|
|
69
|
+
normalizeUrlForAuthId(tokenExchangeConfig.tokenUrl)
|
|
70
|
+
];
|
|
65
71
|
if (tokenExchangeConfig.subjectTokenSource === 'SUBJECT_TOKEN_SOURCE_STATIC_TOKEN') {
|
|
66
72
|
fieldsToHash.push(tokenExchangeConfig.subjectTokenSourceStaticToken);
|
|
67
73
|
}
|
|
@@ -318,6 +324,21 @@ const insecureHash = (s) => {
|
|
|
318
324
|
}
|
|
319
325
|
return hash.toString();
|
|
320
326
|
};
|
|
327
|
+
// Canonicalizes a token endpoint URL for the cache key so DNS-equivalent variants
|
|
328
|
+
// (trailing slash, host/scheme case, default port) map to one key. Path and query are
|
|
329
|
+
// preserved, so genuinely distinct endpoints never collapse; unparseable input falls
|
|
330
|
+
// back to the raw value.
|
|
331
|
+
const normalizeUrlForAuthId = (url) => {
|
|
332
|
+
if (!url) {
|
|
333
|
+
return url;
|
|
334
|
+
}
|
|
335
|
+
try {
|
|
336
|
+
return new URL(url).href;
|
|
337
|
+
}
|
|
338
|
+
catch {
|
|
339
|
+
return url;
|
|
340
|
+
}
|
|
341
|
+
};
|
|
321
342
|
export function isExchangeCodeResponse(obj) {
|
|
322
343
|
return 'successful' in obj;
|
|
323
344
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAMjC,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AACpD,MAAM,CAAC,MAAM,uBAAuB,GAAG,kBAAkB,CAAC;AAC1D,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,CAAC;AAC5C,MAAM,CAAC,MAAM,kBAAkB,GAAG,aAAa,CAAC;AAChD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAC5D,MAAM,CAAC,MAAM,0BAA0B,GAAG,yBAAyB,CAAC;AACpE,MAAM,CAAC,MAAM,aAAa,GAAG,kBAAkB,CAAC;AAIhD,gFAAgF;AAChF,4BAA4B;AAC5B,2EAA2E;AAC3E,mBAAmB;AACnB,MAAM,UAAU,SAAS,CACvB,QAA8B,EAC9B,UAAkC,EAClC,aAAsB,EACtB,0BAAmC;IAEnC,OAAO,GAAG,QAAQ,IAAI,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,0BAA0B,CAAC,EAAE,CAAC;AACvG,CAAC;AAED,SAAS,WAAW,CAClB,QAA8B,EAC9B,MAA8B,EAC9B,aAAsB,EACtB,0BAAmC;IAEnC,MAAM,aAAa,GAAG,gBAAgB,CAAC;IACvC,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,EAAE,CAAC;QACzB,OAAO,aAAa,CAAC;IACvB,CAAC;IAED,MAAM,mBAAmB,GAAG,GAAuB,EAAE;QACnD,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,mBAAmB,CAAC,KAAK;gBAC5B,OAAO,aAAa,IAAI,EAAE,CAAC;YAC7B,KAAK,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAClC,MAAM,cAAc,GAAG,MAA4B,CAAC;gBACpD,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;oBAC3B,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;oBAClD,OAAO,MAAM,CAAC,SAAS,CAAC;gBAC1B,CAAC;gBAAC,MAAM,CAAC;oBACP,OAAO,SAAS,CAAC;gBACnB,CAAC;YACH,CAAC;YACD,KAAK,mBAAmB,CAAC,eAAe,CAAC,CAAC,CAAC;gBACzC,OAAQ,MAAsB,CAAC,QAAQ,CAAC;YAC1C,CAAC;YACD,KAAK,mBAAmB,CAAC,mBAAmB,CAAC;YAC7C,KAAK,mBAAmB,CAAC,WAAW,CAAC;YACrC,KAAK,mBAAmB,CAAC,eAAe,CAAC;YACzC,KAAK,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC;gBACtC,MAAM,WAAW,GAAG,MAAqB,CAAC;gBAC1C,IAAI,KAAK,CAAC;gBACV,IAAI,mBAAmB,CAAC,WAAW,CAAC,UAAU,CAAC,KAAK,UAAU,CAAC,UAAU,EAAE,CAAC;oBAC1E,KAAK,GAAG,0BAA0B,CAAC;gBACrC,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC;gBAC1B,CAAC;gBACD,yFAAyF;gBACzF,MAAM,SAAS,GAAG,OAAO,IAAI,WAAW,IAAI,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,WAAW,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACpI,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;oBACtC,yDAAyD;oBACzD,KAAK,IAAI,IAAI,SAAS,EAAE,CAAC;gBAC3B,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,KAAK,mBAAmB,CAAC,qBAAqB,CAAC,CAAC,CAAC;gBAC/C,MAAM,mBAAmB,GAAG,MAAkC,CAAC;gBAC/D,iGAAiG;gBACjG,mHAAmH;gBACnH,MAAM,YAAY,GAAG;oBACnB,mBAAmB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;oBACtD,mBAAmB,CAAC,QAAQ;oBAC5B,qBAAqB,CAAC,mBAAmB,CAAC,QAAQ,CAAC;iBACpD,CAAC;gBACF,IAAI,mBAAmB,CAAC,kBAAkB,KAAK,mCAAmC,EAAE,CAAC;oBACnF,YAAY,CAAC,IAAI,CAAC,mBAAmB,CAAC,6BAA6B,CAAC,CAAC;gBACvE,CAAC;gBACD,MAAM,YAAY,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAE9E,yFAAyF;gBACzF,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,IAAI,0BAA0B,CAAC;gBACjE,OAAO,GAAG,UAAU,IAAI,YAAY,EAAE,CAAC;YACzC,CAAC;YACD;gBACE,OAAO,SAAS,CAAC;QACrB,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,mBAAmB,EAAE,IAAI,aAAa,CAAC;AAChD,CAAC;AAED,6EAA6E;AAC7E,kCAAkC;AAClC,MAAM,CAAN,IAAY,mBAiBX;AAjBD,WAAY,mBAAmB;IAC7B,oCAAa,CAAA;IACb,sCAAe,CAAA;IACf,iDAA0B,CAAA;IAC1B,gEAAyC,CAAA;IACzC,yDAAkC,CAAA;IAClC,sDAA+B,CAAA;IAC/B,qEAA8C,CAAA;IAC9C,uCAAuC;IACvC,yEAAkD,CAAA;IAClD,2GAA2G;IAC3G,mFAA4D,CAAA;IAC5D,4CAAqB,CAAA;IACrB,wCAAiB,CAAA;IACjB,0CAAmB,CAAA;IACnB,wDAAiC,CAAA;IACjC,oDAA6B,CAAA;AAC/B,CAAC,EAjBW,mBAAmB,KAAnB,mBAAmB,QAiB9B;AAED,qEAAqE;AACrE,gDAAgD;AAChD,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,+DAAgD,CAAA;IAChD,8DAA+C,CAAA;IAC/C,iEAAkD,CAAA;IAClD,+DAAgD,CAAA;AAClD,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAED,MAAM,UAAU,kBAAkB,CAAC,QAA8B;IAC/D,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,mBAAmB,CAAC,WAAW,CAAC;QACrC,KAAK,mBAAmB,CAAC,eAAe;YACtC,OAAO,IAAI,CAAC;QACd;YACE,OAAO,KAAK,CAAC;IACjB,CAAC;AACH,CAAC;AAED,uFAAuF;AACvF,kCAAkC;AAClC,MAAM,CAAC,MAAM,8BAA8B,GAAG;IAC5C,CAAC,mBAAmB,CAAC,KAAK,CAAC,EAAE,QAAQ;IACrC,CAAC,mBAAmB,CAAC,MAAM,CAAC,EAAE,SAAS;IACvC,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,SAAS;IAC5C,oEAAoE;IACpE,yDAAyD;IACzD,CAAC,mBAAmB,CAAC,cAAc,CAAC,EAAE,SAAS;CAChD,CAAC;AAEF,gFAAgF;AAChF,yCAAyC;AACzC,MAAM,CAAN,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,2CAA2B,CAAA;AAC7B,CAAC,EAHW,YAAY,KAAZ,YAAY,QAGvB;AAED,MAAM,CAAN,IAAY,oBAIX;AAJD,WAAY,oBAAoB;IAC9B,uDAAuD;IACvD,kDAA0B,CAAA;IAC1B,2DAAmC,CAAA;AACrC,CAAC,EAJW,oBAAoB,KAApB,oBAAoB,QAI/B;AAED,MAAM,CAAN,IAAY,WAIX;AAJD,WAAY,WAAW;IACrB,wCAAyB,CAAA;IACzB,wCAAyB,CAAA;IACzB,8DAA+C,CAAA;AACjD,CAAC,EAJW,WAAW,KAAX,WAAW,QAItB;AAED,MAAM,sBAAsB,GAAG,IAAI,GAAG,CAAC;IACrC,CAAC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC;IACtC,CAAC,WAAW,CAAC,UAAU,EAAE,YAAY,CAAC;IACtC,CAAC,WAAW,CAAC,qBAAqB,EAAE,uBAAuB,CAAC;CAC7D,CAAC,CAAC;AAEH,MAAM,UAAU,yBAAyB,CAAC,QAAqB;IAC7D,OAAO,sBAAsB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;AACpD,CAAC;AAED,qDAAqD;AACrD,IAAK,gBAKJ;AALD,WAAK,gBAAgB;IACnB,+BAAW,CAAA;IACX,qCAAiB,CAAA;IACjB,iCAAa,CAAA;IACb,yCAAqB,CAAA;AACvB,CAAC,EALI,gBAAgB,KAAhB,gBAAgB,QAKpB;AAID,MAAM,UAAU,cAAc,CAAC,QAAkB;IAC/C,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,mBAAmB,CAAC,KAAK;YAC5B,OAAO,sBAAsB,CAAC;QAChC,KAAK,mBAAmB,CAAC,QAAQ;YAC/B,OAAO,UAAU,CAAC;QACpB,KAAK,WAAW,CAAC,0BAA0B,CAAC;QAC5C,KAAK,mBAAmB,CAAC,eAAe;YACtC,yEAAyE;YACzE,0DAA0D;YAC1D,OAAO,kCAAkC,CAAC;QAC5C,KAAK,WAAW,CAAC,wBAAwB,CAAC;QAC1C,KAAK,mBAAmB,CAAC,mBAAmB;YAC1C,OAAO,mCAAmC,CAAC;QAC7C,KAAK,mBAAmB,CAAC,eAAe;YACtC,OAAO,yBAAyB,CAAC;QACnC,KAAK,WAAW,CAAC,qBAAqB,CAAC;QACvC,KAAK,mBAAmB,CAAC,WAAW;YAClC,OAAO,6BAA6B,CAAC;QACvC,KAAK,mBAAmB,CAAC,qBAAqB;YAC5C,OAAO,sCAAsC,CAAC;QAChD,KAAK,mBAAmB,CAAC,4BAA4B;YACnD,OAAO,uBAAuB,CAAC;QACjC,KAAK,mBAAmB,CAAC,MAAM;YAC7B,OAAO,cAAc,CAAC;QACxB,KAAK,mBAAmB,CAAC,cAAc;YACrC,OAAO,OAAO,CAAC;QACjB,KAAK,mBAAmB,CAAC,OAAO;YAC9B,OAAO,SAAS,CAAC;QACnB,KAAK,mBAAmB,CAAC,YAAY;YACnC,OAAO,SAAS,CAAC;QACnB,KAAK,gBAAgB,CAAC,GAAG;YACvB,OAAO,gBAAgB,CAAC;QAC1B,KAAK,gBAAgB,CAAC,MAAM;YAC1B,OAAO,+BAA+B,CAAC;QACzC,KAAK,gBAAgB,CAAC,IAAI;YACxB,OAAO,KAAK,CAAC;QACf,KAAK,gBAAgB,CAAC,QAAQ;YAC5B,OAAO,yBAAyB,CAAC;QACnC,KAAK,mBAAmB,CAAC,IAAI,CAAC;QAC9B;YACE,OAAO,MAAM,CAAC;IAClB,CAAC;AACH,CAAC;AA6FD,MAAM,CAAN,IAAY,UAGX;AAHD,WAAY,UAAU;IACpB,uCAAyB,CAAA;IACzB,2BAAa,CAAA;AACf,CAAC,EAHW,UAAU,KAAV,UAAU,QAGrB;AAUD,MAAM,CAAN,IAAY,SAMX;AAND,WAAY,SAAS;IACnB,gCAAmB,CAAA;IACnB,4BAAe,CAAA;IACf,oEAAoE;IACpE,6BAAgB,CAAA;IAChB,4BAAe,CAAA;AACjB,CAAC,EANW,SAAS,KAAT,SAAS,QAMpB;AAoCD,kFAAkF;AAClF,+EAA+E;AAC/E,+EAA+E;AAC/E,mEAAmE;AACnE,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,KAAK,UAAU,CAAC,UAAU;QAAE,OAAO,UAAU,CAAC,UAAU,CAAC;IACpF,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,UAAU,CAAC,IAAI;QAAE,OAAO,UAAU,CAAC,IAAI,CAAC;IACzE,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC;IAC5D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAmB,CAAC;QAAE,OAAO,KAAmB,CAAC;IACrH,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAA8B,EAAE,UAAkC,EAAoB,EAAE;IACpH,QAAQ,QAAQ,EAAE,CAAC;QACjB,KAAK,mBAAmB,CAAC,KAAK;YAC5B,OAAO;gBACL,mBAAmB,EAAE,UAAU,EAAE,mBAAmB;aACrD,CAAC;QACJ,KAAK,mBAAmB,CAAC,mBAAmB;YAC1C,OAAO;gBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,KAAK,EAAE,UAAU,EAAE,KAAK;aACzB,CAAC;QACJ,KAAK,mBAAmB,CAAC,WAAW;YAClC,OAAO;gBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,gBAAgB,EAAE,UAAU,EAAE,gBAAgB;gBAC9C,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,KAAK,EAAE,UAAU,EAAE,KAAK;gBACxB,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,sBAAsB,EAAE,UAAU,EAAE,sBAAsB;gBAC1D,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,UAAU,EAAE,mBAAmB,CAAC,UAAU,EAAE,UAAU,CAAC;gBACvD,UAAU,EAAE,UAAU,EAAE,UAAU;gBAClC,cAAc,EAAE,UAAU,EAAE,cAAc;aAC3C,CAAC;QACJ,KAAK,mBAAmB,CAAC,eAAe;YACtC,OAAO;gBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,gBAAgB,EAAE,UAAU,EAAE,gBAAgB;gBAC9C,KAAK,EAAE,UAAU,EAAE,KAAK;gBACxB,QAAQ,EAAE,UAAU,EAAE,QAAQ;aAC/B,CAAC;QACJ,KAAK,mBAAmB,CAAC,eAAe;YACtC,OAAO;gBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,qBAAqB,EAAE,UAAU,EAAE,qBAAqB;gBACxD,QAAQ,EAAE,UAAU,EAAE,QAAQ;aAC/B,CAAC;QACJ,KAAK,mBAAmB,CAAC,qBAAqB;YAC5C,OAAO;gBACL,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,QAAQ,EAAE,UAAU,EAAE,QAAQ;gBAC9B,KAAK,EAAE,UAAU,EAAE,KAAK;gBACxB,kBAAkB,EAAE,UAAU,EAAE,kBAAkB;gBAClD,6BAA6B,EAAE,UAAU,EAAE,6BAA6B;aACzE,CAAC;QACJ,KAAK,mBAAmB,CAAC,QAAQ;YAC/B,OAAO,UAAU,IAAI,EAAE,CAAC;QAC1B,KAAK,mBAAmB,CAAC,IAAI;YAC3B,OAAO,UAAU,IAAI,EAAE,CAAC;QAC1B,KAAK,oBAAoB,CAAC,WAAW,CAAC;QACtC,KAAK,oBAAoB,CAAC,eAAe,CAAC;QAC1C,KAAK,mBAAmB,CAAC,MAAM,CAAC;QAChC,KAAK,mBAAmB,CAAC,cAAc,CAAC;QACxC,KAAK,mBAAmB,CAAC,OAAO,CAAC;QACjC,KAAK,mBAAmB,CAAC,YAAY,CAAC;QACtC,KAAK,mBAAmB,CAAC,4BAA4B,CAAC;QACtD,KAAK,gBAAgB,CAAC,MAAM,CAAC;QAC7B,KAAK,gBAAgB,CAAC,IAAI,CAAC;QAC3B,KAAK,gBAAgB,CAAC,QAAQ,CAAC;QAC/B,KAAK,gBAAgB,CAAC,GAAG;YACvB,OAAO,EAAE,CAAC;QACZ;YACE,MAAM,IAAI,KAAK,CAAC,sBAAsB,QAAQ,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC,CAAC;AAsBF,wEAAwE;AACxE,+CAA+C;AAC/C,uDAAuD;AACvD,MAAM,YAAY,GAAG,CAAC,CAAqB,EAAU,EAAE;IACrD,6EAA6E;IAC7E,aAAa;IACb,IAAI,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAC7B,IAAI,GAAG,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;QACjC,sBAAsB;QACtB,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC,CAAC;AAEF,kFAAkF;AAClF,sFAAsF;AACtF,qFAAqF;AACrF,yBAAyB;AACzB,MAAM,qBAAqB,GAAG,CAAC,GAAuB,EAAsB,EAAE;IAC5E,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,OAAO,GAAG,CAAC;IACb,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,GAAG,CAAC;IACb,CAAC;AACH,CAAC,CAAC;AAmBF,MAAM,UAAU,sBAAsB,CACpC,GAMK;IAEL,OAAO,YAAY,IAAI,GAAG,CAAC;AAC7B,CAAC;AAkCD,MAAM,UAAU,qBAAqB,CAAC,GAAiD;IACrF,OAAO,CACL,eAAe,IAAI,GAAG,IAAI,iBAAiB,IAAI,GAAG,IAAI,UAAU,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,IAAI,YAAY,IAAI,GAAG,IAAI,QAAQ,IAAI,GAAG,CACrI,CAAC;AACJ,CAAC"}
|
|
@@ -121,4 +121,41 @@ describe('getAuthId', () => {
|
|
|
121
121
|
expect(authId).toMatch(/^oauth-token-exchange\.my-client/);
|
|
122
122
|
});
|
|
123
123
|
});
|
|
124
|
+
describe('getAuthId scopes OAUTH2_TOKEN_EXCHANGE by token endpoint (ENG-4431)', () => {
|
|
125
|
+
// Two configurations of one integration that share clientId, scope, and audience
|
|
126
|
+
// but exchange at different token endpoints (environments) must NOT share a cached
|
|
127
|
+
// OBO token: each endpoint issues tokens scoped to its own environment, so one config's
|
|
128
|
+
// token is rejected by the other's downstream API (401). The token endpoint is the
|
|
129
|
+
// environment discriminator, so it must be part of the auth id.
|
|
130
|
+
const base = {
|
|
131
|
+
clientId: 'shared-client',
|
|
132
|
+
scope: 'read write',
|
|
133
|
+
audience: 'https://api.example.com'
|
|
134
|
+
};
|
|
135
|
+
test('distinct tokenUrl yields distinct authId', () => {
|
|
136
|
+
const ace = getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl: 'https://ace.example.com/oauth/token' }, 'int-1', 'cfg-ace');
|
|
137
|
+
const integrations = getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl: 'https://integrations.example.com/oauth/token' }, 'int-1', 'cfg-integrations');
|
|
138
|
+
expect(ace).not.toBe(integrations);
|
|
139
|
+
});
|
|
140
|
+
test('identical config yields a stable authId', () => {
|
|
141
|
+
const config = { ...base, tokenUrl: 'https://ace.example.com/oauth/token' };
|
|
142
|
+
expect(getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace')).toBe(getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace'));
|
|
143
|
+
});
|
|
144
|
+
});
|
|
145
|
+
describe('getAuthId normalizes the OBO token endpoint before hashing (ENG-4431)', () => {
|
|
146
|
+
const base = { clientId: 'shared-client', scope: 'read write', audience: 'https://api.example.com' };
|
|
147
|
+
const authId = (tokenUrl) => getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl }, 'int-1', 'cfg');
|
|
148
|
+
test('treats DNS-equivalent endpoints as the same (trailing slash, host/scheme case)', () => {
|
|
149
|
+
// Cosmetic variants of one endpoint should share a cached token, not force a redundant exchange.
|
|
150
|
+
expect(authId('https://token.example.com')).toBe(authId('https://token.example.com/'));
|
|
151
|
+
expect(authId('https://Token.Example.com/oauth/token')).toBe(authId('https://token.example.com/oauth/token'));
|
|
152
|
+
});
|
|
153
|
+
test('keeps genuinely-distinct endpoints distinct (path is preserved, never collapsed)', () => {
|
|
154
|
+
expect(authId('https://token.example.com/a')).not.toBe(authId('https://token.example.com/b'));
|
|
155
|
+
});
|
|
156
|
+
test('falls back to the raw value for an unparseable tokenUrl without throwing', () => {
|
|
157
|
+
expect(() => authId('not a url')).not.toThrow();
|
|
158
|
+
expect(authId('not a url')).toBe(authId('not a url'));
|
|
159
|
+
});
|
|
160
|
+
});
|
|
124
161
|
//# sourceMappingURL=auth.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.test.js","sourceRoot":"","sources":["../../../src/types/datasource/auth.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -136,3 +136,59 @@ describe('getAuthId', () => {
|
|
|
136
136
|
expect(authId).toMatch(/^oauth-token-exchange\.my-client/);
|
|
137
137
|
});
|
|
138
138
|
});
|
|
139
|
+
|
|
140
|
+
describe('getAuthId scopes OAUTH2_TOKEN_EXCHANGE by token endpoint (ENG-4431)', () => {
|
|
141
|
+
// Two configurations of one integration that share clientId, scope, and audience
|
|
142
|
+
// but exchange at different token endpoints (environments) must NOT share a cached
|
|
143
|
+
// OBO token: each endpoint issues tokens scoped to its own environment, so one config's
|
|
144
|
+
// token is rejected by the other's downstream API (401). The token endpoint is the
|
|
145
|
+
// environment discriminator, so it must be part of the auth id.
|
|
146
|
+
const base = {
|
|
147
|
+
clientId: 'shared-client',
|
|
148
|
+
scope: 'read write',
|
|
149
|
+
audience: 'https://api.example.com'
|
|
150
|
+
};
|
|
151
|
+
|
|
152
|
+
test('distinct tokenUrl yields distinct authId', () => {
|
|
153
|
+
const ace = getAuthId(
|
|
154
|
+
IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE,
|
|
155
|
+
{ ...base, tokenUrl: 'https://ace.example.com/oauth/token' },
|
|
156
|
+
'int-1',
|
|
157
|
+
'cfg-ace'
|
|
158
|
+
);
|
|
159
|
+
const integrations = getAuthId(
|
|
160
|
+
IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE,
|
|
161
|
+
{ ...base, tokenUrl: 'https://integrations.example.com/oauth/token' },
|
|
162
|
+
'int-1',
|
|
163
|
+
'cfg-integrations'
|
|
164
|
+
);
|
|
165
|
+
expect(ace).not.toBe(integrations);
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
test('identical config yields a stable authId', () => {
|
|
169
|
+
const config = { ...base, tokenUrl: 'https://ace.example.com/oauth/token' };
|
|
170
|
+
expect(getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace')).toBe(
|
|
171
|
+
getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, config, 'int-1', 'cfg-ace')
|
|
172
|
+
);
|
|
173
|
+
});
|
|
174
|
+
});
|
|
175
|
+
|
|
176
|
+
describe('getAuthId normalizes the OBO token endpoint before hashing (ENG-4431)', () => {
|
|
177
|
+
const base = { clientId: 'shared-client', scope: 'read write', audience: 'https://api.example.com' };
|
|
178
|
+
const authId = (tokenUrl: string): string => getAuthId(IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE, { ...base, tokenUrl }, 'int-1', 'cfg');
|
|
179
|
+
|
|
180
|
+
test('treats DNS-equivalent endpoints as the same (trailing slash, host/scheme case)', () => {
|
|
181
|
+
// Cosmetic variants of one endpoint should share a cached token, not force a redundant exchange.
|
|
182
|
+
expect(authId('https://token.example.com')).toBe(authId('https://token.example.com/'));
|
|
183
|
+
expect(authId('https://Token.Example.com/oauth/token')).toBe(authId('https://token.example.com/oauth/token'));
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
test('keeps genuinely-distinct endpoints distinct (path is preserved, never collapsed)', () => {
|
|
187
|
+
expect(authId('https://token.example.com/a')).not.toBe(authId('https://token.example.com/b'));
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
test('falls back to the raw value for an unparseable tokenUrl without throwing', () => {
|
|
191
|
+
expect(() => authId('not a url')).not.toThrow();
|
|
192
|
+
expect(authId('not a url')).toBe(authId('not a url'));
|
|
193
|
+
});
|
|
194
|
+
});
|
|
@@ -79,7 +79,13 @@ function getClientId(
|
|
|
79
79
|
}
|
|
80
80
|
case IntegrationAuthType.OAUTH2_TOKEN_EXCHANGE: {
|
|
81
81
|
const tokenExchangeConfig = config as OAuthTokenExchangeConfig;
|
|
82
|
-
|
|
82
|
+
// tokenUrl is part of the key: each endpoint issues tokens scoped to its own environment, so two
|
|
83
|
+
// configs sharing clientId/scope/audience but exchanging at different endpoints must not share a token (ENG-4431).
|
|
84
|
+
const fieldsToHash = [
|
|
85
|
+
tokenExchangeConfig.scope?.split(' ').sort().join(' '),
|
|
86
|
+
tokenExchangeConfig.audience,
|
|
87
|
+
normalizeUrlForAuthId(tokenExchangeConfig.tokenUrl)
|
|
88
|
+
];
|
|
83
89
|
if (tokenExchangeConfig.subjectTokenSource === 'SUBJECT_TOKEN_SOURCE_STATIC_TOKEN') {
|
|
84
90
|
fieldsToHash.push(tokenExchangeConfig.subjectTokenSourceStaticToken);
|
|
85
91
|
}
|
|
@@ -498,6 +504,21 @@ const insecureHash = (s: string | undefined): string => {
|
|
|
498
504
|
return hash.toString();
|
|
499
505
|
};
|
|
500
506
|
|
|
507
|
+
// Canonicalizes a token endpoint URL for the cache key so DNS-equivalent variants
|
|
508
|
+
// (trailing slash, host/scheme case, default port) map to one key. Path and query are
|
|
509
|
+
// preserved, so genuinely distinct endpoints never collapse; unparseable input falls
|
|
510
|
+
// back to the raw value.
|
|
511
|
+
const normalizeUrlForAuthId = (url: string | undefined): string | undefined => {
|
|
512
|
+
if (!url) {
|
|
513
|
+
return url;
|
|
514
|
+
}
|
|
515
|
+
try {
|
|
516
|
+
return new URL(url).href;
|
|
517
|
+
} catch {
|
|
518
|
+
return url;
|
|
519
|
+
}
|
|
520
|
+
};
|
|
521
|
+
|
|
501
522
|
export type ExchangeCodeRequest = {
|
|
502
523
|
authId: AuthId;
|
|
503
524
|
authType: AuthType;
|