@hmcts/rpx-xui-node-lib 2.26.13 → 3.0.0-rc1
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/CHANGELOG.md +17 -0
- package/dist/auth/index.js +6 -2
- package/dist/auth/index.js.map +1 -1
- package/dist/auth/models/authOptions.interface.d.ts +1 -1
- package/dist/auth/models/authOptions.interface.d.ts.map +1 -1
- package/dist/auth/models/index.js +1 -0
- package/dist/auth/models/index.js.map +1 -1
- package/dist/auth/models/strategy.class.d.ts +1 -1
- package/dist/auth/models/strategy.class.d.ts.map +1 -1
- package/dist/auth/models/strategy.class.js +13 -10
- package/dist/auth/models/strategy.class.js.map +1 -1
- package/dist/auth/oauth2/index.js +6 -2
- package/dist/auth/oauth2/index.js.map +1 -1
- package/dist/auth/oauth2/models/XUIOAuth2Strategy.class.d.ts +1 -1
- package/dist/auth/oauth2/models/XUIOAuth2Strategy.class.d.ts.map +1 -1
- package/dist/auth/oauth2/models/XUIOAuth2Strategy.class.js +3 -2
- package/dist/auth/oauth2/models/XUIOAuth2Strategy.class.js.map +1 -1
- package/dist/auth/oauth2/models/index.js +1 -0
- package/dist/auth/oauth2/models/index.js.map +1 -1
- package/dist/auth/oauth2/models/oauth2.class.d.ts.map +1 -1
- package/dist/auth/oauth2/models/oauth2.class.js +2 -2
- package/dist/auth/oauth2/models/oauth2.class.js.map +1 -1
- package/dist/auth/oidc/index.js +6 -2
- package/dist/auth/oidc/index.js.map +1 -1
- package/dist/auth/oidc/models/OpenIDMetadata.interface.d.ts +1 -1
- package/dist/auth/oidc/models/OpenIDMetadata.interface.d.ts.map +1 -1
- package/dist/auth/oidc/models/index.js +1 -0
- package/dist/auth/oidc/models/index.js.map +1 -1
- package/dist/auth/oidc/models/openid.class.d.ts.map +1 -1
- package/dist/auth/oidc/models/openid.class.js +1 -3
- package/dist/auth/oidc/models/openid.class.js.map +1 -1
- package/dist/auth/s2s/index.js +1 -0
- package/dist/auth/s2s/index.js.map +1 -1
- package/dist/auth/s2s/s2s.class.d.ts.map +1 -1
- package/dist/auth/s2s/s2s.class.js +3 -3
- package/dist/auth/s2s/s2s.class.js.map +1 -1
- package/dist/common/http/index.js +6 -2
- package/dist/common/http/index.js.map +1 -1
- package/dist/common/index.js +6 -2
- package/dist/common/index.js.map +1 -1
- package/dist/common/models/index.js +1 -0
- package/dist/common/models/index.js.map +1 -1
- package/dist/common/models/xuiNode.class.d.ts.map +1 -1
- package/dist/common/models/xuiNode.class.js +11 -7
- package/dist/common/models/xuiNode.class.js.map +1 -1
- package/dist/common/util/arrayPatternMatch.js +3 -2
- package/dist/common/util/arrayPatternMatch.js.map +1 -1
- package/dist/common/util/debug.logger.js +3 -2
- package/dist/common/util/debug.logger.js.map +1 -1
- package/dist/common/util/hasKey.d.ts +1 -1
- package/dist/common/util/hasKey.d.ts.map +1 -1
- package/dist/common/util/hasKey.js.map +1 -1
- package/dist/common/util/index.js +1 -0
- package/dist/common/util/index.js.map +1 -1
- package/dist/common/util/sortArray.js +2 -1
- package/dist/common/util/sortArray.js.map +1 -1
- package/dist/common/util/stringPatternMatch.js +2 -1
- package/dist/common/util/stringPatternMatch.js.map +1 -1
- package/dist/common/util/userTimeout.js +12 -8
- package/dist/common/util/userTimeout.js.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/session/index.js +6 -2
- package/dist/session/index.js.map +1 -1
- package/dist/session/models/fileSessionStore.class.d.ts.map +1 -1
- package/dist/session/models/fileSessionStore.class.js +2 -2
- package/dist/session/models/fileSessionStore.class.js.map +1 -1
- package/dist/session/models/index.js +1 -0
- package/dist/session/models/index.js.map +1 -1
- package/dist/session/models/redisSessionStore.class.d.ts.map +1 -1
- package/dist/session/models/redisSessionStore.class.js +2 -2
- package/dist/session/models/redisSessionStore.class.js.map +1 -1
- package/dist/session/models/sessionStore.class.d.ts.map +1 -1
- package/dist/session/models/sessionStore.class.js +8 -4
- package/dist/session/models/sessionStore.class.js.map +1 -1
- package/package.json +17 -15
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,20 @@
|
|
|
1
|
+
# [2.27.0](https://github.com/hmcts/rpx-xui-node-lib/compare/v2.26.13...v2.27.0) (2023-06-19)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* **strategy.class.ts:** error handling ([#204](https://github.com/hmcts/rpx-xui-node-lib/issues/204)) ([a6ff50d](https://github.com/hmcts/rpx-xui-node-lib/commit/a6ff50d5d0980f81bbdab7b39607e5e185c8f4bd))
|
|
7
|
+
* added engine version to package.json ([#201](https://github.com/hmcts/rpx-xui-node-lib/issues/201)) ([1658a2b](https://github.com/hmcts/rpx-xui-node-lib/commit/1658a2b25314dc0407c8951d304604c0663ac5bf))
|
|
8
|
+
* change for sonar ([#202](https://github.com/hmcts/rpx-xui-node-lib/issues/202)) ([1482d9c](https://github.com/hmcts/rpx-xui-node-lib/commit/1482d9ceb8fb00e045b2ba22a25e8cc9a7092833))
|
|
9
|
+
* removed unused variable ([#199](https://github.com/hmcts/rpx-xui-node-lib/issues/199)) ([e4930ae](https://github.com/hmcts/rpx-xui-node-lib/commit/e4930ae37d2abef24c41c06691559119dcae4658))
|
|
10
|
+
* sonar fix ([#203](https://github.com/hmcts/rpx-xui-node-lib/issues/203)) ([4407649](https://github.com/hmcts/rpx-xui-node-lib/commit/44076498e4d452dbd1ec99a5deffb47ba610bf9d))
|
|
11
|
+
* updated nvmrc ([#200](https://github.com/hmcts/rpx-xui-node-lib/issues/200)) ([c8ee89d](https://github.com/hmcts/rpx-xui-node-lib/commit/c8ee89d04e33669a6564c4f80ec9ff611e1b4e5f))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
### Features
|
|
15
|
+
|
|
16
|
+
* eUI-7844 Update packages ([#196](https://github.com/hmcts/rpx-xui-node-lib/issues/196)) ([b420253](https://github.com/hmcts/rpx-xui-node-lib/commit/b4202532126c2e7179df42f207413a6033cafc74))
|
|
17
|
+
|
|
1
18
|
## [2.26.13](https://github.com/hmcts/rpx-xui-node-lib/compare/v2.26.12...v2.26.13) (2023-03-08)
|
|
2
19
|
|
|
3
20
|
|
package/dist/auth/index.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./oidc"), exports);
|
package/dist/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAsB;AACtB,2CAAwB;AACxB,wCAAqB;AACrB,mDAAgC;AAChC,2CAAwB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authOptions.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/authOptions.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"authOptions.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/authOptions.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,eAAe,CAAA;CACpC;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CAChB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Strategy = void 0;
|
|
3
4
|
var strategy_class_1 = require("./strategy.class");
|
|
4
5
|
Object.defineProperty(exports, "Strategy", { enumerable: true, get: function () { return strategy_class_1.Strategy; } });
|
|
5
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/models/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/models/index.ts"],"names":[],"mappings":";;;AAAA,mDAA2C;AAAlC,0GAAA,QAAQ,OAAA"}
|
|
@@ -54,7 +54,7 @@ export declare abstract class Strategy extends events.EventEmitter {
|
|
|
54
54
|
* Get session URL
|
|
55
55
|
* @return {string}
|
|
56
56
|
*/
|
|
57
|
-
urlFromToken: (url: string, token: any) => string;
|
|
57
|
+
urlFromToken: (url: string | undefined, token: any) => string;
|
|
58
58
|
/**
|
|
59
59
|
* Get authorization from ClientID and secret
|
|
60
60
|
* @return {string}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.class.d.ts","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":";AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AAIjF,OAAO,EAA2B,SAAS,EAAa,MAAM,cAAc,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAA;AAMrD,8BAAsB,QAAS,SAAQ,MAAM,CAAC,YAAY;IACtD,SAAgB,YAAY,EAAE,MAAM,CAAA;IAEpC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IAEjC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;IAEpC,SAAS,CAAC,OAAO,EAAE,WAAW,CAkB7B;IAED,SAAS,aAAa,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAE,SAAsC;IAOnG,eAAe,CAAC,OAAO,EAAE,GAAG,GAAG,OAAO;IAiCtC,kBAAkB,YAAmB,GAAG,KAAG,
|
|
1
|
+
{"version":3,"file":"strategy.class.d.ts","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
|
|
|
14
18
|
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
19
|
if (mod && mod.__esModule) return mod;
|
|
16
20
|
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
22
|
__setModuleDefault(result, mod);
|
|
19
23
|
return result;
|
|
20
24
|
};
|
|
@@ -42,7 +46,7 @@ const URL = __importStar(require("url"));
|
|
|
42
46
|
const openid_client_1 = require("openid-client");
|
|
43
47
|
const csurf_1 = __importDefault(require("csurf"));
|
|
44
48
|
class Strategy extends events.EventEmitter {
|
|
45
|
-
constructor(strategyName, router, logger = common_1.getLogger('auth:strategy')) {
|
|
49
|
+
constructor(strategyName, router, logger = (0, common_1.getLogger)('auth:strategy')) {
|
|
46
50
|
super();
|
|
47
51
|
this.options = {
|
|
48
52
|
authorizationURL: '',
|
|
@@ -101,7 +105,6 @@ class Strategy extends events.EventEmitter {
|
|
|
101
105
|
this.logger.log('calling passport authenticate');
|
|
102
106
|
/* istanbul ignore next */
|
|
103
107
|
return passport_1.default.authenticate(this.strategyName, {
|
|
104
|
-
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
105
108
|
redirect_uri: (_a = req.session) === null || _a === void 0 ? void 0 : _a.callbackURL,
|
|
106
109
|
state,
|
|
107
110
|
}, (error, user, info) => {
|
|
@@ -122,8 +125,9 @@ class Strategy extends events.EventEmitter {
|
|
|
122
125
|
/* istanbul ignore next */
|
|
123
126
|
}
|
|
124
127
|
catch (error) {
|
|
125
|
-
this.logger.error(error);
|
|
126
|
-
|
|
128
|
+
this.logger.error(error, this.strategyName);
|
|
129
|
+
next(error);
|
|
130
|
+
return Promise.reject(error);
|
|
127
131
|
}
|
|
128
132
|
});
|
|
129
133
|
this.setCallbackURL = (req, _res, next) => {
|
|
@@ -234,7 +238,6 @@ class Strategy extends events.EventEmitter {
|
|
|
234
238
|
this.emit(auth_constants_1.AUTH.EVENT.AUTHENTICATE_FAILURE, req, res, next);
|
|
235
239
|
};
|
|
236
240
|
passport_1.default.authenticate(this.strategyName, {
|
|
237
|
-
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
238
241
|
redirect_uri: (_a = req.session) === null || _a === void 0 ? void 0 : _a.callbackURL,
|
|
239
242
|
}, (error, user, info) => {
|
|
240
243
|
const errorMessages = [];
|
|
@@ -271,7 +274,7 @@ class Strategy extends events.EventEmitter {
|
|
|
271
274
|
};
|
|
272
275
|
/* istanbul ignore next */
|
|
273
276
|
this.isTokenExpired = (token) => {
|
|
274
|
-
const jwtData = jwt_decode_1.default(token);
|
|
277
|
+
const jwtData = (0, jwt_decode_1.default)(token);
|
|
275
278
|
return this.jwTokenExpired(jwtData);
|
|
276
279
|
};
|
|
277
280
|
/* istanbul ignore next */
|
|
@@ -337,7 +340,7 @@ class Strategy extends events.EventEmitter {
|
|
|
337
340
|
if (err) {
|
|
338
341
|
return next(err);
|
|
339
342
|
}
|
|
340
|
-
if (this.options.allowRolesRegex && !common_1.arrayPatternMatch(roles, this.options.allowRolesRegex)) {
|
|
343
|
+
if (this.options.allowRolesRegex && !(0, common_1.arrayPatternMatch)(roles, this.options.allowRolesRegex)) {
|
|
341
344
|
this.logger.error(`User has no application access, as they do not have a ${this.options.allowRolesRegex} role.`);
|
|
342
345
|
return this.logout(req, res);
|
|
343
346
|
}
|
|
@@ -366,7 +369,7 @@ class Strategy extends events.EventEmitter {
|
|
|
366
369
|
this.initialiseCSRF = () => {
|
|
367
370
|
if (this.options.useCSRF) {
|
|
368
371
|
this.logger.log('initialising CSRF middleware');
|
|
369
|
-
const csrfProtection = csurf_1.default({
|
|
372
|
+
const csrfProtection = (0, csurf_1.default)({
|
|
370
373
|
value: this.getCSRFValue,
|
|
371
374
|
});
|
|
372
375
|
/* istanbul ignore next */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAAgC;AAEhC,wDAA+B;AAC/B,sDAAwC;AACxC,4DAAkC;AAClC,yCAA4E;AAE5E,oDAA2B;AAC3B,yCAA0B;AAC1B,iDAA0C;AAC1C,kDAAwB;AAExB,MAAsB,QAAS,SAAQ,MAAM,CAAC,YAAY;IA2BtD,YAAsB,YAAoB,EAAE,MAAc,EAAE,SAAoB,kBAAS,CAAC,eAAe,CAAC;QACtG,KAAK,EAAE,CAAA;QArBD,YAAO,GAAgB;YAC7B,gBAAgB,EAAE,EAAE;YACpB,QAAQ,EAAE,EAAE;YACZ,QAAQ,EAAE,EAAE;YACZ,YAAY,EAAE,EAAE;YAChB,WAAW,EAAE,EAAE;YACf,KAAK,EAAE,EAAE;YACT,SAAS,EAAE,EAAE;YACb,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,EAAE;YACd,gBAAgB;YAChB,iBAAiB,EAAE,EAAE;YACrB,SAAS,EAAE,EAAE;YACb,aAAa,EAAE,CAAC,EAAE,CAAC;YACnB,uBAAuB,EAAE,EAAE;YAC3B,eAAe,EAAE,GAAG;YACpB,OAAO,EAAE,IAAI;YACb,eAAe,EAAE,SAAS;SAC7B,CAAA;QAyCD,0BAA0B;QACnB,uBAAkB,GAAG,CAAO,OAAY,EAAiB,EAAE;YAC9D,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QAC1B,CAAC,CAAA,CAAA;QAED;;;;;WAKG;QACH,0BAA0B;QACnB,iBAAY,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAA2B,EAAE;;YACrG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAExC,6GAA6G;YAC7G,MAAM,KAAK,GAAG,0BAAU,CAAC,KAAK,EAAE,CAAA;YAChC,0BAA0B;YAC1B,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;gBACpC,IAAI,GAAG,CAAC,OAAO,WAAI,IAAI,CAAC,OAAO,0CAAE,UAAU,CAAA,EAAE;oBACzC,GAAG,CAAC,OAAO,OAAC,IAAI,CAAC,OAAO,0CAAE,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,CAAA;oBACjD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;wBAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;wBAChD,OAAO,CAAC,IAAI,CAAC,CAAA;oBACjB,CAAC,CAAC,CAAA;iBACL;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,mCAAmC,CAAC,CAAA;oBACrD,OAAO,CAAC,KAAK,CAAC,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YAEF,IAAI;gBACA,0BAA0B;gBAC1B,MAAM,OAAO,CAAA;gBACb,0BAA0B;gBAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;gBAChD,0BAA0B;gBAC1B,OAAO,kBAAQ,CAAC,YAAY,CACxB,IAAI,CAAC,YAAY,EACjB;oBACI,wDAAwD;oBACxD,YAAY,QAAE,GAAG,CAAC,OAAO,0CAAE,WAAW;oBACtC,KAAK;iBACD,EACR,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;oBAClB,0BAA0B;oBAC1B,IAAI,KAAK,EAAE;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;qBACxD;oBACD,0BAA0B;oBAC1B,IAAI,IAAI,EAAE;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBACzB;oBACD,0BAA0B;oBAC1B,IAAI,CAAC,IAAI,EAAE;wBACP,MAAM,OAAO,GAAG,8EAA8E,CAAA;wBAC9F,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAC3B;gBACL,CAAC,CACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;gBACjB,0BAA0B;aAC7B;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACxB,MAAM,IAAI,KAAK,CAAC,GAAG,KAAK,EAAE,CAAC,CAAA;aAC9B;QACL,CAAC,CAAA,CAAA;QAEM,mBAAc,GAAG,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAQ,EAAE;YAC/E,0BAA0B;YAC1B,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE;gBACzC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,CAAA;gBAChC,GAAG,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC;oBACjC,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC;oBACrB,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,WAAW;iBACrC,CAAC,CAAA;aACL;YACD,0BAA0B;YAC1B,IAAI,EAAE,CAAA;QACV,CAAC,CAAA;QAEM,WAAM,GAAG,CAAO,GAAY,EAAE,GAAa,EAAiB,EAAE;;YACjE,IAAI;gBACA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;gBAC/B,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,SAAG,GAAG,CAAC,OAAO,0CAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAA;gBAEzE,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAEpF,MAAM,aAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,WAAW,CAAC,EAAE;oBACtE,OAAO,EAAE;wBACL,aAAa,EAAE,IAAI;qBACtB;iBACJ,CAAC,CAAA;gBACF,MAAM,aAAI,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,YAAY,CAAC,EAAE;oBACvE,OAAO,EAAE;wBACL,aAAa,EAAE,IAAI;qBACtB;iBACJ,CAAC,CAAA;gBAEF,iDAAiD;gBACjD,GAAG,CAAC,MAAM,EAAE,CAAA;gBACZ,MAAM,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;gBAC9B,0BAA0B;gBAC1B,IAAI,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,CAAC,CAAA;oBAC9D,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;iBAC3B;gBAED,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAI,CAAC,KAAK,CAAC,KAAK,CAAA;gBAC3E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;gBAC/C,6BAA6B;gBAC7B,GAAG,CAAC,QAAQ,CAAC,QAAkB,CAAC,CAAA;gBAEhC,0BAA0B;aAC7B;YAAC,OAAO,CAAC,EAAE;gBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAA;gBACjC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,qBAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;aACxD;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;QACjC,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,qBAAgB,GAAG,CAAC,GAAY,EAAE,GAAa,EAAY,EAAE;YAChE,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC,CAAA;QAC1C,CAAC,CAAA;QACD,0BAA0B;QACnB,mBAAc,GAAG,CAAO,GAAY,EAAgB,EAAE;YACzD,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;gBACnC,MAAA,GAAG,CAAC,OAAO,0CAAE,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;oBACzB,IAAI,GAAG,EAAE;wBACL,MAAM,CAAC,GAAG,CAAC,CAAA;qBACd;oBACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;oBACpC,OAAO,CAAC,IAAI,CAAC,CAAA;gBACjB,CAAC,EAAC;YACN,CAAC,CAAC,CAAA;QACN,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,qBAAgB,GAAG,CAAC,IAAa,EAAE,IAAc,EAAE,IAAkB,EAAQ,EAAE;YAClF,IAAI,EAAE,CAAA;QACV,CAAC,CAAA;QAEM,cAAS,GAAG,CAAC,OAAoB,EAAkB,EAAE;YACxD,MAAM,iBAAiB,mCAAQ,IAAI,CAAC,OAAO,GAAK,OAAO,CAAE,CAAA;YACzD,IAAI,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAA;YACvC,IAAI,CAAC,OAAO,GAAG,iBAAiB,CAAA;YAEhC,IAAI,CAAC,aAAa,EAAE,CAAA;YACpB,IAAI,CAAC,eAAe,EAAE,CACrB;YAAA,CAAC,GAAS,EAAE;gBACT,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAC/C,CAAC,CAAA,CAAC,EAAE,CAAA;YAEJ,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACzB,IAAI,CAAC,iBAAiB,EAAE,CAAA;YACxB,IAAI,CAAC,mBAAmB,EAAE,CAAA;YAC1B,IAAI,CAAC,cAAc,EAAE,CAAA;YAErB,IAAI,OAAO,CAAC,SAAS,EAAE;gBACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAI,CAAC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBACrE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAI,CAAC,KAAK,CAAC,eAAe,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAClE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAI,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,YAAY,CAAC,CAAA;gBACzE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,CAAC,eAAe,CAAC,CAAA;gBAChE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,qBAAI,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;aAClD;YACD,IAAI,CAAC,UAAU,EAAE,CAAA;YACjB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,YAAY,oBAAoB,CAAC,CAAA;YACnD,OAAO,IAAI,CAAC,MAAM,CAAA;QACtB,CAAC,CAAA;QACD,0BAA0B;QACnB,oBAAe,GAAG,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAQ,EAAE;;YAC/E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;YACzC,MAAM,mBAAmB,GAAG,sCAAsC,CAAA;YAElE,MAAM,yBAAyB,GAAG,CAAC,WAAqB,EAAQ,EAAE;gBAC9D,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;gBAEnD,IAAI,CAAC,WAAW,CAAC,MAAM;oBAAE,OAAM;gBAE/B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yCAAyC,WAAW,EAAE,CAAC,CAAA;gBAEvE,GAAG,CAAC,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBAC3C,IAAI,CAAC,IAAI,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YAC9D,CAAC,CAAA;YAED,kBAAQ,CAAC,YAAY,CACjB,IAAI,CAAC,YAAY,EACjB;gBACI,wDAAwD;gBACxD,YAAY,QAAE,GAAG,CAAC,OAAO,0CAAE,WAAW;aAClC,EACR,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;gBAClB,MAAM,aAAa,GAAa,EAAE,CAAA;gBAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;gBAE/C,IAAI,KAAK,EAAE;oBACP,QAAQ,KAAK,CAAC,IAAI,EAAE;wBAChB,KAAK,cAAc;4BACf,MAAM,mBAAmB,GAAG,GAAG,KAAK,CAAC,IAAI,sBAAsB,KAAK,CAAC,GAAG,QAAQ,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,IAAI,CAAA;4BACvH,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;4BACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;4BACxB,MAAK;wBAET;4BACI,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;4BACzB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;4BACxB,MAAK;qBACZ;iBACJ;gBAED,IAAI,IAAI,EAAE;oBACN,IAAI,IAAI,CAAC,OAAO,KAAK,mBAAmB,EAAE;wBACtC,aAAa,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;qBAC1C;oBAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;iBACzB;gBAED,IAAI,CAAC,IAAI,EAAE;oBACP,MAAM,OAAO,GAAG,8EAA8E,CAAA;oBAC9F,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;oBAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAExB,yBAAyB,CAAC,aAAa,CAAC,CAAA;oBACxC,OAAO,GAAG,CAAC,QAAQ,CAAC,qBAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;iBACxC;gBAED,yBAAyB,CAAC,aAAa,CAAC,CAAA;gBACxC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;YAC1C,CAAC,CACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;QACrB,CAAC,CAAA;QACD,0BAA0B;QACnB,mBAAc,GAAG,CAAC,KAAa,EAAW,EAAE;YAC/C,MAAM,OAAO,GAAG,oBAAS,CAAM,KAAK,CAAC,CAAA;YACrC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;QACvC,CAAC,CAAA;QACD,0BAA0B;QACnB,iBAAY,GAAG,CAAC,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAQ,EAAE;YAC7E,IAAI,GAAG,CAAC,iBAAiB,EAAE,EAAE;gBACzB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;aACrC;YACD,IAAI,EAAE,CAAA;QACV,CAAC,CAAA;QAEM,sBAAiB,GAAG,CAAC,QAAa,EAAE,EAAE,CAAC,UAAU,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAA;QAC5F,0BAA0B;QACnB,eAAU,GAAG,CAAO,GAAY,EAAE,IAAc,EAAE,IAAkB,EAAiB,EAAE;;YAC1F,gBAAI,GAAG,CAAC,OAAO,0CAAE,QAAQ,0CAAE,IAAI,EAAE;gBAC7B,IAAI,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,EAAE;oBACtD,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;iBACrC;qBAAM;oBACH,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;oBAC3E,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;iBAC3E;aACJ;YACD,IAAI,EAAE,CAAA;QACV,CAAC,CAAA,CAAA;QAEM,4BAAuB,GAAG,CAAC,GAAW,EAAE,OAAoB,EAAuB,EAAE;YACxF,OAAO,OAAO,CAAC,eAAe,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,IAAI,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAA;QACpH,CAAC,CAAA;QAEM,uBAAkB,GAAG,CAAO,GAAY,EAAE,EAAE;YAC/C,IAAI,oBAAoB,CAAA;YACxB,MAAM,WAAW,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAA;YACvD,IAAI,WAAW,IAAI,WAAW,CAAC,YAAY,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE;gBAC3F,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;gBACpD,oBAAoB,GAAG,WAAW,CAAA;aACrC;iBAAM;gBACH,oBAAoB,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;gBACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAA;gBACjD,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,sBAAsB,EAAE,oBAAoB,CAAC,CAAA;aAC5D;YACD,IAAI,oBAAoB,IAAI,oBAAoB,CAAC,YAAY,EAAE;gBAC3D,GAAG,CAAC,OAAO,CAAC,aAAa,GAAG,UAAU,oBAAoB,CAAC,YAAY,EAAE,CAAA;aAC5E;QACL,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,kBAAa,GAAG,GAAmC,EAAE;YACxD,MAAM,GAAG,GAAG,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAChD,IAAI;gBACA,MAAM,WAAW,GAAG;oBAChB,OAAO,EAAE,EAAE,cAAc,EAAE,mCAAmC,EAAE;iBACnE,CAAA;gBAED,MAAM,IAAI,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;gBAC9C,MAAM,QAAQ,GAAG,MAAM,aAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;gBACxD,OAAO,QAAQ,CAAC,IAAI,CAAA;aACvB;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAA;aACxE;QACL,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,gBAAW,GAAG,CAAC,GAAY,EAAE,IAAS,EAAE,IAAkB,EAAE,GAAa,EAAQ,EAAE;YACtF,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;gBACpB,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAA;gBACjC,IAAI,GAAG,EAAE;oBACL,OAAO,IAAI,CAAC,GAAG,CAAC,CAAA;iBACnB;gBACD,IAAI,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,CAAC,0BAAiB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE;oBACzF,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,yDAAyD,IAAI,CAAC,OAAO,CAAC,eAAe,QAAQ,CAChG,CAAA;oBACD,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;iBAC/B;gBACD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;oBACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAmC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAA;oBACrF,GAAG,CAAC,QAAQ,CAAC,qBAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAA;iBAC5C;qBAAM;oBACH,GAAG,CAAC,SAAS,GAAG,KAAK,CAAA;oBACrB,IAAI,CAAC,IAAI,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;iBAC7D;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QAEM,uBAAkB,GAAG,GAAS,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;QAC1C,CAAC,CAAA;QAEM,sBAAiB,GAAG,GAAS,EAAE;YAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,kBAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;QACvC,CAAC,CAAA;QAEM,wBAAmB,GAAG,GAAS,EAAE;YACpC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;QAC1C,CAAC,CAAA;QAED;;WAEG;QACI,mBAAc,GAAG,GAAS,EAAE;YAC/B,IAAI,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACtB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;gBAE/C,MAAM,cAAc,GAAG,eAAI,CAAC;oBACxB,KAAK,EAAE,IAAI,CAAC,YAAY;iBAC3B,CAAC,CAAA;gBACF,0BAA0B;gBAC1B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;oBAC/C,GAAG,CAAC,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAA;oBACzC,IAAI,EAAE,CAAA;gBACV,CAAC,CAAC,CAAA;aACL;QACL,CAAC,CAAA;QAED;;;;WAIG;QACH,0BAA0B;QACnB,iBAAY,GAAG,CAAC,GAAY,EAAU,EAAE;YAC3C,OAAO,CACH,CAAC,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;gBAC5B,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;gBAC9B,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACzB,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC;gBACzB,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC3B,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC;gBAC3B,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,CAC5B,CAAA;QACL,CAAC,CAAA;QAEM,eAAU,GAAG,GAAS,EAAE;YAC3B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;QACpC,CAAC,CAAA;QACD,0BAA0B;QACnB,kBAAa,GAAG,GAAS,EAAE;YAC9B,kBAAQ,CAAC,aAAa,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,gBAAgB,CAAC,CAAA;gBACrD,IAAI,CAAC,oBAAoB,CAAC,qBAAI,CAAC,KAAK,CAAC,cAAc,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QACD,0BAA0B;QACnB,oBAAe,GAAG,GAAS,EAAE;YAChC,kBAAQ,CAAC,eAAe,CAAC,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE;gBAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,YAAY,kBAAkB,CAAC,CAAA;gBACvD,IAAI,CAAC,oBAAoB,CAAC,qBAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,EAAE,IAAI,CAAC,CAAA;YACpE,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QAEM,mBAAc,GAAG,CAAC,OAAY,EAAW,EAAE;YAC9C,MAAM,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC,OAAO,EAAE,CAAA;YACtD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;YAChC,OAAO,OAAO,GAAG,GAAG,CAAA;QACxB,CAAC,CAAA;QAED;;;WAGG;QACI,iBAAY,GAAG,CAAC,GAAW,EAAE,KAAU,EAAU,EAAE;YACtD,OAAO,GAAG,GAAG,YAAY,KAAK,EAAE,CAAA;QACpC,CAAC,CAAA;QAED;;;WAGG;QACI,qBAAgB,GAAG,CAAC,QAAgB,EAAE,YAAoB,EAAE,QAAQ,GAAG,QAAQ,EAAU,EAAE;YAC9F,OAAO,SAAS,MAAM,CAAC,IAAI,CAAC,GAAG,QAAQ,IAAI,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAA;QACnF,CAAC,CAAA;QAED;;;WAGG;QACI,cAAS,GAAG,GAAa,EAAE;YAC9B,OAAO,MAAM,CAAC,MAAM,CAAS,qBAAI,CAAC,KAAK,CAAC,CAAA;QAC5C,CAAC,CAAA;QAED;;WAEG;QACI,yBAAoB,GAAG,CAC1B,SAAiB,EACjB,WAAoB,EACpB,IAAsC,EAClC,EAAE;YACN,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,EAAE;gBAChC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAA;aAC1B;iBAAM;gBACH,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAA;aAC1C;QACL,CAAC,CAAA;QAEM,mBAAc,GAAG,CAAC,OAAoB,EAAU,EAAE;;YACrD,IAAI,OAAO,CAAC,eAAe,EAAE;gBACzB,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAA;gBACjD,MAAM,YAAY,GAAG,kBAAkB,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;gBACzE,MAAM,KAAK,SAAG,OAAO,CAAC,eAAe,0CAAE,KAAK,CAAA;gBAC5C,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAA;gBACzC,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAA;gBACnC,OAAO,gCAAgC,YAAY,aAAa,QAAQ,UAAU,KAAK,cAAc,UAAU,kBAAkB,YAAY,EAAE,CAAA;aAClJ;YACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;QAC7D,CAAC,CAAA;QAEM,sBAAiB,GAAG,CAAC,OAAoB,EAAU,EAAE;YACxD,IAAI,OAAO,CAAC,eAAe,EAAE;gBACzB,OAAO,GAAG,OAAO,CAAC,SAAS,UAAU,CAAA;aACxC;YACD,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;QACzD,CAAC,CAAA;QAheG,IAAI,CAAC,YAAY,GAAG,YAAY,CAAA;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;IAEM,eAAe,CAAC,OAAY;QAC/B,MAAM,MAAM,GAAG,aAAG,CAAC,MAAM,CAAC;YACtB,gBAAgB,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACzC,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACjC,QAAQ,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACjC,YAAY,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACrC,WAAW,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YACpC,iBAAiB,EAAE,aAAG,CAAC,MAAM,EAAE;YAC/B,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE;YACvB,SAAS,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAClC,KAAK,EAAE,aAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;YAC9B,cAAc,EAAE,aAAG,CAAC,GAAG,EAAE;YACzB,UAAU,EAAE,aAAG,CAAC,GAAG,EAAE;YACrB,SAAS,EAAE,aAAG,CAAC,IAAI,EAAE;YACrB,eAAe,EAAE,aAAG,CAAC,GAAG,EAAE;YAC1B,aAAa,EAAE,aAAG,CAAC,KAAK,EAAE;YAC1B,uBAAuB,EAAE,aAAG,CAAC,MAAM,EAAE;YACrC,IAAI,EAAE,aAAG,CAAC,GAAG,EAAE;YACf,KAAK,EAAE,aAAG,CAAC,GAAG,EAAE;YAChB,KAAK,EAAE,aAAG,CAAC,GAAG,EAAE;YAChB,KAAK,EAAE,aAAG,CAAC,GAAG,EAAE;YAChB,aAAa,EAAE,aAAG,CAAC,GAAG,EAAE;YACxB,eAAe,EAAE,aAAG,CAAC,MAAM,EAAE;YAC7B,OAAO,EAAE,aAAG,CAAC,IAAI,EAAE;YACnB,eAAe,EAAE,aAAG,CAAC,GAAG,EAAE;SAC7B,CAAC,CAAA;QACF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;QAC1C,IAAI,KAAK,EAAE;YACP,MAAM,KAAK,CAAA;SACd;QACD,OAAO,IAAI,CAAA;IACf,CAAC;CA6bJ;AA9fD,4BA8fC"}
|
|
1
|
+
{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./models"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/oauth2/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/oauth2/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,qDAAkC"}
|
|
@@ -4,7 +4,7 @@ import { AxiosResponse } from 'axios';
|
|
|
4
4
|
export declare class XUIOAuth2Strategy extends OAuth2Strategy {
|
|
5
5
|
private readonly options;
|
|
6
6
|
constructor(options: OAuth2Metadata, verify: OAuth2Strategy.VerifyFunction);
|
|
7
|
-
userProfile: (accessToken: string, done: (err?: Error | null
|
|
7
|
+
userProfile: (accessToken: string, done: (err?: Error | null, profile?: any) => void) => Promise<void>;
|
|
8
8
|
}
|
|
9
9
|
export declare const getUserDetails: (jwt: string, logoutUrl: string) => Promise<AxiosResponse>;
|
|
10
10
|
//# sourceMappingURL=XUIOAuth2Strategy.class.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XUIOAuth2Strategy.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/XUIOAuth2Strategy.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,cAAc,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAGrC,qBAAa,iBAAkB,SAAQ,cAAc;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,CAAC,cAAc;IAI1E,WAAW,gBAAuB,MAAM,
|
|
1
|
+
{"version":3,"file":"XUIOAuth2Strategy.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/XUIOAuth2Strategy.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,cAAc,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AAGrC,qBAAa,iBAAkB,SAAQ,cAAc;IACjD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;gBAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,cAAc,CAAC,cAAc;IAI1E,WAAW,gBAAuB,MAAM,eAAe,KAAK,GAAG,IAAI,YAAY,GAAG,KAAK,IAAI,KAAG,QAAQ,IAAI,CAAC,CAG1G;CACJ;AAED,eAAO,MAAM,cAAc,QAAS,MAAM,aAAa,MAAM,KAAG,QAAQ,aAAa,CAKpF,CAAA"}
|
|
@@ -20,17 +20,18 @@ class XUIOAuth2Strategy extends passport_oauth2_1.default {
|
|
|
20
20
|
constructor(options, verify) {
|
|
21
21
|
super(options, verify);
|
|
22
22
|
this.userProfile = (accessToken, done) => __awaiter(this, void 0, void 0, function* () {
|
|
23
|
-
const userDetails = yield exports.getUserDetails(accessToken, this.options.logoutUrl);
|
|
23
|
+
const userDetails = yield (0, exports.getUserDetails)(accessToken, this.options.logoutUrl);
|
|
24
24
|
done(null, userDetails.data);
|
|
25
25
|
});
|
|
26
26
|
this.options = options;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
exports.XUIOAuth2Strategy = XUIOAuth2Strategy;
|
|
30
|
-
|
|
30
|
+
const getUserDetails = (jwt, logoutUrl) => {
|
|
31
31
|
const options = {
|
|
32
32
|
headers: { Authorization: `Bearer ${jwt}` },
|
|
33
33
|
};
|
|
34
34
|
return common_1.http.get(`${logoutUrl}/details`, options);
|
|
35
35
|
};
|
|
36
|
+
exports.getUserDetails = getUserDetails;
|
|
36
37
|
//# sourceMappingURL=XUIOAuth2Strategy.class.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XUIOAuth2Strategy.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/XUIOAuth2Strategy.class.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;AAG5D,sEAA4C;AAE5C,4CAAsC;AAEtC,MAAa,iBAAkB,SAAQ,yBAAc;IAEjD,YAAY,OAAuB,EAAE,MAAqC;QACtE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAG1B,gBAAW,GAAG,CAAO,WAAmB,EAAE,IAAiD,EAAiB,EAAE;YAC1G,MAAM,WAAW,GAAG,MAAM,sBAAc,
|
|
1
|
+
{"version":3,"file":"XUIOAuth2Strategy.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/XUIOAuth2Strategy.class.ts"],"names":[],"mappings":";AAAA,4DAA4D;;;;;;;;;;;;;;;AAG5D,sEAA4C;AAE5C,4CAAsC;AAEtC,MAAa,iBAAkB,SAAQ,yBAAc;IAEjD,YAAY,OAAuB,EAAE,MAAqC;QACtE,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,CAAA;QAG1B,gBAAW,GAAG,CAAO,WAAmB,EAAE,IAAiD,EAAiB,EAAE;YAC1G,MAAM,WAAW,GAAG,MAAM,IAAA,sBAAc,EAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;YAC7E,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,CAAA;QAChC,CAAC,CAAA,CAAA;QALG,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IAC1B,CAAC;CAKJ;AAVD,8CAUC;AAEM,MAAM,cAAc,GAAG,CAAC,GAAW,EAAE,SAAiB,EAA0B,EAAE;IACrF,MAAM,OAAO,GAAG;QACZ,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,GAAG,EAAE,EAAE;KAC9C,CAAA;IACD,OAAO,aAAI,CAAC,GAAG,CAAC,GAAG,SAAS,UAAU,EAAE,OAAO,CAAC,CAAA;AACpD,CAAC,CAAA;AALY,QAAA,cAAc,kBAK1B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.XUIOAuth2Strategy = exports.oauth2 = void 0;
|
|
3
4
|
var oauth2_class_1 = require("./oauth2.class");
|
|
4
5
|
Object.defineProperty(exports, "oauth2", { enumerable: true, get: function () { return oauth2_class_1.oauth2; } });
|
|
5
6
|
var XUIOAuth2Strategy_class_1 = require("./XUIOAuth2Strategy.class");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/index.ts"],"names":[],"mappings":";;;AAAA,+CAAuC;AAA9B,sGAAA,MAAM,OAAA;AAEf,qEAA6D;AAApD,4HAAA,iBAAiB,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAa,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEtD,qBAAa,MAAO,SAAQ,QAAQ;gBACpB,MAAM,6CAAgC,EAAE,MAAM,GAAE,SAAoC;IAIhG;;;;OAIG;IACI,eAAe,gBAAiB,WAAW,KAAG,cAAc,CAUlE;IAEM,kBAAkB,gBAAuB,WAAW,KAAG,
|
|
1
|
+
{"version":3,"file":"oauth2.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAA;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAa,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEtD,qBAAa,MAAO,SAAQ,QAAQ;gBACpB,MAAM,6CAAgC,EAAE,MAAM,GAAE,SAAoC;IAIhG;;;;OAIG;IACI,eAAe,gBAAiB,WAAW,KAAG,cAAc,CAUlE;IAEM,kBAAkB,gBAAuB,WAAW,KAAG,QAAQ,IAAI,CAAC,CAI1E;IAEM,MAAM,gBACI,MAAM,gBACL,MAAM,WACX,GAAG,WACH,GAAG,QACN,cAAc,KACrB,IAAI,CAEN;CACJ;AAED,eAAO,MAAM,MAAM,QAAe,CAAA"}
|
|
@@ -20,7 +20,7 @@ const XUIOAuth2Strategy_class_1 = require("./XUIOAuth2Strategy.class");
|
|
|
20
20
|
const express_1 = require("express");
|
|
21
21
|
const common_1 = require("../../../common");
|
|
22
22
|
class OAuth2 extends models_1.Strategy {
|
|
23
|
-
constructor(router = express_1.Router({ mergeParams: true }), logger = common_1.getLogger('auth:oauth2')) {
|
|
23
|
+
constructor(router = (0, express_1.Router)({ mergeParams: true }), logger = (0, common_1.getLogger)('auth:oauth2')) {
|
|
24
24
|
super(oauth2_constants_1.OAUTH2.STRATEGY_NAME, router, logger);
|
|
25
25
|
/**
|
|
26
26
|
* Retrieve transformed AuthOptions
|
|
@@ -30,7 +30,7 @@ class OAuth2 extends models_1.Strategy {
|
|
|
30
30
|
this.getOAuthOptions = (authOptions) => {
|
|
31
31
|
const options = Object.assign(Object.assign({}, authOptions), {
|
|
32
32
|
logoutUrl: authOptions.logoutURL,
|
|
33
|
-
state: '1',
|
|
33
|
+
state: '1', // this is required to have oauth strategy chose the right sessionStore
|
|
34
34
|
});
|
|
35
35
|
delete options.logoutURL;
|
|
36
36
|
return options;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth2.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA+B;AAC/B,0DAA4C;AAE5C,yCAAuC;AACvC,uEAA6D;AAG7D,qCAAgC;AAChC,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAQ;IAChC,YAAY,MAAM,GAAG,gBAAM,
|
|
1
|
+
{"version":3,"file":"oauth2.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA+B;AAC/B,0DAA4C;AAE5C,yCAAuC;AACvC,uEAA6D;AAG7D,qCAAgC;AAChC,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAQ;IAChC,YAAY,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,SAAoB,IAAA,kBAAS,EAAC,aAAa,CAAC;QAC5F,KAAK,CAAC,yBAAM,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAG/C;;;;WAIG;QACI,oBAAe,GAAG,CAAC,WAAwB,EAAkB,EAAE;YAClE,MAAM,OAAO,mCACN,WAAW,GACX;gBACC,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,KAAK,EAAE,GAAG,EAAE,uEAAuE;aACtF,CACJ,CAAA;YACD,OAAO,OAAO,CAAC,SAAS,CAAA;YACxB,OAAO,OAAyB,CAAA;QACpC,CAAC,CAAA;QAEM,uBAAkB,GAAG,CAAO,WAAwB,EAAiB,EAAE;YAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACjD,kBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,2CAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAC5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;QAC7C,CAAC,CAAA,CAAA;QAEM,WAAM,GAAG,CACZ,WAAmB,EACnB,YAAoB,EACpB,OAAY,EACZ,OAAY,EACZ,IAAoB,EAChB,EAAE;YACN,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9E,CAAC,CAAA;IAjCD,CAAC;CAkCJ;AArCD,wBAqCC;AAEY,QAAA,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA"}
|
package/dist/auth/oidc/index.js
CHANGED
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./models"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/oidc/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/oidc/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAwB;AACxB,mDAAgC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenIDMetadata.interface.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/OpenIDMetadata.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"OpenIDMetadata.interface.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/OpenIDMetadata.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.oidc = void 0;
|
|
3
4
|
var openid_class_1 = require("./openid.class");
|
|
4
5
|
Object.defineProperty(exports, "oidc", { enumerable: true, get: function () { return openid_class_1.oidc; } });
|
|
5
6
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/index.ts"],"names":[],"mappings":";;;AAAA,+CAAqC;AAA5B,oGAAA,IAAI,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openid.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACjF,OAAO,EACH,MAAM,EAEN,MAAM,EAEN,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAGhB,WAAW,EACd,MAAM,eAAe,CAAA;AAGtB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAa,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEtD,qBAAa,MAAO,SAAQ,YAAY;IACpC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;IAC5C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;gBAGhC,MAAM,GAAE,MAAsC,EAC9C,MAAM,GAAE,SAAkC,EAC1C,OAAO,GAAE,WAAgB;IAM7B;;;OAGG;IAEI,sBAAsB,4BAA2B,IAAI,CAyB3D;IAEM,gBAAgB,gBAAiB,WAAW,KAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"openid.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACjF,OAAO,EACH,MAAM,EAEN,MAAM,EAEN,QAAQ,EACR,QAAQ,EACR,gBAAgB,EAGhB,WAAW,EACd,MAAM,eAAe,CAAA;AAGtB,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,OAAO,EAAE,QAAQ,IAAI,YAAY,EAAE,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAE1C,OAAO,EAAa,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAEtD,qBAAa,MAAO,SAAQ,YAAY;IACpC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,SAAS,CAAA;IAC5C,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAA;gBAGhC,MAAM,GAAE,MAAsC,EAC9C,MAAM,GAAE,SAAkC,EAC1C,OAAO,GAAE,WAAgB;IAM7B;;;OAGG;IAEI,sBAAsB,4BAA2B,IAAI,CAyB3D;IAEM,gBAAgB,gBAAiB,WAAW,KAAG,cAAc,CAanE;IAKM,gBAAgB,QAAe,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,QAAQ,IAAI,CAAC,CAqC/F;IAEM,QAAQ,QAAa,QAAQ,OAAO,MAAM,CAAC,CAAC,CAUlD;IAEM,kBAAkB,gBAAuB,WAAW,KAAG,QAAQ,IAAI,CAAC,CAI1E;IAEM,eAAe,aAAc,QAAQ,GAAG,SAAS,KAAG,GAAG,CAM7D;IAEM,MAAM,aACC,QAAQ,YACR,gBAAgB,cACd,GAAG,SAAS,GAAG,YAAY,GAAG,KAAK,IAAI,KACpD,IAAI,CAQN;IAEM,cAAc,QAAa,QAAQ,GAAG,CAAC,CAE7C;IAEM,SAAS,aAAc,GAAG,KAAG,OAAO,MAAM,CAAC,CAGjD;IAEM,WAAW,iBAAkB,MAAM,YAAY,SAAS,GAAG,EAAE,GAAG,CAAC,KAAG,IAAI,CAE9E;IAMM,iBAAiB,YAAmB,cAAc,KAAG,QAAQ,SAAS,GAAG,EAAE,GAAG,CAAC,CAAC,CAUtF;IAEM,cAAc,YAAa,cAAc,UAAU,MAAM,KAAG,SAAS,GAAG,EAAE,MAAM,CAAC,CAYvF;IAEM,mBAAmB,WAAY,OAAO,MAAM,CAAC,WAAW,cAAc,KAAG,MAAM,GAAG,SAAS,CAEjG;IAEM,SAAS,QAAO,MAAM,GAAG,SAAS,CAExC;IAED;;;;;OAKG;IAEI,YAAY,QAAe,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,QAAQ,cAAc,CAAC,CAwDrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}
|
|
@@ -22,7 +22,7 @@ const models_1 = require("../../models");
|
|
|
22
22
|
const messaging_constants_1 = require("../../messaging.constants");
|
|
23
23
|
const common_1 = require("../../../common");
|
|
24
24
|
class OpenID extends models_1.Strategy {
|
|
25
|
-
constructor(router = express_1.Router({ mergeParams: true }), logger = common_1.getLogger('auth:oidc'), options = {}) {
|
|
25
|
+
constructor(router = (0, express_1.Router)({ mergeParams: true }), logger = (0, common_1.getLogger)('auth:oidc'), options = {}) {
|
|
26
26
|
super(oidc_constants_1.OIDC.STRATEGY_NAME, router, logger);
|
|
27
27
|
/**
|
|
28
28
|
* Helper function to customise GOT defaults and hooks to provide debug information
|
|
@@ -52,7 +52,6 @@ class OpenID extends models_1.Strategy {
|
|
|
52
52
|
};
|
|
53
53
|
this.getOpenIDOptions = (authOptions) => {
|
|
54
54
|
return {
|
|
55
|
-
/* eslint-disable @typescript-eslint/camelcase */
|
|
56
55
|
client_id: authOptions.clientID,
|
|
57
56
|
client_secret: authOptions.clientSecret,
|
|
58
57
|
discovery_endpoint: authOptions.discoveryEndpoint,
|
|
@@ -202,7 +201,6 @@ class OpenID extends models_1.Strategy {
|
|
|
202
201
|
yield promise;
|
|
203
202
|
this.logger.log('calling passport authenticate');
|
|
204
203
|
return passport_1.default.authenticate(this.strategyName, {
|
|
205
|
-
// eslint-disable-next-line @typescript-eslint/camelcase
|
|
206
204
|
redirect_uri: (_d = req.session) === null || _d === void 0 ? void 0 : _d.callbackURL,
|
|
207
205
|
nonce,
|
|
208
206
|
state,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAiF;AACjF,iDAWsB;AACtB,wDAA+B;AAC/B,sDAAwC;AAExC,yDAA2C;AAC3C,yCAAuD;AAEvD,mEAAgF;AAChF,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAY;IAIpC,YACI,SAAiB,gBAAM,
|
|
1
|
+
{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAiF;AACjF,iDAWsB;AACtB,wDAA+B;AAC/B,sDAAwC;AAExC,yDAA2C;AAC3C,yCAAuD;AAEvD,mEAAgF;AAChF,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAY;IAIpC,YACI,SAAiB,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAC9C,SAAoB,IAAA,kBAAS,EAAC,WAAW,CAAC,EAC1C,UAAuB,EAAE;QAEzB,KAAK,CAAC,qBAAI,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAI7C;;;WAGG;QACH,0BAA0B;QACnB,2BAAsB,GAAG,CAAC,OAAoB,EAAQ,EAAE;YAC3D,MAAM,QAAQ,GAAG;gBACb,KAAK,EAAE,CAAC;gBACR,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE;oBACH,aAAa,EAAE;wBACX,CAAC,OAAY,EAAE,EAAE;4BACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAA;wBAC5E,CAAC;qBACJ;oBACD,aAAa,EAAE;wBACX,CAAC,QAAa,EAAE,EAAE;4BACd,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,mBAAmB,EACnB,QAAQ,CAAC,UAAU,EACnB,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,EAAE,EAChD,QAAQ,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,CACnC,CAAA;4BACD,OAAO,QAAQ,CAAA;wBACnB,CAAC;qBACJ;iBACJ;aACJ,CAAA;YACD,MAAM,WAAW,GAAG,gCAAK,QAAQ,GAAK,OAAO,CAAiB,CAAA;YAC9D,sBAAM,CAAC,sBAAsB,CAAC,WAAW,CAAC,CAAA;QAC9C,CAAC,CAAA;QAEM,qBAAgB,GAAG,CAAC,WAAwB,EAAkB,EAAE;YACnE,OAAO;gBACH,SAAS,EAAE,WAAW,CAAC,QAAQ;gBAC/B,aAAa,EAAE,WAAW,CAAC,YAAY;gBACvC,kBAAkB,EAAE,WAAW,CAAC,iBAAiB;gBACjD,UAAU,EAAE,WAAW,CAAC,SAAS;gBACjC,UAAU,EAAE,WAAW,CAAC,SAAS;gBACjC,cAAc,EAAE,WAAW,CAAC,aAA+B;gBAC3D,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,0BAA0B,EAAE,WAAW,CAAC,uBAA2C;gBACnF,SAAS,EAAE,WAAW,CAAC,SAAS;aACnC,CAAA;QACL,CAAC,CAAA;QAED,wCAAwC;QACxC,sFAAsF;QACtF,0BAA0B;QACnB,qBAAgB,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;;YAC/F,IAAI,CAAC,CAAA,MAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,QAAQ,0CAAE,IAAI,CAAA,EAAE;gBAC9B,OAAO,IAAI,EAAE,CAAA;aAChB;YAED,IAAI,GAAG,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE;gBAC3C,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAA;gBAC7C,MAAM,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAA;gBAE3D,IAAI,kBAAkB,EAAE;oBACpB,IAAI;wBACA,mFAAmF;wBACnF,IAAI,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,EAAE;4BACzC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;4BAEhC,MAAM,QAAQ,GAAyB,MAAM,CAAA,MAAA,IAAI,CAAC,SAAS,EAAE,0CAAE,OAAO,CAClE,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAClD,CAAA,CAAA;4BAED,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;4BAEnE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;gCACtD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAA;gCACjF,OAAO,IAAI,EAAE,CAAA;6BAChB;iCAAM;gCACH,GAAG,CAAC,SAAS,GAAG,IAAI,CAAA;gCACpB,IAAI,CAAC,IAAI,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;gCAC1D,OAAM;6BACT;yBACJ;qBACJ;oBAAC,OAAO,CAAC,EAAE;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAA;wBACzC,IAAI,CAAC,CAAC,CAAC,CAAA;qBACV;iBACJ;aACJ;YACD,IAAI,EAAE,CAAA;QACV,CAAC,CAAA,CAAA;QAEM,aAAQ,GAAG,GAAkC,EAAE;YAClD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC1E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAE1C,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAA;YAChC,QAAQ,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAA;YAExC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;YAErC,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAA;QACnC,CAAC,CAAA,CAAA;QAEM,uBAAkB,GAAG,CAAO,WAAwB,EAAiB,EAAE;YAC1E,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;YAClD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAA;YACtD,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QACjD,CAAC,CAAA,CAAA;QAEM,oBAAe,GAAG,CAAC,QAA8B,EAAO,EAAE;YAC7D,OAAO;gBACH,WAAW,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;gBACnC,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa;gBACrC,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ;aAC9B,CAAA;QACL,CAAC,CAAA;QAEM,WAAM,GAAG,CACZ,QAAkB,EAClB,QAA0B,EAC1B,IAAmD,EAC/C,EAAE;YACN,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAA,EAAE;gBAClB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAAoC,CAAC,CAAA;gBACtD,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,0DAAoC,EAAE,CAAC,CAAA;aAC9E;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,QAAQ,CAAC,CAAA;YAEhD,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC7E,CAAC,CAAA;QAEM,mBAAc,GAAG,GAAuB,EAAE;YAC7C,OAAO,MAAM,sBAAM,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAA;QACrE,CAAC,CAAA,CAAA;QAEM,cAAS,GAAG,CAAC,QAAa,EAAkB,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAA;YAC5B,OAAO,IAAI,sBAAM,CAAC,QAAQ,CAAC,CAAA;QAC/B,CAAC,CAAA;QAEM,gBAAW,GAAG,CAAC,YAAoB,EAAE,QAA4B,EAAQ,EAAE;YAC9E,kBAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,yEAAyE;QACzE,yEAAyE;QACzE,iFAAiF;QACjF,0BAA0B;QACnB,sBAAiB,GAAG,CAAO,OAAuB,EAA+B,EAAE;YACtF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;aAC3C;YACD,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;YAC5D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACd,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;aAC5C;YACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACpD,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,mBAAc,GAAG,CAAC,OAAuB,EAAE,MAAc,EAAyB,EAAE;YACvF,OAAO,IAAI,wBAAQ,CACf;gBACI,MAAM;gBACN,MAAM,EAAE;oBACJ,MAAM,EAAE,qBAAI,CAAC,MAAM;oBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;iBACvB;gBACD,UAAU,EAAE,OAAO,CAAC,UAAU;aACjC,EACD,IAAI,CAAC,MAAM,CACd,CAAA;QACL,CAAC,CAAA;QAEM,wBAAmB,GAAG,CAAC,MAAsB,EAAE,OAAuB,EAAsB,EAAE;YACjG,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;QACrC,CAAC,CAAA;QAEM,cAAS,GAAG,GAAuB,EAAE;YACxC,OAAO,IAAI,CAAC,MAAM,CAAA;QACtB,CAAC,CAAA;QAED;;;;;WAKG;QACH,0BAA0B;QACnB,iBAAY,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAA2B,EAAE;;YACrG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAExC,MAAM,KAAK,GAAG,0BAAU,CAAC,KAAK,EAAE,CAAA;YAChC,MAAM,KAAK,GAAG,0BAAU,CAAC,KAAK,EAAE,CAAA;YAEhC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;gBACpC,IAAI,GAAG,CAAC,OAAO,KAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU,CAAA,EAAE;oBACzC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;oBACvD,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;wBAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;wBACxD,OAAO,CAAC,IAAI,CAAC,CAAA;oBACjB,CAAC,CAAC,CAAA;iBACL;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAA;oBAC9D,OAAO,CAAC,KAAK,CAAC,CAAA;iBACjB;YACL,CAAC,CAAC,CAAA;YAEF,IAAI;gBACA,MAAM,OAAO,CAAA;gBAEb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;gBAEhD,OAAO,kBAAQ,CAAC,YAAY,CACxB,IAAI,CAAC,YAAY,EACjB;oBACI,YAAY,EAAE,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW;oBACtC,KAAK;oBACL,KAAK;iBACD,EACR,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;oBAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;oBAExC,IAAI,KAAK,EAAE;wBACP,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAA;qBACnE;oBACD,0BAA0B;oBAC1B,IAAI,IAAI,EAAE;wBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;qBACzB;oBACD,0BAA0B;oBAC1B,IAAI,IAAI,EAAE;wBACN,MAAM,OAAO,GAAG,6DAA6D,CAAA;wBAC7E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAC3B;oBACD,IAAI,CAAC,IAAI,EAAE;wBACP,MAAM,OAAO,GAAG,gEAAgE,CAAA;wBAChF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;qBAC3B;gBACL,CAAC,CACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;aACpB;YAAC,OAAO,KAAK,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;gBACnD,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAA;aACvD;QACL,CAAC,CAAA,CAAA;QAtPG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;CAsPJ;AAjQD,wBAiQC;AAEY,QAAA,IAAI,GAAG,IAAI,MAAM,EAAE,CAAA"}
|
package/dist/auth/s2s/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.S2S = exports.s2s = void 0;
|
|
3
4
|
var s2s_class_1 = require("./s2s.class");
|
|
4
5
|
Object.defineProperty(exports, "s2s", { enumerable: true, get: function () { return s2s_class_1.s2s; } });
|
|
5
6
|
var s2s_constants_1 = require("./s2s.constants");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/s2s/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/auth/s2s/index.ts"],"names":[],"mappings":";;;AACA,yCAAiC;AAAxB,gGAAA,GAAG,OAAA;AACZ,iDAAqC;AAA5B,oGAAA,GAAG,OAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s2s.class.d.ts","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAA;AAGjF,OAAO,EAAmB,SAAS,EAAE,MAAM,cAAc,CAAA;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,qBAAa,OAAQ,SAAQ,YAAY;IACrC,SAAS,CAAC,QAAQ,CAAC,MAAM,6CAAgC;IAEzD,SAAS,CAAC,SAAS,EAAE,SAAS,CAI7B;IAGD,SAAS,CAAC,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAK;IAEjD,SAAS,CAAC,MAAM,EAAE,SAAS,CAAA;gBAEf,MAAM,GAAE,SAAiC;IAKrD;;;;;;OAMG;IACI,SAAS,cAAe,SAAS;;sBAAwC,cAAc,CAQ7F;IAEM,UAAU,QAAe,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,
|
|
1
|
+
{"version":3,"file":"s2s.class.d.ts","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAU,MAAM,SAAS,CAAA;AAGjF,OAAO,EAAmB,SAAS,EAAE,MAAM,cAAc,CAAA;AAGzD,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,qBAAa,OAAQ,SAAQ,YAAY;IACrC,SAAS,CAAC,QAAQ,CAAC,MAAM,6CAAgC;IAEzD,SAAS,CAAC,SAAS,EAAE,SAAS,CAI7B;IAGD,SAAS,CAAC,KAAK,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,CAAK;IAEjD,SAAS,CAAC,MAAM,EAAE,SAAS,CAAA;gBAEf,MAAM,GAAE,SAAiC;IAKrD;;;;;;OAMG;IACI,SAAS,cAAe,SAAS;;sBAAwC,cAAc,CAQ7F;IAEM,UAAU,QAAe,OAAO,OAAO,QAAQ,QAAQ,YAAY,KAAG,QAAQ,IAAI,CAAC,CAqBzF;IAEM,aAAa,QAAO,OAAO,CAOjC;IAEM,QAAQ,QAAO,QAAQ,CAE7B;IAEM,iBAAiB,QAAO,IAAI,CAIlC;IAED,OAAO,CAAC,aAAa,CAYpB;IAED,OAAO,CAAC,YAAY,CAYnB;IAEM,qBAAqB,QAAa,QAAQ,MAAM,CAAC,CAQvD;IAED;;;OAGG;IACI,SAAS,QAAO,MAAM,EAAE,CAE9B;CACJ;AAED,eAAO,MAAM,GAAG,SAAgB,CAAA"}
|
|
@@ -20,9 +20,9 @@ const otplib_1 = require("otplib");
|
|
|
20
20
|
const common_1 = require("../../common");
|
|
21
21
|
const s2s_constants_1 = require("./s2s.constants");
|
|
22
22
|
class S2SAuth extends events_1.EventEmitter {
|
|
23
|
-
constructor(logger = common_1.getLogger('auth:s2s')) {
|
|
23
|
+
constructor(logger = (0, common_1.getLogger)('auth:s2s')) {
|
|
24
24
|
super();
|
|
25
|
-
this.router = express_1.Router({ mergeParams: true });
|
|
25
|
+
this.router = (0, express_1.Router)({ mergeParams: true });
|
|
26
26
|
this.s2sConfig = {
|
|
27
27
|
microservice: '',
|
|
28
28
|
s2sEndpointUrl: '',
|
|
@@ -86,7 +86,7 @@ class S2SAuth extends events_1.EventEmitter {
|
|
|
86
86
|
this.generateToken = () => __awaiter(this, void 0, void 0, function* () {
|
|
87
87
|
this.logger.info('Getting new S2S token');
|
|
88
88
|
const token = yield this.postS2SLease();
|
|
89
|
-
const tokenData = jwt_decode_1.default(token);
|
|
89
|
+
const tokenData = (0, jwt_decode_1.default)(token);
|
|
90
90
|
this.store[this.s2sConfig.microservice] = {
|
|
91
91
|
expiresAt: tokenData.exp,
|
|
92
92
|
token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"s2s.class.js","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAqC;AACrC,qCAAiF;AACjF,4DAAkC;AAClC,mCAAsC;AACtC,yCAAyD;AAEzD,mDAAqC;AAIrC,MAAa,OAAQ,SAAQ,qBAAY;IAcrC,YAAY,SAAoB,kBAAS,
|
|
1
|
+
{"version":3,"file":"s2s.class.js","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
3
|
if (k2 === undefined) k2 = k;
|
|
4
|
-
Object.
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
5
9
|
}) : (function(o, m, k, k2) {
|
|
6
10
|
if (k2 === undefined) k2 = k;
|
|
7
11
|
o[k2] = m[k];
|
|
8
12
|
}));
|
|
9
13
|
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
-
for (var p in m) if (p !== "default" && !
|
|
14
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
11
15
|
};
|
|
12
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
17
|
__exportStar(require("./http"), exports);
|