@boxyhq/saml-jackson 1.8.1 → 1.9.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/controller/api.d.ts +15 -3
- package/dist/controller/api.js +12 -0
- package/dist/controller/api.js.map +1 -1
- package/dist/controller/connection/oidc.d.ts +3 -3
- package/dist/controller/connection/oidc.js +20 -5
- package/dist/controller/connection/oidc.js.map +1 -1
- package/dist/controller/connection/saml.js +11 -8
- package/dist/controller/connection/saml.js.map +1 -1
- package/dist/controller/oauth/oidc-issuer.d.ts +2 -0
- package/dist/controller/oauth/oidc-issuer.js +25 -0
- package/dist/controller/oauth/oidc-issuer.js.map +1 -0
- package/dist/controller/oauth.d.ts +4 -0
- package/dist/controller/oauth.js +9 -4
- package/dist/controller/oauth.js.map +1 -1
- package/dist/controller/saml-handler.js +3 -2
- package/dist/controller/saml-handler.js.map +1 -1
- package/dist/controller/utils.d.ts +2 -2
- package/dist/controller/utils.js +21 -2
- package/dist/controller/utils.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/loadConnection.d.ts +3 -2
- package/dist/loadConnection.js +1 -1
- package/dist/loadConnection.js.map +1 -1
- package/dist/typings.d.ts +18 -5
- package/dist/typings.js.map +1 -1
- package/package.json +7 -7
package/dist/controller/api.d.ts
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
import { GetConfigQuery, GetConnectionsQuery, DelConnectionsQuery, IConnectionAPIController, SAMLSSOConnectionWithEncodedMetadata, SAMLSSOConnectionWithRawMetadata,
|
1
|
+
import { GetConfigQuery, GetConnectionsQuery, DelConnectionsQuery, IConnectionAPIController, SAMLSSOConnectionWithEncodedMetadata, SAMLSSOConnectionWithRawMetadata, OIDCSSOConnectionWithDiscoveryUrl, OIDCSSOConnectionWithMetadata, SAMLSSORecord, OIDCSSORecord, GetIDPEntityIDBody } from '../typings';
|
2
2
|
export declare class ConnectionAPIController implements IConnectionAPIController {
|
3
3
|
private connectionStore;
|
4
4
|
private opts;
|
@@ -90,6 +90,11 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
90
90
|
* description: well-known URL where the OpenID Provider configuration is exposed
|
91
91
|
* in: formData
|
92
92
|
* type: string
|
93
|
+
* oidcMetadataPost:
|
94
|
+
* name: oidcMetadata
|
95
|
+
* description: metadata (JSON) for the OpenID Provider in the absence of discoveryUrl
|
96
|
+
* in: formData
|
97
|
+
* type: string
|
93
98
|
* oidcClientIdPost:
|
94
99
|
* name: oidcClientId
|
95
100
|
* description: clientId of the application set up on the OpenID Provider
|
@@ -153,6 +158,7 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
153
158
|
* - $ref: '#/parameters/tenantParamPost'
|
154
159
|
* - $ref: '#/parameters/productParamPost'
|
155
160
|
* - $ref: '#/parameters/oidcDiscoveryUrlPost'
|
161
|
+
* - $ref: '#/parameters/oidcMetadataPost'
|
156
162
|
* - $ref: '#/parameters/oidcClientIdPost'
|
157
163
|
* - $ref: '#/parameters/oidcClientSecretPost'
|
158
164
|
* responses:
|
@@ -167,7 +173,7 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
167
173
|
*/
|
168
174
|
createSAMLConnection(body: SAMLSSOConnectionWithEncodedMetadata | SAMLSSOConnectionWithRawMetadata): Promise<SAMLSSORecord>;
|
169
175
|
config(...args: Parameters<ConnectionAPIController['createSAMLConnection']>): Promise<SAMLSSORecord>;
|
170
|
-
createOIDCConnection(body:
|
176
|
+
createOIDCConnection(body: OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata): Promise<OIDCSSORecord>;
|
171
177
|
/**
|
172
178
|
* @swagger
|
173
179
|
* definitions:
|
@@ -216,6 +222,11 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
216
222
|
* description: well-known URL where the OpenID Provider configuration is exposed
|
217
223
|
* in: formData
|
218
224
|
* type: string
|
225
|
+
* oidcMetadataPatch:
|
226
|
+
* name: oidcMetadata
|
227
|
+
* description: metadata (JSON) for the OpenID Provider in the absence of discoveryUrl
|
228
|
+
* in: formData
|
229
|
+
* type: string
|
219
230
|
* oidcClientIdPatch:
|
220
231
|
* name: oidcClientId
|
221
232
|
* description: clientId of the application set up on the OpenID Provider
|
@@ -293,6 +304,7 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
293
304
|
* - $ref: '#/parameters/rawMetadataParamPatch'
|
294
305
|
* - $ref: '#/parameters/metadataUrlParamPatch'
|
295
306
|
* - $ref: '#/parameters/oidcDiscoveryUrlPatch'
|
307
|
+
* - $ref: '#/parameters/oidcMetadataPatch'
|
296
308
|
* - $ref: '#/parameters/oidcClientIdPatch'
|
297
309
|
* - $ref: '#/parameters/oidcClientSecretPatch'
|
298
310
|
* - $ref: '#/parameters/defaultRedirectUrlParamPatch'
|
@@ -314,7 +326,7 @@ export declare class ConnectionAPIController implements IConnectionAPIController
|
|
314
326
|
clientSecret: string;
|
315
327
|
}): Promise<void>;
|
316
328
|
updateConfig(...args: Parameters<ConnectionAPIController['updateSAMLConnection']>): Promise<void>;
|
317
|
-
updateOIDCConnection(body:
|
329
|
+
updateOIDCConnection(body: (OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata) & {
|
318
330
|
clientID: string;
|
319
331
|
clientSecret: string;
|
320
332
|
}): Promise<void>;
|
package/dist/controller/api.js
CHANGED
@@ -131,6 +131,11 @@ class ConnectionAPIController {
|
|
131
131
|
* description: well-known URL where the OpenID Provider configuration is exposed
|
132
132
|
* in: formData
|
133
133
|
* type: string
|
134
|
+
* oidcMetadataPost:
|
135
|
+
* name: oidcMetadata
|
136
|
+
* description: metadata (JSON) for the OpenID Provider in the absence of discoveryUrl
|
137
|
+
* in: formData
|
138
|
+
* type: string
|
134
139
|
* oidcClientIdPost:
|
135
140
|
* name: oidcClientId
|
136
141
|
* description: clientId of the application set up on the OpenID Provider
|
@@ -194,6 +199,7 @@ class ConnectionAPIController {
|
|
194
199
|
* - $ref: '#/parameters/tenantParamPost'
|
195
200
|
* - $ref: '#/parameters/productParamPost'
|
196
201
|
* - $ref: '#/parameters/oidcDiscoveryUrlPost'
|
202
|
+
* - $ref: '#/parameters/oidcMetadataPost'
|
197
203
|
* - $ref: '#/parameters/oidcClientIdPost'
|
198
204
|
* - $ref: '#/parameters/oidcClientSecretPost'
|
199
205
|
* responses:
|
@@ -275,6 +281,11 @@ class ConnectionAPIController {
|
|
275
281
|
* description: well-known URL where the OpenID Provider configuration is exposed
|
276
282
|
* in: formData
|
277
283
|
* type: string
|
284
|
+
* oidcMetadataPatch:
|
285
|
+
* name: oidcMetadata
|
286
|
+
* description: metadata (JSON) for the OpenID Provider in the absence of discoveryUrl
|
287
|
+
* in: formData
|
288
|
+
* type: string
|
278
289
|
* oidcClientIdPatch:
|
279
290
|
* name: oidcClientId
|
280
291
|
* description: clientId of the application set up on the OpenID Provider
|
@@ -352,6 +363,7 @@ class ConnectionAPIController {
|
|
352
363
|
* - $ref: '#/parameters/rawMetadataParamPatch'
|
353
364
|
* - $ref: '#/parameters/metadataUrlParamPatch'
|
354
365
|
* - $ref: '#/parameters/oidcDiscoveryUrlPatch'
|
366
|
+
* - $ref: '#/parameters/oidcMetadataPatch'
|
355
367
|
* - $ref: '#/parameters/oidcClientIdPatch'
|
356
368
|
* - $ref: '#/parameters/oidcClientSecretPatch'
|
357
369
|
* - $ref: '#/parameters/defaultRedirectUrlParamPatch'
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/controller/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAAuC;AACvC,kEAAoD;
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/controller/api.ts"],"names":[],"mappings":"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"}
|
@@ -1,7 +1,7 @@
|
|
1
|
-
import { IConnectionAPIController,
|
1
|
+
import { IConnectionAPIController, OIDCSSOConnectionWithDiscoveryUrl, OIDCSSOConnectionWithMetadata, OIDCSSORecord, Storable } from '../../typings';
|
2
2
|
declare const oidc: {
|
3
|
-
create: (body:
|
4
|
-
update: (body:
|
3
|
+
create: (body: OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata, connectionStore: Storable) => Promise<OIDCSSORecord>;
|
4
|
+
update: (body: (OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata) & {
|
5
5
|
clientID: string;
|
6
6
|
clientSecret: string;
|
7
7
|
}, connectionStore: Storable, connectionsGetter: IConnectionAPIController['getConnections']) => Promise<void>;
|
@@ -52,9 +52,9 @@ const utils_1 = require("../utils");
|
|
52
52
|
const error_1 = require("../error");
|
53
53
|
const oidc = {
|
54
54
|
create: (body, connectionStore) => __awaiter(void 0, void 0, void 0, function* () {
|
55
|
-
const { defaultRedirectUrl, redirectUrl, tenant, product, name, description, oidcDiscoveryUrl = '', oidcClientId = '', oidcClientSecret = '', } = body;
|
56
|
-
let connectionClientSecret;
|
57
55
|
(0, utils_1.validateSSOConnection)(body, 'oidc');
|
56
|
+
const { defaultRedirectUrl, redirectUrl, tenant, product, name, description, oidcDiscoveryUrl = '', oidcMetadata = { issuer: '' }, oidcClientId = '', oidcClientSecret = '', } = body;
|
57
|
+
let connectionClientSecret;
|
58
58
|
const redirectUrlList = (0, utils_1.extractRedirectUrls)(redirectUrl);
|
59
59
|
(0, utils_1.validateRedirectUrl)({ defaultRedirectUrl, redirectUrlList });
|
60
60
|
(0, utils_1.validateTenantAndProduct)(tenant, product);
|
@@ -70,12 +70,17 @@ const oidc = {
|
|
70
70
|
};
|
71
71
|
// from OpenID Provider
|
72
72
|
record.oidcProvider = {
|
73
|
-
discoveryUrl: oidcDiscoveryUrl,
|
74
73
|
clientId: oidcClientId,
|
75
74
|
clientSecret: oidcClientSecret,
|
76
75
|
};
|
76
|
+
if (oidcDiscoveryUrl) {
|
77
|
+
record.oidcProvider.discoveryUrl = oidcDiscoveryUrl;
|
78
|
+
}
|
79
|
+
else if (oidcMetadata.issuer) {
|
80
|
+
record.oidcProvider.metadata = oidcMetadata;
|
81
|
+
}
|
77
82
|
// extract provider
|
78
|
-
const providerName = (0, utils_1.extractHostName)(oidcDiscoveryUrl);
|
83
|
+
const providerName = (0, utils_1.extractHostName)(oidcDiscoveryUrl || oidcMetadata.issuer);
|
79
84
|
record.oidcProvider.provider = providerName ? providerName : 'Unknown';
|
80
85
|
// Use the clientId from the OpenID Provider to generate the clientID hash for the connection
|
81
86
|
record.clientID = dbutils.keyDigest(dbutils.keyFromParts(tenant, product, oidcClientId));
|
@@ -95,7 +100,7 @@ const oidc = {
|
|
95
100
|
return record;
|
96
101
|
}),
|
97
102
|
update: (body, connectionStore, connectionsGetter) => __awaiter(void 0, void 0, void 0, function* () {
|
98
|
-
const { defaultRedirectUrl, redirectUrl, name, description, oidcDiscoveryUrl, oidcClientId, oidcClientSecret } = body, clientInfo = __rest(body, ["defaultRedirectUrl", "redirectUrl", "name", "description", "oidcDiscoveryUrl", "oidcClientId", "oidcClientSecret"]);
|
103
|
+
const { defaultRedirectUrl, redirectUrl, name, description, oidcDiscoveryUrl, oidcMetadata, oidcClientId, oidcClientSecret } = body, clientInfo = __rest(body, ["defaultRedirectUrl", "redirectUrl", "name", "description", "oidcDiscoveryUrl", "oidcMetadata", "oidcClientId", "oidcClientSecret"]);
|
99
104
|
if (!(clientInfo === null || clientInfo === void 0 ? void 0 : clientInfo.clientID)) {
|
100
105
|
throw new error_1.JacksonError('Please provide clientID', 400);
|
101
106
|
}
|
@@ -133,6 +138,16 @@ const oidc = {
|
|
133
138
|
oidcProvider.discoveryUrl = oidcDiscoveryUrl;
|
134
139
|
const providerName = (0, utils_1.extractHostName)(oidcDiscoveryUrl);
|
135
140
|
oidcProvider.provider = providerName ? providerName : 'Unknown';
|
141
|
+
// Remove previous metadata if any
|
142
|
+
delete oidcProvider.metadata;
|
143
|
+
}
|
144
|
+
else if (oidcMetadata && typeof oidcMetadata === 'object') {
|
145
|
+
// Perform a merge of new metadata with existing one
|
146
|
+
oidcProvider.metadata = Object.assign(Object.assign({}, oidcProvider.metadata), oidcMetadata);
|
147
|
+
const providerName = (0, utils_1.extractHostName)(oidcMetadata.issuer);
|
148
|
+
oidcProvider.provider = providerName ? providerName : 'Unknown';
|
149
|
+
// Remove previous discoveryUrl if any
|
150
|
+
delete oidcProvider.discoveryUrl;
|
136
151
|
}
|
137
152
|
}
|
138
153
|
const record = Object.assign(Object.assign({}, _savedConnection), { name: name || name === '' ? name : _savedConnection.name, description: description || description === '' ? description : _savedConnection.description, defaultRedirectUrl: defaultRedirectUrl ? defaultRedirectUrl : _savedConnection.defaultRedirectUrl, redirectUrl: redirectUrlList ? redirectUrlList : _savedConnection.redirectUrl, oidcProvider: oidcProvider ? oidcProvider : _savedConnection.oidcProvider });
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../src/controller/connection/oidc.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../src/controller/connection/oidc.ts"],"names":[],"mappings":"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"}
|
@@ -53,16 +53,19 @@ const saml20_1 = __importDefault(require("@boxyhq/saml20"));
|
|
53
53
|
const error_1 = require("../error");
|
54
54
|
const axios_1 = __importDefault(require("axios"));
|
55
55
|
function fetchMetadata(resource) {
|
56
|
+
var _a;
|
56
57
|
return __awaiter(this, void 0, void 0, function* () {
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
58
|
+
try {
|
59
|
+
const response = yield (0, axios_1.default)(resource, {
|
60
|
+
maxContentLength: 1000000,
|
61
|
+
maxBodyLength: 1000000,
|
62
|
+
timeout: 8000,
|
63
|
+
});
|
64
|
+
return response.data;
|
65
|
+
}
|
66
|
+
catch (error) {
|
63
67
|
throw new error_1.JacksonError("Couldn't fetch XML data", ((_a = error.response) === null || _a === void 0 ? void 0 : _a.status) || 400);
|
64
|
-
}
|
65
|
-
return response.data;
|
68
|
+
}
|
66
69
|
});
|
67
70
|
}
|
68
71
|
function validateParsedMetadata(metadata) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"saml.js","sourceRoot":"","sources":["../../../src/controller/connection/saml.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAQ5B,wDAA0C;AAC1C,oCAQkB;AAClB,4DAAoC;AACpC,oCAAwC;AACxC,
|
1
|
+
{"version":3,"file":"saml.js","sourceRoot":"","sources":["../../../src/controller/connection/saml.ts"],"names":[],"mappings":"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"}
|
@@ -0,0 +1,25 @@
|
|
1
|
+
"use strict";
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
9
|
+
});
|
10
|
+
};
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
12
|
+
exports.oidcIssuerInstance = void 0;
|
13
|
+
const openid_client_1 = require("openid-client");
|
14
|
+
const error_1 = require("../error");
|
15
|
+
const oidcIssuerInstance = (discoveryUrl, metadata) => __awaiter(void 0, void 0, void 0, function* () {
|
16
|
+
if (discoveryUrl) {
|
17
|
+
return yield openid_client_1.Issuer.discover(discoveryUrl);
|
18
|
+
}
|
19
|
+
if (metadata) {
|
20
|
+
return new openid_client_1.Issuer(metadata);
|
21
|
+
}
|
22
|
+
throw new error_1.JacksonError('Neither "discoveryUrl" nor "metadata" set for the OIDC issuer', 500);
|
23
|
+
});
|
24
|
+
exports.oidcIssuerInstance = oidcIssuerInstance;
|
25
|
+
//# sourceMappingURL=oidc-issuer.js.map
|
@@ -0,0 +1 @@
|
|
1
|
+
{"version":3,"file":"oidc-issuer.js","sourceRoot":"","sources":["../../../src/controller/oauth/oidc-issuer.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAA4D;AAC5D,oCAAwC;AAEjC,MAAM,kBAAkB,GAAG,CAAO,YAAqB,EAAE,QAAyB,EAAE,EAAE;IAC3F,IAAI,YAAY,EAAE;QAChB,OAAO,MAAM,sBAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;KAC5C;IACD,IAAI,QAAQ,EAAE;QACZ,OAAO,IAAI,sBAAM,CAAC,QAAQ,CAAC,CAAC;KAC7B;IACD,MAAM,IAAI,oBAAY,CAAC,+DAA+D,EAAE,GAAG,CAAC,CAAC;AAC/F,CAAC,CAAA,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
|
@@ -111,8 +111,12 @@ export declare class OAuthController implements IOAuthController {
|
|
111
111
|
* type: string
|
112
112
|
* roles:
|
113
113
|
* type: array
|
114
|
+
* items:
|
115
|
+
* type: string
|
114
116
|
* groups:
|
115
117
|
* type: array
|
118
|
+
* items:
|
119
|
+
* type: string
|
116
120
|
* raw:
|
117
121
|
* type: object
|
118
122
|
* requested:
|
package/dist/controller/oauth.js
CHANGED
@@ -51,6 +51,7 @@ const redirect = __importStar(require("./oauth/redirect"));
|
|
51
51
|
const x509_1 = require("../saml/x509");
|
52
52
|
const saml_handler_1 = require("./saml-handler");
|
53
53
|
const lib_1 = require("../saml/lib");
|
54
|
+
const oidc_issuer_1 = require("./oauth/oidc-issuer");
|
54
55
|
const deflateRawAsync = (0, util_1.promisify)(zlib_1.deflateRaw);
|
55
56
|
class OAuthController {
|
56
57
|
constructor({ connectionStore, sessionStore, codeStore, tokenStore, opts }) {
|
@@ -251,9 +252,9 @@ class OAuthController {
|
|
251
252
|
}),
|
252
253
|
};
|
253
254
|
}
|
254
|
-
const { discoveryUrl, clientId, clientSecret } = connection.oidcProvider;
|
255
|
+
const { discoveryUrl, metadata, clientId, clientSecret } = connection.oidcProvider;
|
255
256
|
try {
|
256
|
-
const oidcIssuer = yield
|
257
|
+
const oidcIssuer = yield (0, oidc_issuer_1.oidcIssuerInstance)(discoveryUrl, metadata);
|
257
258
|
const oidcClient = new oidcIssuer.Client({
|
258
259
|
client_id: clientId,
|
259
260
|
client_secret: clientSecret,
|
@@ -521,10 +522,10 @@ class OAuthController {
|
|
521
522
|
};
|
522
523
|
}
|
523
524
|
// Reconstruct the oidcClient
|
524
|
-
const { discoveryUrl, clientId, clientSecret } = oidcConnection.oidcProvider;
|
525
|
+
const { discoveryUrl, metadata, clientId, clientSecret } = oidcConnection.oidcProvider;
|
525
526
|
let profile;
|
526
527
|
try {
|
527
|
-
const oidcIssuer = yield
|
528
|
+
const oidcIssuer = yield (0, oidc_issuer_1.oidcIssuerInstance)(discoveryUrl, metadata);
|
528
529
|
const oidcClient = new oidcIssuer.Client({
|
529
530
|
client_id: clientId,
|
530
531
|
client_secret: clientSecret,
|
@@ -769,8 +770,12 @@ class OAuthController {
|
|
769
770
|
* type: string
|
770
771
|
* roles:
|
771
772
|
* type: array
|
773
|
+
* items:
|
774
|
+
* type: string
|
772
775
|
* groups:
|
773
776
|
* type: array
|
777
|
+
* items:
|
778
|
+
* type: string
|
774
779
|
* raw:
|
775
780
|
* type: object
|
776
781
|
* requested:
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/controller/oauth.ts"],"names":[],"mappings":"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"}
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../../src/controller/oauth.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,2CAA6B;AAC7B,+BAAiC;AACjC,+BAAkC;AAClC,4DAAkC;AAClC,iDAAmD;AAgBnD,mCAUiB;AAEjB,kEAAoD;AACpD,mCAAuC;AACvC,yDAA2C;AAC3C,oEAAsD;AACtD,2DAA6C;AAC7C,uCAAqD;AACrD,iDAA6C;AAC7C,qCAA4D;AAC5D,qDAAyD;AAEzD,MAAM,eAAe,GAAG,IAAA,gBAAS,EAAC,iBAAU,CAAC,CAAC;AAE9C,MAAa,eAAe;IAQ1B,YAAY,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE;QACxE,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;QACvC,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAEjB,IAAI,CAAC,WAAW,GAAG,IAAI,0BAAW,CAAC;YACjC,UAAU,EAAE,eAAe;YAC3B,OAAO,EAAE,YAAY;YACrB,IAAI;SACL,CAAC,CAAC;IACL,CAAC;IAEY,SAAS,CAAC,IAAc;;;YACnC,MAAM,EACJ,aAAa,GAAG,MAAM,EACtB,SAAS,EACT,YAAY,EACZ,KAAK,EACL,KAAK,EACL,KAAK,EACL,cAAc,EACd,qBAAqB,GAAG,EAAE,EAC1B,QAAQ,EACR,UAAU,GAAG,OAAO,GACrB,GAAG,IAAI,CAAC;YAET,MAAM,MAAM,GAAG,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1D,MAAM,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,MAAM,WAAW,GAAG,aAAa,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACzE,MAAM,QAAQ,GAAG,UAAU,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC;YAEhE,IAAI,eAAe,GAAG,MAAM,CAAC;YAC7B,IAAI,gBAAgB,GAAG,OAAO,CAAC;YAE/B,OAAO,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YAEpC,IAAI,CAAC,YAAY,EAAE;gBACjB,MAAM,IAAI,oBAAY,CAAC,gCAAgC,EAAE,GAAG,CAAC,CAAC;aAC/D;YAED,IAAI,UAAqD,CAAC;YAC1D,MAAM,eAAe,GAAG,IAAA,sBAAc,EAAC,KAAK,CAAC,CAAC;YAC9C,MAAM,iBAAiB,GAAG,eAAe,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAE7D,IAAI,MAAM,IAAI,OAAO,EAAE;gBACrB,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;oBACxD,MAAM;oBACN,OAAO;oBACP,QAAQ;oBACR,QAAQ,EAAE,OAAO;oBACjB,cAAc,oBAAO,IAAI,CAAE;iBAC5B,CAAC,CAAC;gBAEH,IAAI,aAAa,IAAI,QAAQ,EAAE;oBAC7B,OAAO;wBACL,YAAY,EAAE,QAAQ,CAAC,WAAW;qBACnC,CAAC;iBACH;gBAED,IAAI,YAAY,IAAI,QAAQ,EAAE;oBAC5B,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;iBAClC;aACF;iBAAM,IAAI,SAAS,IAAI,SAAS,KAAK,EAAE,IAAI,SAAS,KAAK,WAAW,IAAI,SAAS,KAAK,MAAM,EAAE;gBAC7F,+GAA+G;gBAC/G,IAAI,EAAE,GAAG,IAAA,+BAAuB,EAAC,SAAS,CAAC,CAAC;gBAE5C,IAAI,CAAC,EAAE,IAAI,WAAW,EAAE;oBACtB,EAAE,GAAG,IAAA,+BAAuB,EAAC,WAAW,CAAC,CAAC;iBAC3C;gBACD,IAAI,CAAC,EAAE,IAAI,QAAQ,EAAE;oBACnB,EAAE,GAAG,IAAA,+BAAuB,EAAC,QAAQ,CAAC,CAAC;iBACxC;gBACD,IAAI,CAAC,EAAE,IAAI,eAAe,EAAE;oBAC1B,MAAM,aAAa,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gEAAgE;oBACnK,IAAI,aAAa,EAAE;wBACjB,EAAE,GAAG,IAAA,+BAAuB,EAAC,aAAa,CAAC,CAAC;qBAC7C;iBACF;gBACD,IAAI,EAAE,IAAI,EAAE,CAAC,MAAM,IAAI,EAAE,CAAC,OAAO,EAAE;oBACjC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;oBAE/B,eAAe,GAAG,MAAM,CAAC;oBACzB,gBAAgB,GAAG,OAAO,CAAC;oBAE3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;wBACxD,MAAM;wBACN,OAAO;wBACP,QAAQ;wBACR,QAAQ,EAAE,OAAO;wBACjB,cAAc,oBAAO,IAAI,CAAE;qBAC5B,CAAC,CAAC;oBAEH,IAAI,aAAa,IAAI,QAAQ,EAAE;wBAC7B,OAAO;4BACL,YAAY,EAAE,QAAQ,CAAC,WAAW;yBACnC,CAAC;qBACH;oBAED,IAAI,YAAY,IAAI,QAAQ,EAAE;wBAC5B,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;qBAClC;iBACF;qBAAM;oBACL,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;oBACvD,IAAI,UAAU,EAAE;wBACd,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;wBACpC,gBAAgB,GAAG,UAAU,CAAC,OAAO,CAAC;qBACvC;iBACF;aACF;iBAAM;gBACL,MAAM,IAAI,oBAAY,CAAC,mDAAmD,EAAE,GAAG,CAAC,CAAC;aAClF;YAED,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,oBAAY,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;aAC1D;YAED,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE,UAAU,CAAC,WAAuB,CAAC,EAAE;gBACvE,MAAM,IAAI,oBAAY,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;aAC7D;YAED,IACE,iBAAiB;gBACjB,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,0CAAE,cAAc,CAAA,IAAI,CAAC,IAAA,0BAAkB,EAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,EAC3F;gBACA,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,cAAc;wBACrB,iBAAiB,EACf,6FAA6F;wBAC/F,YAAY;qBACb,CAAC;iBACH,CAAC;aACH;YAED,IAAI,CAAC,KAAK,EAAE;gBACV,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,iBAAiB;wBACxB,iBAAiB,EAAE,0DAA0D;wBAC7E,YAAY;qBACb,CAAC;iBACH,CAAC;aACH;YAED,IAAI,aAAa,KAAK,MAAM,EAAE;gBAC5B,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,2BAA2B;wBAClC,iBAAiB,EAAE,4CAA4C;wBAC/D,YAAY;wBACZ,KAAK;qBACN,CAAC;iBACH,CAAC;aACH;YAED,oDAAoD;YACpD,IAAI,MAAM,CAAC;YACX,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,MAAM,gBAAgB,GAAG,aAAa,IAAI,UAAU,IAAI,UAAU,CAAC,WAAW,KAAK,SAAS,CAAC;YAC7F,MAAM,gBAAgB,GAAG,cAAc,IAAI,UAAU,IAAI,UAAU,CAAC,YAAY,KAAK,SAAS,CAAC;YAE/F,iBAAiB;YACjB,MAAM,SAAS,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YACzD,MAAM,UAAU,GAAG,wBAAgB,GAAG,SAAS,CAAC;YAChD,yDAAyD;YACzD,IAAI,OAAO,CAAC;YACZ,IAAI,aAAa,IAAI,UAAU,EAAE;gBAC/B,MAAM,EAAE,GAAG,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC;gBAEvC,IAAI,aAAa,IAAI,GAAG,EAAE;oBACxB,wBAAwB;oBACxB,MAAM,GAAG,GAAG,CAAC,WAAW,CAAC;iBAC1B;qBAAM,IAAI,SAAS,IAAI,GAAG,EAAE;oBAC3B,oBAAoB;oBACpB,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC;oBACrB,IAAI,GAAG,IAAI,CAAC;iBACb;qBAAM;oBACL,0IAA0I;oBAC1I,OAAO;wBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;4BAC/B,KAAK,EAAE,iBAAiB;4BACxB,iBAAiB,EAAE,qCAAqC;4BACxD,YAAY;4BACZ,KAAK;yBACN,CAAC;qBACH,CAAC;iBACH;gBAED,MAAM,IAAI,GAAG,MAAM,IAAA,4BAAqB,GAAE,CAAC;gBAE3C,IAAI;oBACF,OAAO,GAAG,gBAAI,CAAC,OAAO,CAAC;wBACrB,MAAM;wBACN,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,YAAa;wBACjC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ;wBACvD,UAAU,EAAE,IAAI,CAAC,UAAU;wBAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;wBACzB,UAAU,EAAE,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,UAAU;wBAClE,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;4BAC3C,CAAC,CAAC,UAAU,CAAC,gBAAgB;4BAC7B,CAAC,CAAC,wDAAwD;qBAC7D,CAAC,CAAC;iBACJ;gBAAC,OAAO,GAAY,EAAE;oBACrB,OAAO;wBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;4BAC/B,KAAK,EAAE,cAAc;4BACrB,iBAAiB,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC;4BACvC,YAAY;4BACZ,KAAK;yBACN,CAAC;qBACH,CAAC;iBACH;aACF;YAED,8GAA8G;YAC9G,IAAI,gBAAoC,CAAC;YACzC,IAAI,SAA6B,CAAC;YAClC,IAAI,gBAAgB,IAAI,cAAc,IAAI,UAAU,EAAE;gBACpD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBACvB,OAAO;wBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;4BAC/B,KAAK,EAAE,cAAc;4BACrB,iBAAiB,EAAE,oDAAoD;4BACvE,YAAY;4BACZ,KAAK;yBACN,CAAC;qBACH,CAAC;iBACH;gBACD,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,UAAU,CAAC,YAAY,CAAC;gBACnF,IAAI;oBACF,MAAM,UAAU,GAAG,MAAM,IAAA,gCAAkB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;oBACpE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC;wBACvC,SAAS,EAAE,QAAkB;wBAC7B,aAAa,EAAE,YAAY;wBAC3B,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;wBAC3D,cAAc,EAAE,CAAC,MAAM,CAAC;qBACzB,CAAC,CAAC;oBACH,gBAAgB,GAAG,0BAAU,CAAC,YAAY,EAAE,CAAC;oBAC7C,MAAM,cAAc,GAAG,0BAAU,CAAC,aAAa,CAAC,gBAAgB,CAAC,CAAC;oBAClE,SAAS,GAAG,0BAAU,CAAC,KAAK,EAAE,CAAC;oBAC/B,MAAM,GAAG,UAAU,CAAC,gBAAgB,CAAC;wBACnC,KAAK,EAAE,CAAC,GAAG,eAAe,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC;6BACtD,MAAM,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,wBAAwB;6BACtF,IAAI,CAAC,GAAG,CAAC;wBACZ,cAAc;wBACd,qBAAqB,EAAE,MAAM;wBAC7B,KAAK,EAAE,UAAU;wBACjB,KAAK,EAAE,SAAS;qBACjB,CAAC,CAAC;iBACJ;gBAAC,OAAO,GAAY,EAAE;oBACrB,IAAI,GAAG,EAAE;wBACP,OAAO;4BACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;gCAC/B,KAAK,EAAE,cAAc;gCACrB,iBAAiB,EAAE,CAAC,GAAsB,aAAtB,GAAG,uBAAH,GAAG,CAAqB,KAAK,KAAI,IAAA,uBAAe,EAAC,GAAG,CAAC;gCACzE,YAAY;gCACZ,KAAK;6BACN,CAAC;yBACH,CAAC;qBACH;iBACF;aACF;YACD,mCAAmC;YACnC,IAAI;gBACF,MAAM,SAAS,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,YAAY,EAAiD,CAAC;gBACpG,IAAI,eAAe,EAAE;oBACnB,SAAS,CAAC,MAAM,GAAG,eAAe,CAAC;iBACpC;gBACD,IAAI,gBAAgB,EAAE;oBACpB,SAAS,CAAC,OAAO,GAAG,gBAAgB,CAAC;iBACtC;gBACD,IAAI,QAAQ,EAAE;oBACZ,SAAS,CAAC,QAAQ,GAAG,QAAQ,CAAC;iBAC/B;gBACD,IAAI,iBAAiB,EAAE;oBACrB,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC;oBACtB,IAAI,KAAK,EAAE;wBACT,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;qBACzB;iBACF;gBACD,IAAI,eAAe,EAAE;oBACnB,SAAS,CAAC,KAAK,GAAG,eAAe,CAAC;iBACnC;gBAED,MAAM,UAAU,GAAG;oBACjB,YAAY;oBACZ,aAAa;oBACb,KAAK;oBACL,cAAc;oBACd,qBAAqB;oBACrB,SAAS;iBACV,CAAC;gBACF,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CACzB,SAAS,EACT,gBAAgB;oBACd,CAAC,iCACM,UAAU,KACb,EAAE,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,EAAE,IAEnB,CAAC,iCAAM,UAAU,KAAE,EAAE,EAAE,UAAU,CAAC,QAAQ,EAAE,gBAAgB,EAAE,SAAS,GAAE,CAC5E,CAAC;gBACF,kBAAkB;gBAClB,IAAI,gBAAgB,EAAE;oBACpB,IAAI,WAAW,CAAC;oBAChB,IAAI,aAAa,CAAC;oBAElB,IAAI,CAAC,IAAI,EAAE;wBACT,wBAAwB;wBACxB,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE;4BACrC,UAAU,EAAE,UAAU;4BACtB,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,eAAe,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;yBACpF,CAAC,CAAC;qBACJ;yBAAM;wBACL,oBAAoB;wBACpB,aAAa,GAAG,gBAAI,CAAC,cAAc,CAAC,MAAM,EAAE;4BAC1C;gCACE,IAAI,EAAE,YAAY;gCAClB,KAAK,EAAE,UAAU;6BAClB;4BACD;gCACE,IAAI,EAAE,aAAa;gCACnB,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;6BACvD;yBACF,CAAC,CAAC;qBACJ;oBACD,OAAO;wBACL,YAAY,EAAE,WAAW;wBACzB,cAAc,EAAE,aAAa;qBAC9B,CAAC;iBACH;qBAAM,IAAI,gBAAgB,EAAE;oBAC3B,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC;iBACjC;qBAAM;oBACL,OAAO;wBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;4BAC/B,KAAK,EAAE,iBAAiB;4BACxB,iBAAiB,EAAE,wCAAwC;4BAC3D,YAAY;4BACZ,KAAK;yBACN,CAAC;qBACH,CAAC;iBACH;aACF;YAAC,OAAO,GAAY,EAAE;gBACrB,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,cAAc;wBACrB,iBAAiB,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC;wBACvC,YAAY;wBACZ,KAAK;qBACN,CAAC;iBACH,CAAC;aACH;;KACF;IAEY,YAAY,CACvB,IAAyB;;;YAEzB,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;YAEzD,MAAM,SAAS,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,wBAAgB,CAAC,CAAC;YAE3D,uCAAuC;YACvC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,SAAS,EAAE;gBACtC,6CAA6C;gBAC7C,MAAM,IAAI,oBAAY,CACpB,gGAAgG,EAChG,GAAG,CACJ,CAAC;aACH;YAED,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,wBAAgB,EAAE,EAAE,CAAC,CAAC;YAC3D,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YACnE,MAAM,MAAM,GAAG,gBAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;YAE7C,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,oBAAY,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;aAClD;YAED,MAAM,WAAW,GAAoB,MAAM,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC;gBACzE,IAAI,EAAE,kBAAU,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5C,MAAM,IAAI,oBAAY,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAC3D;YAED,MAAM,OAAO,GAAG,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAE1E,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,EAAE;gBAC1B,MAAM,IAAI,oBAAY,CAAC,mDAAmD,EAAE,GAAG,CAAC,CAAC;aAClF;YAED,MAAM,eAAe,GAAG,OAAO,IAAI,eAAe,IAAI,OAAO,CAAC;YAC9D,MAAM,SAAS,GAAG,CAAC,SAAS,IAAI,CAAC,eAAe,CAAC;YAEjD,IAAI,UAAqC,CAAC;YAE1C,yBAAyB;YACzB,IAAI,SAAS,EAAE;gBACb,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC;oBACxD,QAAQ;oBACR,QAAQ,EAAE,eAAe;oBACzB,QAAQ,EAAE,MAAM;oBAChB,cAAc,EAAE;wBACd,YAAY;qBACb;iBACF,CAAC,CAAC;gBAEH,yCAAyC;gBACzC,IAAI,UAAU,IAAI,QAAQ,EAAE;oBAC1B,OAAO;wBACL,eAAe,EAAE,QAAQ,CAAC,QAAQ;qBACnC,CAAC;iBACH;gBAED,qBAAqB;gBACrB,IAAI,YAAY,IAAI,QAAQ,EAAE;oBAC5B,UAAU,GAAG,QAAQ,CAAC,UAA2B,CAAC;iBACnD;aACF;YAED,wBAAwB;YACxB,qDAAqD;YACrD,IAAI,SAAS,EAAE;gBACb,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;oBACpC,OAAO,CACL,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAC,SAAS,CAAC,SAAS;wBAC1C,CAAC,CAAC,CAAC,MAAM,KAAK,OAAO,CAAC,SAAS,CAAC,MAAM,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CACnF,CAAC;gBACJ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACP;YAED,IAAI,CAAC,UAAU,EAAE;gBACf,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;aAC7B;YAED,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,oBAAY,CAAC,4BAA4B,EAAE,GAAG,CAAC,CAAC;aAC3D;YAED,IACE,OAAO;gBACP,OAAO,CAAC,YAAY;gBACpB,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,UAAU,CAAC,WAAuB,CAAC,EAC3E;gBACA,MAAM,IAAI,oBAAY,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;aAC7D;YAED,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,4BAAqB,GAAE,CAAC;YAErD,MAAM,YAAY,GAAG;gBACnB,UAAU,EAAE,GAAG,UAAU,CAAC,WAAW,CAAC,UAAU,EAAE;gBAClD,QAAQ,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE;gBACrC,UAAU;aACX,CAAC;YAEF,IAAI,OAAO,IAAI,OAAO,CAAC,EAAE,EAAE;gBACzB,YAAY,CAAC,cAAc,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;aAC3C;YAED,MAAM,YAAY,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,UAAU,CAAC,kBAAkB,CAAC;YAExF,IAAI,OAAO,GAAuB,IAAI,CAAC;YAEvC,IAAI;gBACF,OAAO,GAAG,MAAM,IAAA,mCAA6B,EAAC,WAAW,EAAE,YAAY,CAAC,CAAC;aAC1E;YAAC,OAAO,GAAY,EAAE;gBACrB,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,eAAe;wBACtB,iBAAiB,EAAE,IAAA,uBAAe,EAAC,GAAG,CAAC;wBACvC,YAAY;wBACZ,KAAK,EAAE,MAAA,OAAO,CAAC,SAAS,0CAAE,KAAK;qBAChC,CAAC;iBACH,CAAC;aACH;YAED,uFAAuF;YACvF,IAAI,eAAe,EAAE;gBACnB,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;gBAEzF,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBAE1C,OAAO,EAAE,YAAY,EAAE,CAAC;aACzB;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;YAEzF,MAAM,MAAM,GAAG;gBACb,IAAI;aACL,CAAC;YAEF,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE;gBAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;aACjC;YAED,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAE1C,OAAO,EAAE,YAAY,EAAE,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC;;KACjE;IAEY,iBAAiB,CAAC,IAA8B;;YAC3D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC;YAE/D,IAAI,UAAU,GAAG,KAAK,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,IAAI,oBAAY,CAAC,yCAAyC,EAAE,GAAG,CAAC,CAAC;aACxE;YAED,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,wBAAgB,EAAE,EAAE,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YACxD,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,oBAAY,CAAC,qDAAqD,EAAE,GAAG,CAAC,CAAC;aACpF;YAED,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAElE,IAAI,OAAO,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,cAAc,CAAC,WAAW,CAAC,EAAE;gBAC/F,MAAM,IAAI,oBAAY,CAAC,8BAA8B,EAAE,GAAG,CAAC,CAAC;aAC7D;YACD,MAAM,YAAY,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,kBAAkB,CAAC;YAE5F,IAAI,KAAK,EAAE;gBACT,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK;wBACL,iBAAiB,EAAE,iBAAiB,aAAjB,iBAAiB,cAAjB,iBAAiB,GAAI,wCAAwC;wBAChF,YAAY;wBACZ,KAAK,EAAE,OAAO,CAAC,KAAK;qBACrB,CAAC;iBACH,CAAC;aACH;YAED,IAAI,CAAC,MAAM,EAAE;gBACX,OAAO;oBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;wBAC/B,KAAK,EAAE,cAAc;wBACrB,iBAAiB,EAAE,8DAA8D;wBACjF,YAAY;wBACZ,KAAK,EAAE,OAAO,CAAC,KAAK;qBACrB,CAAC;iBACH,CAAC;aACH;YAED,6BAA6B;YAC7B,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC,YAAY,CAAC;YACvF,IAAI,OAAO,CAAC;YACZ,IAAI;gBACF,MAAM,UAAU,GAAG,MAAM,IAAA,gCAAkB,EAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;gBACpE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC;oBACvC,SAAS,EAAE,QAAQ;oBACnB,aAAa,EAAE,YAAY;oBAC3B,aAAa,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;oBAC3D,cAAc,EAAE,CAAC,MAAM,CAAC;iBACzB,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,QAAQ,CACxC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAC1C;oBACE,IAAI,EAAE,MAAM;iBACb,EACD,EAAE,aAAa,EAAE,OAAO,CAAC,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,EAAE,CACtE,CAAC;gBACF,OAAO,GAAG,MAAM,IAAA,8BAAsB,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;aAC9D;YAAC,OAAO,GAAY,EAAE;gBACrB,IAAI,GAAG,EAAE;oBACP,OAAO;wBACL,YAAY,EAAE,IAAA,0BAAkB,EAAC;4BAC/B,KAAK,EAAE,cAAc;4BACrB,iBAAiB,EAAE,CAAC,GAAsB,aAAtB,GAAG,uBAAH,GAAG,CAAqB,KAAK,KAAI,IAAA,uBAAe,EAAC,GAAG,CAAC;4BACzE,YAAY;4BACZ,KAAK,EAAE,OAAO,CAAC,KAAK;yBACrB,CAAC;qBACH,CAAC;iBACH;aACF;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAEzF,MAAM,MAAM,GAAG;gBACb,IAAI;aACL,CAAC;YAEF,IAAI,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE;gBAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC;aACjC;YAED,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YAE3D,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAE3C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,CAAC;QACvC,CAAC;KAAA;IAED,+CAA+C;IACjC,uBAAuB,CACnC,UAAyC,EACzC,OAAY,EACZ,OAAY,EACZ,SAAkB;;YAElB,+BAA+B;YAC/B,MAAM,IAAI,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAEpD,MAAM,OAAO,GAAG;gBACd,OAAO;gBACP,QAAQ,EAAE,UAAU,CAAC,QAAQ;gBAC7B,YAAY,EAAE,UAAU,CAAC,YAAY;gBACrC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI;gBAC7C,SAAS;aACV,CAAC;YAEF,IAAI,OAAO,EAAE;gBACX,OAAO,CAAC,SAAS,CAAC,GAAG,OAAO,CAAC;aAC9B;YAED,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;YAExC,OAAO,IAAI,CAAC;QACd,CAAC;KAAA;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA0DG;IACU,KAAK,CAAC,IAAmB;;;YACpC,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,oBAAoB,EAAE,YAAY,EAAE,GAAG,IAAI,CAAC;YACvE,MAAM,SAAS,GAAG,WAAW,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YACnE,MAAM,aAAa,GAAG,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/E,MAAM,aAAa,GAAG,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;YAE/E,OAAO,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;YAEhC,IAAI,UAAU,KAAK,oBAAoB,EAAE;gBACvC,MAAM,IAAI,oBAAY,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;aACvD;YAED,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,IAAI,oBAAY,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;aACpD;YAED,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC/C,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBAChC,MAAM,IAAI,oBAAY,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;aAC7C;YAED,IAAI,MAAA,OAAO,CAAC,SAAS,0CAAE,YAAY,EAAE;gBACnC,IAAI,YAAY,KAAK,OAAO,CAAC,SAAS,CAAC,YAAY,EAAE;oBACnD,MAAM,IAAI,oBAAY,CACpB,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,uBAAuB,EAAE,EACtF,GAAG,CACJ,CAAC;iBACH;aACF;YAED,IAAI,aAAa,EAAE;gBACjB,YAAY;gBACZ,IAAI,EAAE,GAAG,aAAa,CAAC;gBACvB,IAAI,CAAA,MAAA,OAAO,CAAC,OAAO,CAAC,qBAAqB,0CAAE,WAAW,EAAE,MAAK,MAAM,EAAE;oBACnE,EAAE,GAAG,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;iBACzC;gBAED,IAAI,OAAO,CAAC,OAAO,CAAC,cAAc,KAAK,EAAE,EAAE;oBACzC,MAAM,IAAI,oBAAY,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;iBACtD;aACF;iBAAM,IAAI,SAAS,IAAI,aAAa,EAAE;gBACrC,wCAAwC;gBACxC,IAAI,SAAS,KAAK,OAAO,EAAE;oBACzB,MAAM,EAAE,GAAG,IAAA,+BAAuB,EAAC,SAAS,CAAC,CAAC;oBAC9C,IAAI,CAAC,EAAE,EAAE;wBACP,aAAa;wBACb,IAAI,SAAS,KAAK,OAAO,CAAC,QAAQ,IAAI,aAAa,KAAK,OAAO,CAAC,YAAY,EAAE;4BAC5E,MAAM,IAAI,oBAAY,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;yBACnE;qBACF;yBAAM;wBACL,IACE,CAAC,OAAO,CAAC,SAAS;4BAClB,CAAC,EAAE,CAAC,MAAM,MAAK,MAAA,OAAO,CAAC,SAAS,0CAAE,MAAM,CAAA,IAAI,EAAE,CAAC,OAAO,MAAK,MAAA,OAAO,CAAC,SAAS,0CAAE,OAAO,CAAA,CAAC,EACtF;4BACA,MAAM,IAAI,oBAAY,CAAC,2BAA2B,EAAE,GAAG,CAAC,CAAC;yBAC1D;wBACD,0CAA0C;wBAC1C,IAAI,aAAa,KAAK,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE;4BACpD,MAAM,IAAI,oBAAY,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;yBACtD;qBACF;iBACF;qBAAM;oBACL,IAAI,aAAa,KAAK,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,aAAa,KAAK,OAAO,CAAC,YAAY,EAAE;wBAC9F,MAAM,IAAI,oBAAY,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;qBACtD;iBACF;aACF;iBAAM,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE;gBACrC,MAAM,IAAI,oBAAY,CAAC,+CAA+C,EAAE,GAAG,CAAC,CAAC;aAC9E;YAED,gCAAgC;YAChC,MAAM,KAAK,GAAG,gBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAErD,MAAM,QAAQ,mCACT,OAAO,CAAC,OAAO,KAClB,SAAS,EAAE,OAAO,CAAC,SAAS,GAC7B,CAAC;YACF,MAAM,iBAAiB,GAAG,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,IAAI,CAAA,CAAC;YACpD,MAAM,eAAe,GAAG,CAAC,CAAC,CAAA,MAAA,OAAO,CAAC,SAAS,0CAAE,KAAK,CAAA,CAAC;YACnD,IAAI,iBAAiB,EAAE;gBACrB,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,MAAM,mCAAI,EAAE,CAAC;gBAC1D,IAAI,CAAC,cAAc,IAAI,CAAC,IAAA,0BAAkB,EAAC,cAAc,CAAC,EAAE;oBAC1D,MAAM,IAAI,oBAAY,CAAC,iCAAiC,EAAE,GAAG,CAAC,CAAC;iBAChE;gBACD,IAAI,MAAM,GAA2B,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC/F,MAAM,mCACD,MAAM,KACT,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAC7B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EACnC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAC3C,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,EACzC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,EACnC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,GACtC,CAAC;gBACF,MAAM,UAAU,GAAG,MAAM,IAAA,yBAAiB,EAAC,cAAc,CAAC,OAAO,EAAE,MAAO,CAAC,CAAC;gBAC5E,MAAM,QAAQ,GAAG,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC;qBAC5C,kBAAkB,CAAC,EAAE,GAAG,EAAE,MAAO,EAAE,CAAC;qBACpC,WAAW,EAAE;qBACb,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;qBACvC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;qBACrC,WAAW,CAAC,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC;qBACzC,iBAAiB,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,6GAA6G;qBACvJ,IAAI,CAAC,UAAU,CAAC,CAAC;gBACpB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBAC7B,QAAQ,CAAC,MAAM,CAAC,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;aACjD;YAED,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YAE3C,kBAAkB;YAClB,IAAI;gBACF,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;aACnC;YAAC,OAAO,IAAI,EAAE;gBACb,eAAe;aAChB;YAED,MAAM,aAAa,GAAkB;gBACnC,YAAY,EAAE,KAAK;gBACnB,UAAU,EAAE,QAAQ;gBACpB,UAAU,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAI;aAC9B,CAAC;YAEF,IAAI,iBAAiB,EAAE;gBACrB,aAAa,CAAC,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;aAC5C;YAED,OAAO,aAAa,CAAC;;KACtB;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA8CG;IACU,QAAQ,CAAC,KAAa;;YACjC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAE7C,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YAEnC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;gBACvB,MAAM,IAAI,oBAAY,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;aAC9C;YAED,uCACK,GAAG,CAAC,MAAM,KACb,SAAS,EAAE,GAAG,CAAC,SAAS,IACxB;QACJ,CAAC;KAAA;CACF;AA/2BD,0CA+2BC"}
|
@@ -94,14 +94,15 @@ class SAMLHandler {
|
|
94
94
|
value: entityId,
|
95
95
|
});
|
96
96
|
}
|
97
|
+
const noSSOConnectionErrMessage = authFlow === 'oauth' ? 'No SSO connection found.' : 'No SAML connection found.';
|
97
98
|
if (!connections || connections.length === 0) {
|
98
|
-
throw new error_1.JacksonError(
|
99
|
+
throw new error_1.JacksonError(noSSOConnectionErrMessage, 404);
|
99
100
|
}
|
100
101
|
// If an IdP is specified, find the connection for that IdP
|
101
102
|
if (idp_hint) {
|
102
103
|
const connection = connections.find((c) => c.clientID === idp_hint);
|
103
104
|
if (!connection) {
|
104
|
-
throw new error_1.JacksonError(
|
105
|
+
throw new error_1.JacksonError(noSSOConnectionErrMessage, 404);
|
105
106
|
}
|
106
107
|
return { connection };
|
107
108
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"saml-handler.js","sourceRoot":"","sources":["../../src/controller/saml-handler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAAkC;AAClC,oDAA4B;AAC5B,+BAAiC;AACjC,+BAAkC;AAIlC,uCAAqD;AACrD,qDAAuC;AACvC,mCAAuC;AACvC,mCAAqC;AACrC,mCAA2C;AAC3C,qCAAiD;AAEjD,MAAM,eAAe,GAAG,IAAA,gBAAS,EAAC,iBAAU,CAAC,CAAC;AAE9C,MAAa,WAAW;IAKtB,YAAY,EACV,UAAU,EACV,OAAO,EACP,IAAI,GAKL;
|
1
|
+
{"version":3,"file":"saml-handler.js","sourceRoot":"","sources":["../../src/controller/saml-handler.ts"],"names":[],"mappings":"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"}
|
@@ -1,6 +1,6 @@
|
|
1
1
|
import * as jose from 'jose';
|
2
2
|
import { Client, TokenSet } from 'openid-client';
|
3
|
-
import type { ConnectionType, OAuthErrorHandlerParams,
|
3
|
+
import type { ConnectionType, OAuthErrorHandlerParams, SAMLSSOConnectionWithEncodedMetadata, SAMLSSOConnectionWithRawMetadata, OIDCSSOConnectionWithDiscoveryUrl, OIDCSSOConnectionWithMetadata, Profile, SAMLSSORecord } from '../typings';
|
4
4
|
export declare enum IndexNames {
|
5
5
|
EntityID = "entityID",
|
6
6
|
SetupToken = "token",
|
@@ -34,7 +34,7 @@ export declare function isJWSKeyPairLoaded(jwsKeyPair: {
|
|
34
34
|
export declare const importJWTPublicKey: (key: string, jwsAlg: string) => Promise<jose.KeyLike>;
|
35
35
|
export declare const exportPublicKeyJWK: (key: jose.KeyLike) => Promise<jose.JWK>;
|
36
36
|
export declare const generateJwkThumbprint: (jwk: jose.JWK) => Promise<string>;
|
37
|
-
export declare const validateSSOConnection: (body: SAMLSSOConnectionWithRawMetadata | SAMLSSOConnectionWithEncodedMetadata |
|
37
|
+
export declare const validateSSOConnection: (body: SAMLSSOConnectionWithRawMetadata | SAMLSSOConnectionWithEncodedMetadata | OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata, strategy: ConnectionType) => void;
|
38
38
|
export declare const validateRedirectUrl: ({ redirectUrlList, defaultRedirectUrl }: {
|
39
39
|
redirectUrlList: any;
|
40
40
|
defaultRedirectUrl: any;
|
package/dist/controller/utils.js
CHANGED
@@ -130,6 +130,7 @@ const validateSSOConnection = (body, strategy) => {
|
|
130
130
|
const encodedRawMetadata = 'encodedRawMetadata' in body ? body.encodedRawMetadata : undefined;
|
131
131
|
const rawMetadata = 'rawMetadata' in body ? body.rawMetadata : undefined;
|
132
132
|
const oidcDiscoveryUrl = 'oidcDiscoveryUrl' in body ? body.oidcDiscoveryUrl : undefined;
|
133
|
+
const oidcMetadata = 'oidcMetadata' in body ? body.oidcMetadata : undefined;
|
133
134
|
const oidcClientId = 'oidcClientId' in body ? body.oidcClientId : undefined;
|
134
135
|
const oidcClientSecret = 'oidcClientSecret' in body ? body.oidcClientSecret : undefined;
|
135
136
|
const metadataUrl = 'metadataUrl' in body ? body.metadataUrl : undefined;
|
@@ -148,8 +149,26 @@ const validateSSOConnection = (body, strategy) => {
|
|
148
149
|
if (!oidcClientSecret) {
|
149
150
|
throw new error_1.JacksonError('Please provide the clientSecret from OpenID Provider', 400);
|
150
151
|
}
|
151
|
-
if (!oidcDiscoveryUrl) {
|
152
|
-
throw new error_1.JacksonError('Please provide the discoveryUrl for the OpenID Provider', 400);
|
152
|
+
if (!oidcDiscoveryUrl && !oidcMetadata) {
|
153
|
+
throw new error_1.JacksonError('Please provide the discoveryUrl or issuer metadata for the OpenID Provider', 400);
|
154
|
+
}
|
155
|
+
if (!oidcDiscoveryUrl && oidcMetadata) {
|
156
|
+
const { issuer, authorization_endpoint, token_endpoint, userinfo_endpoint, jwks_uri } = oidcMetadata;
|
157
|
+
if (!issuer) {
|
158
|
+
throw new error_1.JacksonError('"issuer" missing in the metadata for the OpenID Provider', 400);
|
159
|
+
}
|
160
|
+
if (!authorization_endpoint) {
|
161
|
+
throw new error_1.JacksonError('"authorization_endpoint" missing in the metadata for the OpenID Provider', 400);
|
162
|
+
}
|
163
|
+
if (!token_endpoint) {
|
164
|
+
throw new error_1.JacksonError('"token_endpoint" missing in the metadata for the OpenID Provider', 400);
|
165
|
+
}
|
166
|
+
if (!userinfo_endpoint) {
|
167
|
+
throw new error_1.JacksonError('"userinfo_endpoint" missing in the metadata for the OpenID Provider', 400);
|
168
|
+
}
|
169
|
+
if (!jwks_uri) {
|
170
|
+
throw new error_1.JacksonError('"jwks_uri" missing in the metadata for the OpenID Provider', 400);
|
171
|
+
}
|
153
172
|
}
|
154
173
|
}
|
155
174
|
if (!defaultRedirectUrl) {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/controller/utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oDAA4B;AAC5B,2CAA6B;AAG7B,qDAAuC;
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/controller/utils.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js
CHANGED
@@ -123,7 +123,7 @@ const controllers = (opts) => __awaiter(void 0, void 0, void 0, function* () {
|
|
123
123
|
if (preLoadedConnection && preLoadedConnection.length > 0) {
|
124
124
|
const connections = yield (0, loadConnection_1.default)(preLoadedConnection);
|
125
125
|
for (const connection of connections) {
|
126
|
-
if ('oidcDiscoveryUrl' in connection) {
|
126
|
+
if ('oidcDiscoveryUrl' in connection || 'oidcMetadata' in connection) {
|
127
127
|
yield connectionAPIController.createOIDCConnection(connection);
|
128
128
|
}
|
129
129
|
else {
|
package/dist/index.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAAyB;AACzB,+DAAuC;AACvC,sEAA8C;AAC9C,qDAA8D;AAC9D,8CAAqD;AACrD,0CAA2D;AAC3D,8CAAqD;AACrD,4DAAkE;AAClE,gDAAuD;AACvD,sEAAiD;AACjD,gEAAsE;AACtE,sDAAsD;AACtD,wDAA8D;AAC9D,sDAA6D;AAC7D,kDAAoC;AACpC,yEAAwF;AACxF,4EAAoD;AAEpD,MAAM,WAAW,GAAG,CAAC,IAAmB,EAAiB,EAAE;IACzD,MAAM,OAAO,qBACR,IAAI,CACR,CAAC;IAEF,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE;QACxB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;QACrB,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;KACzC;IAED,OAAO,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,gBAAgB,CAAC;IAExD,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,yBAAyB,CAAC;IACzE,oMAAoM;IACpM,OAAO,CAAC,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,IAAI,EAAE,CAAC;IAChE,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,8BAA8B;IAEvF,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,KAAK,IAAI,CAAC;IACjD,IAAA,mBAAS,EAAC,OAAO,CAAC,CAAC;IAEnB,OAAO,CAAC,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,IAAI,OAAO,CAAC;IACvE,OAAO,CAAC,EAAE,CAAC,SAAS,GAAG,OAAO,CAAC,EAAE,CAAC,SAAS,IAAI,EAAE,CAAC;IAElD,OAAO,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;IACtC,OAAO,CAAC,MAAM,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,IAAI,OAAO,CAAC;IAEzD,OAAO,CAAC,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,SAAS,CAAC;IAEjE,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,CACzB,IAAmB,EAclB,EAAE;IACH,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IAEzB,IAAA,cAAW,GAAE,CAAC;IAEd,MAAM,EAAE,GAAG,MAAM,YAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEjC,MAAM,eAAe,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IAC5D,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACtD,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACnD,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAEvD,MAAM,uBAAuB,GAAG,IAAI,6BAAuB,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IACvF,MAAM,eAAe,GAAG,IAAI,uBAAe,CAAC,EAAE,eAAe,EAAE,CAAC,CAAC;IACjE,MAAM,qBAAqB,GAAG,IAAI,oCAAqB,CAAC,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAC9E,MAAM,qBAAqB,CAAC,IAAI,EAAE,CAAC;IACnC,MAAM,mBAAmB,GAAG,IAAI,gCAAmB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAExE,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;QACrB,OAAO,CAAC,IAAI,CACV,gIAAgI,CACjI,CAAC;QACF,MAAM,cAAc,GAAG,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACrD,MAAM,mBAAmB,GAAG,IAAI,+BAAmB,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;QACxE,MAAM,mBAAmB,CAAC,IAAI,EAAE,CAAC;KAClC;IAED,kDAAkD;IAClD,MAAM,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAExC,MAAM,eAAe,GAAG,IAAI,uBAAe,CAAC;QAC1C,eAAe;QACf,YAAY;QACZ,SAAS;QACT,UAAU;QACV,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,IAAI,yBAAgB,CAAC;QAC5C,eAAe;QACf,YAAY;QACZ,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,uBAAuB,GAAG,IAAI,wCAAuB,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAI,wBAAY,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,uBAAuB,GAAG,MAAM,IAAA,wBAAiB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACtE,MAAM,uBAAuB,GAAG,MAAM,IAAA,wBAAiB,EAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAEtE,0CAA0C;IAC1C,MAAM,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,IAAI,IAAI,CAAC,eAAe,CAAC;IAC7E,IAAI,mBAAmB,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QACzD,MAAM,WAAW,GAAG,MAAM,IAAA,wBAAc,EAAC,mBAAmB,CAAC,CAAC;QAE9D,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE;YACpC,IAAI,kBAAkB,IAAI,UAAU,EAAE;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/loadConnection.d.ts
CHANGED
@@ -1,3 +1,4 @@
|
|
1
|
-
import {
|
2
|
-
|
1
|
+
import { OIDCSSOConnectionWithDiscoveryUrl, OIDCSSOConnectionWithMetadata, SAMLSSOConnectionWithEncodedMetadata, SAMLSSOConnectionWithRawMetadata } from './typings';
|
2
|
+
type connection = SAMLSSOConnectionWithEncodedMetadata | SAMLSSOConnectionWithRawMetadata | OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata;
|
3
|
+
declare const loadConnection: (preLoadedConnection: string) => Promise<connection[]>;
|
3
4
|
export default loadConnection;
|
package/dist/loadConnection.js
CHANGED
@@ -51,7 +51,7 @@ const loadConnection = (preLoadedConnection) => __awaiter(void 0, void 0, void 0
|
|
51
51
|
const filePath = path.join(preLoadedConnection, file);
|
52
52
|
const fileUrl = preLoadedConnection.startsWith('/') ? filePath : url.pathToFileURL(filePath).toString();
|
53
53
|
const { default: connection, } = yield (_a = fileUrl, Promise.resolve().then(() => __importStar(require(_a))));
|
54
|
-
if (!('oidcDiscoveryUrl' in connection)) {
|
54
|
+
if (!('oidcDiscoveryUrl' in connection) && !('oidcMetadata' in connection)) {
|
55
55
|
const rawMetadata = yield fs.promises.readFile(path.join(preLoadedConnection, path.parse(file).name + '.xml'), 'utf8');
|
56
56
|
connection.encodedRawMetadata = Buffer.from(rawMetadata, 'utf8').toString('base64');
|
57
57
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"loadConnection.js","sourceRoot":"","sources":["../src/loadConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,yCAA2B;
|
1
|
+
{"version":3,"file":"loadConnection.js","sourceRoot":"","sources":["../src/loadConnection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,uCAAyB;AACzB,2CAA6B;AAC7B,yCAA2B;AAc3B,MAAM,cAAc,GAAG,CAAO,mBAA2B,EAAyB,EAAE;;IAClF,IAAI,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACxC,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,mBAAmB,CAAC,CAAC;KACxE;SAAM;QACL,mBAAmB,GAAG,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;KACzD;IAED,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC7D,MAAM,WAAW,GAAiB,EAAE,CAAC;IAErC,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;QACvB,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YACxG,MAAM,EACJ,OAAO,EAAE,UAAU,GACpB,GAEG,YAAuC,OAAO,0DAAC,CAAC;YACpD,IAAI,CAAC,CAAC,kBAAkB,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,cAAc,IAAI,UAAU,CAAC,EAAE;gBAC1E,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAC5C,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,MAAM,CAAC,EAC9D,MAAM,CACP,CAAC;gBACF,UAAU,CAAC,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;aACrF;YAED,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC9B;KACF;IAED,OAAO,WAAW,CAAC;AACrB,CAAC,CAAA,CAAC;AAEF,kBAAe,cAAc,CAAC"}
|
package/dist/typings.d.ts
CHANGED
@@ -1,4 +1,5 @@
|
|
1
|
-
import {
|
1
|
+
import type { JWK } from 'jose';
|
2
|
+
import type { IssuerMetadata } from 'openid-client';
|
2
3
|
export * from './ee/federated-saml/types';
|
3
4
|
export * from './directory-sync/types';
|
4
5
|
interface SSOConnection {
|
@@ -23,11 +24,18 @@ export interface SAMLSSOConnectionWithEncodedMetadata extends SAMLSSOConnection
|
|
23
24
|
encodedRawMetadata: string;
|
24
25
|
metadataUrl?: string;
|
25
26
|
}
|
26
|
-
|
27
|
-
oidcDiscoveryUrl: string;
|
27
|
+
interface OIDCSSOConnection extends SSOConnection {
|
28
28
|
oidcClientId: string;
|
29
29
|
oidcClientSecret: string;
|
30
30
|
}
|
31
|
+
export interface OIDCSSOConnectionWithMetadata extends OIDCSSOConnection {
|
32
|
+
oidcDiscoveryUrl?: never;
|
33
|
+
oidcMetadata: IssuerMetadata;
|
34
|
+
}
|
35
|
+
export interface OIDCSSOConnectionWithDiscoveryUrl extends OIDCSSOConnection {
|
36
|
+
oidcDiscoveryUrl: string;
|
37
|
+
oidcMetadata?: never;
|
38
|
+
}
|
31
39
|
export interface SAMLSSORecord extends SAMLSSOConnection {
|
32
40
|
clientID: string;
|
33
41
|
clientSecret: string;
|
@@ -55,6 +63,7 @@ export interface OIDCSSORecord extends SSOConnection {
|
|
55
63
|
oidcProvider: {
|
56
64
|
provider?: string;
|
57
65
|
discoveryUrl?: string;
|
66
|
+
metadata?: IssuerMetadata;
|
58
67
|
clientId?: string;
|
59
68
|
clientSecret?: string;
|
60
69
|
};
|
@@ -89,7 +98,7 @@ export interface IConnectionAPIController {
|
|
89
98
|
*/
|
90
99
|
config(body: SAMLSSOConnection): Promise<SAMLSSORecord>;
|
91
100
|
createSAMLConnection(body: SAMLSSOConnectionWithRawMetadata | SAMLSSOConnectionWithEncodedMetadata): Promise<SAMLSSORecord>;
|
92
|
-
createOIDCConnection(body:
|
101
|
+
createOIDCConnection(body: OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata): Promise<OIDCSSORecord>;
|
93
102
|
/**
|
94
103
|
* @deprecated Use `updateSAMLConnection` instead.
|
95
104
|
*/
|
@@ -101,7 +110,7 @@ export interface IConnectionAPIController {
|
|
101
110
|
clientID: string;
|
102
111
|
clientSecret: string;
|
103
112
|
}): Promise<void>;
|
104
|
-
updateOIDCConnection(body:
|
113
|
+
updateOIDCConnection(body: (OIDCSSOConnectionWithDiscoveryUrl | OIDCSSOConnectionWithMetadata) & {
|
105
114
|
clientID: string;
|
106
115
|
clientSecret: string;
|
107
116
|
}): Promise<void>;
|
@@ -314,6 +323,10 @@ export interface JacksonOption {
|
|
314
323
|
adminToken?: string;
|
315
324
|
};
|
316
325
|
noAnalytics?: boolean;
|
326
|
+
terminus?: {
|
327
|
+
host?: string;
|
328
|
+
adminToken?: string;
|
329
|
+
};
|
317
330
|
}
|
318
331
|
export interface SLORequestParams {
|
319
332
|
nameId: string;
|
package/dist/typings.js.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"typings.js","sourceRoot":"","sources":["../src/typings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;
|
1
|
+
{"version":3,"file":"typings.js","sourceRoot":"","sources":["../src/typings.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAGA,4DAA0C;AAC1C,yDAAuC"}
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@boxyhq/saml-jackson",
|
3
|
-
"version": "1.
|
3
|
+
"version": "1.9.0",
|
4
4
|
"description": "SAML Jackson library",
|
5
5
|
"keywords": [
|
6
6
|
"SAML 2.0"
|
@@ -42,18 +42,18 @@
|
|
42
42
|
"dependencies": {
|
43
43
|
"@boxyhq/saml20": "1.1.3",
|
44
44
|
"@opentelemetry/api": "1.4.0",
|
45
|
-
"@aws-sdk/credential-providers": "3.
|
46
|
-
"axios": "1.3.
|
45
|
+
"@aws-sdk/credential-providers": "3.279.0",
|
46
|
+
"axios": "1.3.4",
|
47
47
|
"jose": "4.12.0",
|
48
48
|
"marked": "4.2.12",
|
49
49
|
"mixpanel": "0.17.0",
|
50
|
-
"mongodb": "5.0
|
50
|
+
"mongodb": "5.1.0",
|
51
51
|
"mssql": "9.1.1",
|
52
52
|
"mysql2": "3.1.2",
|
53
53
|
"node-forge": "1.3.1",
|
54
54
|
"openid-client": "5.4.0",
|
55
55
|
"pg": "8.9.0",
|
56
|
-
"redis": "4.6.
|
56
|
+
"redis": "4.6.5",
|
57
57
|
"reflect-metadata": "0.1.13",
|
58
58
|
"ripemd160": "2.0.2",
|
59
59
|
"typeorm": "0.3.12",
|
@@ -62,7 +62,7 @@
|
|
62
62
|
},
|
63
63
|
"devDependencies": {
|
64
64
|
"@faker-js/faker": "7.6.0",
|
65
|
-
"@types/node": "18.14.
|
65
|
+
"@types/node": "18.14.2",
|
66
66
|
"@types/sinon": "10.0.13",
|
67
67
|
"@types/tap": "15.0.8",
|
68
68
|
"cross-env": "7.0.3",
|
@@ -73,6 +73,6 @@
|
|
73
73
|
"typescript": "4.9.5"
|
74
74
|
},
|
75
75
|
"engines": {
|
76
|
-
"node": ">=
|
76
|
+
"node": ">=16"
|
77
77
|
}
|
78
78
|
}
|