@hmcts/rpx-xui-node-lib 2.28.0 → 3.0.0-Node18Upgrade-3
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/auth/models/mySessionData.interface.d.ts +25 -0
- package/dist/auth/models/mySessionData.interface.d.ts.map +1 -0
- package/dist/auth/models/mySessionData.interface.js +3 -0
- package/dist/auth/models/mySessionData.interface.js.map +1 -0
- package/dist/auth/models/sessionData.interface.d.ts +7 -0
- package/dist/auth/models/sessionData.interface.d.ts.map +1 -0
- package/dist/auth/models/sessionData.interface.js +3 -0
- package/dist/auth/models/sessionData.interface.js.map +1 -0
- package/dist/auth/models/strategy.class.d.ts +3 -2
- package/dist/auth/models/strategy.class.d.ts.map +1 -1
- package/dist/auth/models/strategy.class.js +36 -14
- package/dist/auth/models/strategy.class.js.map +1 -1
- package/dist/auth/oidc/models/openid.class.d.ts.map +1 -1
- package/dist/auth/oidc/models/openid.class.js +10 -9
- package/dist/auth/oidc/models/openid.class.js.map +1 -1
- package/dist/session/models/redisSessionStore.class.d.ts +1 -1
- package/dist/session/models/redisSessionStore.class.d.ts.map +1 -1
- package/dist/session/models/redisSessionStore.class.js +28 -2
- package/dist/session/models/redisSessionStore.class.js.map +1 -1
- package/package.json +6 -6
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
export interface AuthOptions {
|
|
2
|
+
authorizationURL: string;
|
|
3
|
+
tokenURL: string;
|
|
4
|
+
clientID: string;
|
|
5
|
+
clientSecret: string;
|
|
6
|
+
callbackURL: string;
|
|
7
|
+
scope: string;
|
|
8
|
+
logoutURL?: string;
|
|
9
|
+
useRoutes?: boolean;
|
|
10
|
+
sessionKey?: string;
|
|
11
|
+
discoveryEndpoint: string;
|
|
12
|
+
issuerURL: string;
|
|
13
|
+
responseTypes: string[];
|
|
14
|
+
tokenEndpointAuthMethod: string;
|
|
15
|
+
allowRolesRegex?: string;
|
|
16
|
+
useCSRF?: boolean;
|
|
17
|
+
routeCredential?: RouteCredential;
|
|
18
|
+
}
|
|
19
|
+
export interface RouteCredential {
|
|
20
|
+
userName: string;
|
|
21
|
+
password: string;
|
|
22
|
+
routes: string[];
|
|
23
|
+
scope: string;
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=mySessionData.interface.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mySessionData.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/mySessionData.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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mySessionData.interface.js","sourceRoot":"","sources":["../../../src/auth/models/mySessionData.interface.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionData.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/sessionData.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE9D,MAAM,WAAW,aAAc,SAAQ,OAAO,EAAE,WAAW;IACvD,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;IAClB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,GAAG,CAAA;CAChB"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionData.interface.js","sourceRoot":"","sources":["../../../src/auth/models/sessionData.interface.ts"],"names":[],"mappings":""}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
|
+
/// <reference types="node" />
|
|
2
3
|
import * as events from 'events';
|
|
3
4
|
import { NextFunction, Request, RequestHandler, Response, Router } from 'express';
|
|
4
5
|
import { XuiLogger } from '../../common';
|
|
@@ -59,7 +60,7 @@ export declare abstract class Strategy extends events.EventEmitter {
|
|
|
59
60
|
* Get authorization from ClientID and secret
|
|
60
61
|
* @return {string}
|
|
61
62
|
*/
|
|
62
|
-
getAuthorization: (clientID: string, clientSecret: string, encoding?:
|
|
63
|
+
getAuthorization: (clientID: string, clientSecret: string, encoding?: BufferEncoding) => string;
|
|
63
64
|
/**
|
|
64
65
|
* Get all the events that this strategy emits
|
|
65
66
|
* @return {string[]} - ['auth.authenticate.success']
|
|
@@ -68,7 +69,7 @@ export declare abstract class Strategy extends events.EventEmitter {
|
|
|
68
69
|
/**
|
|
69
70
|
* emit Events if any subscriptions available
|
|
70
71
|
*/
|
|
71
|
-
emitIfListenersExist: (eventName: string, eventObject: unknown, done: (err: any, id?:
|
|
72
|
+
emitIfListenersExist: (eventName: string, eventObject: unknown, done: (err: any, id?: any) => void) => void;
|
|
72
73
|
getRequestBody: (options: AuthOptions) => string;
|
|
73
74
|
getUrlFromOptions: (options: AuthOptions) => string;
|
|
74
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.class.d.ts","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"strategy.class.d.ts","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,15 +79,15 @@ class Strategy extends events.EventEmitter {
|
|
|
79
79
|
*/
|
|
80
80
|
/* istanbul ignore next */
|
|
81
81
|
this.loginHandler = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
82
|
-
var _a;
|
|
83
82
|
this.logger.log('Base loginHandler Hit');
|
|
83
|
+
const reqSession = req.session;
|
|
84
84
|
// we are using oidc generator but it's just a helper, rather than installing another library to provide this
|
|
85
85
|
const state = openid_client_1.generators.state();
|
|
86
86
|
/* istanbul ignore next */
|
|
87
87
|
const promise = new Promise((resolve) => {
|
|
88
88
|
var _a, _b;
|
|
89
89
|
if (req.session && ((_a = this.options) === null || _a === void 0 ? void 0 : _a.sessionKey)) {
|
|
90
|
-
|
|
90
|
+
reqSession[(_b = this.options) === null || _b === void 0 ? void 0 : _b.sessionKey] = { state };
|
|
91
91
|
req.session.save(() => {
|
|
92
92
|
this.logger.log('resolved promise, state saved');
|
|
93
93
|
resolve(true);
|
|
@@ -105,7 +105,7 @@ class Strategy extends events.EventEmitter {
|
|
|
105
105
|
this.logger.log('calling passport authenticate');
|
|
106
106
|
/* istanbul ignore next */
|
|
107
107
|
return passport_1.default.authenticate(this.strategyName, {
|
|
108
|
-
redirect_uri:
|
|
108
|
+
redirect_uri: reqSession === null || reqSession === void 0 ? void 0 : reqSession.callbackURL,
|
|
109
109
|
state,
|
|
110
110
|
}, (error, user, info) => {
|
|
111
111
|
/* istanbul ignore next */
|
|
@@ -130,11 +130,13 @@ class Strategy extends events.EventEmitter {
|
|
|
130
130
|
return Promise.reject(error);
|
|
131
131
|
}
|
|
132
132
|
});
|
|
133
|
+
/* istanbul ignore next */
|
|
133
134
|
this.setCallbackURL = (req, _res, next) => {
|
|
135
|
+
const reqSession = req.session;
|
|
134
136
|
/* istanbul ignore else */
|
|
135
|
-
if (req.session && !
|
|
137
|
+
if (req.session && !reqSession.callbackURL) {
|
|
136
138
|
req.app.set('trust proxy', true);
|
|
137
|
-
|
|
139
|
+
reqSession.callbackURL = URL.format({
|
|
138
140
|
protocol: req.protocol,
|
|
139
141
|
host: req.get('host'),
|
|
140
142
|
pathname: this.options.callbackURL,
|
|
@@ -143,11 +145,12 @@ class Strategy extends events.EventEmitter {
|
|
|
143
145
|
/* istanbul ignore next */
|
|
144
146
|
next();
|
|
145
147
|
};
|
|
148
|
+
/* istanbul ignore next */
|
|
146
149
|
this.logout = (req, res) => __awaiter(this, void 0, void 0, function* () {
|
|
147
|
-
|
|
150
|
+
const reqSession = req.session;
|
|
148
151
|
try {
|
|
149
152
|
this.logger.log('logout start');
|
|
150
|
-
const { accessToken, refreshToken } = (
|
|
153
|
+
const { accessToken, refreshToken } = (reqSession === null || reqSession === void 0 ? void 0 : reqSession.passport.user.tokenset) || null;
|
|
151
154
|
const auth = this.getAuthorization(this.options.clientID, this.options.clientSecret);
|
|
152
155
|
yield common_1.http.delete(this.urlFromToken(this.options.logoutURL, accessToken), {
|
|
153
156
|
headers: {
|
|
@@ -160,7 +163,9 @@ class Strategy extends events.EventEmitter {
|
|
|
160
163
|
},
|
|
161
164
|
});
|
|
162
165
|
//passport provides this method on request object
|
|
163
|
-
req.logout()
|
|
166
|
+
req.logout((err) => {
|
|
167
|
+
console.error(err);
|
|
168
|
+
});
|
|
164
169
|
yield this.destroySession(req);
|
|
165
170
|
/* istanbul ignore next */
|
|
166
171
|
if (req.query.noredirect) {
|
|
@@ -200,6 +205,7 @@ class Strategy extends events.EventEmitter {
|
|
|
200
205
|
this.keepAliveHandler = (_req, _res, next) => {
|
|
201
206
|
next();
|
|
202
207
|
};
|
|
208
|
+
/* istanbul ignore next */
|
|
203
209
|
this.configure = (options) => {
|
|
204
210
|
const configuredOptions = Object.assign(Object.assign({}, this.options), options);
|
|
205
211
|
this.validateOptions(configuredOptions);
|
|
@@ -226,9 +232,9 @@ class Strategy extends events.EventEmitter {
|
|
|
226
232
|
};
|
|
227
233
|
/* istanbul ignore next */
|
|
228
234
|
this.callbackHandler = (req, res, next) => {
|
|
229
|
-
var _a;
|
|
230
235
|
this.logger.log('inside callbackHandler');
|
|
231
236
|
const INVALID_STATE_ERROR = 'Invalid authorization request state.';
|
|
237
|
+
const reqSession = req.session;
|
|
232
238
|
const emitAuthenticationFailure = (logMessages) => {
|
|
233
239
|
this.logger.log('inside emitAuthenticationFailure');
|
|
234
240
|
if (!logMessages.length)
|
|
@@ -238,7 +244,7 @@ class Strategy extends events.EventEmitter {
|
|
|
238
244
|
this.emit(auth_constants_1.AUTH.EVENT.AUTHENTICATE_FAILURE, req, res, next);
|
|
239
245
|
};
|
|
240
246
|
passport_1.default.authenticate(this.strategyName, {
|
|
241
|
-
redirect_uri:
|
|
247
|
+
redirect_uri: reqSession === null || reqSession === void 0 ? void 0 : reqSession.callbackURL,
|
|
242
248
|
}, (error, user, info) => {
|
|
243
249
|
const errorMessages = [];
|
|
244
250
|
this.logger.log('inside passport authenticate');
|
|
@@ -284,17 +290,19 @@ class Strategy extends events.EventEmitter {
|
|
|
284
290
|
}
|
|
285
291
|
next();
|
|
286
292
|
};
|
|
293
|
+
/* istanbul ignore next */
|
|
287
294
|
this.makeAuthorization = (passport) => `Bearer ${passport.user.tokenset.accessToken}`;
|
|
288
295
|
/* istanbul ignore next */
|
|
289
296
|
this.setHeaders = (req, _res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
290
|
-
var
|
|
291
|
-
|
|
297
|
+
var _a;
|
|
298
|
+
const reqSession = req.session;
|
|
299
|
+
if ((_a = reqSession === null || reqSession === void 0 ? void 0 : reqSession.passport) === null || _a === void 0 ? void 0 : _a.user) {
|
|
292
300
|
if (this.isRouteCredentialNeeded(req.path, this.options)) {
|
|
293
301
|
yield this.setCredentialToken(req);
|
|
294
302
|
}
|
|
295
303
|
else {
|
|
296
|
-
req.headers['user-roles'] =
|
|
297
|
-
req.headers.Authorization = this.makeAuthorization(
|
|
304
|
+
req.headers['user-roles'] = reqSession.passport.user.userinfo.roles.join();
|
|
305
|
+
req.headers.Authorization = this.makeAuthorization(reqSession.passport);
|
|
298
306
|
}
|
|
299
307
|
}
|
|
300
308
|
else if (this.isRouteCredentialNeeded(req.path, this.options)) {
|
|
@@ -302,9 +310,11 @@ class Strategy extends events.EventEmitter {
|
|
|
302
310
|
}
|
|
303
311
|
next();
|
|
304
312
|
});
|
|
313
|
+
/* istanbul ignore next */
|
|
305
314
|
this.isRouteCredentialNeeded = (url, options) => {
|
|
306
315
|
return options.routeCredential && options.routeCredential.routes && options.routeCredential.routes.includes(url);
|
|
307
316
|
};
|
|
317
|
+
/* istanbul ignore next */
|
|
308
318
|
this.setCredentialToken = (req) => __awaiter(this, void 0, void 0, function* () {
|
|
309
319
|
let routeCredentialToken;
|
|
310
320
|
const cachedToken = req.app.get('routeCredentialToken');
|
|
@@ -355,18 +365,22 @@ class Strategy extends events.EventEmitter {
|
|
|
355
365
|
}
|
|
356
366
|
});
|
|
357
367
|
};
|
|
368
|
+
/* istanbul ignore next */
|
|
358
369
|
this.initializePassport = () => {
|
|
359
370
|
this.router.use(passport_1.default.initialize());
|
|
360
371
|
};
|
|
372
|
+
/* istanbul ignore next */
|
|
361
373
|
this.initializeSession = () => {
|
|
362
374
|
this.router.use(passport_1.default.session());
|
|
363
375
|
};
|
|
376
|
+
/* istanbul ignore next */
|
|
364
377
|
this.initializeKeepAlive = () => {
|
|
365
378
|
this.router.use(this.keepAliveHandler);
|
|
366
379
|
};
|
|
367
380
|
/**
|
|
368
381
|
* helper method to store csrf token into session
|
|
369
382
|
*/
|
|
383
|
+
/* istanbul ignore next */
|
|
370
384
|
this.initialiseCSRF = () => {
|
|
371
385
|
if (this.options.useCSRF) {
|
|
372
386
|
this.logger.log('initialising CSRF middleware');
|
|
@@ -395,6 +409,7 @@ class Strategy extends events.EventEmitter {
|
|
|
395
409
|
req.headers['x-xsrf-token'] ||
|
|
396
410
|
req.cookies['XSRF-TOKEN']);
|
|
397
411
|
};
|
|
412
|
+
/* istanbul ignore next */
|
|
398
413
|
this.addHeaders = () => {
|
|
399
414
|
this.router.use(this.setHeaders);
|
|
400
415
|
};
|
|
@@ -412,6 +427,7 @@ class Strategy extends events.EventEmitter {
|
|
|
412
427
|
this.emitIfListenersExist(auth_constants_1.AUTH.EVENT.DESERIALIZE_USER, id, done);
|
|
413
428
|
});
|
|
414
429
|
};
|
|
430
|
+
/* istanbul ignore next */
|
|
415
431
|
this.jwTokenExpired = (jwtData) => {
|
|
416
432
|
const expires = new Date(jwtData.exp * 1000).getTime();
|
|
417
433
|
const now = new Date().getTime();
|
|
@@ -421,6 +437,7 @@ class Strategy extends events.EventEmitter {
|
|
|
421
437
|
* Get session URL
|
|
422
438
|
* @return {string}
|
|
423
439
|
*/
|
|
440
|
+
/* istanbul ignore next */
|
|
424
441
|
this.urlFromToken = (url, token) => {
|
|
425
442
|
return `${url}/session/${token}`;
|
|
426
443
|
};
|
|
@@ -428,6 +445,7 @@ class Strategy extends events.EventEmitter {
|
|
|
428
445
|
* Get authorization from ClientID and secret
|
|
429
446
|
* @return {string}
|
|
430
447
|
*/
|
|
448
|
+
/* istanbul ignore next */
|
|
431
449
|
this.getAuthorization = (clientID, clientSecret, encoding = 'base64') => {
|
|
432
450
|
return `Basic ${Buffer.from(`${clientID}:${clientSecret}`).toString(encoding)}`;
|
|
433
451
|
};
|
|
@@ -435,12 +453,14 @@ class Strategy extends events.EventEmitter {
|
|
|
435
453
|
* Get all the events that this strategy emits
|
|
436
454
|
* @return {string[]} - ['auth.authenticate.success']
|
|
437
455
|
*/
|
|
456
|
+
/* istanbul ignore next */
|
|
438
457
|
this.getEvents = () => {
|
|
439
458
|
return Object.values(auth_constants_1.AUTH.EVENT);
|
|
440
459
|
};
|
|
441
460
|
/**
|
|
442
461
|
* emit Events if any subscriptions available
|
|
443
462
|
*/
|
|
463
|
+
/* istanbul ignore next */
|
|
444
464
|
this.emitIfListenersExist = (eventName, eventObject, done) => {
|
|
445
465
|
if (!this.listenerCount(eventName)) {
|
|
446
466
|
done(null, eventObject);
|
|
@@ -449,6 +469,7 @@ class Strategy extends events.EventEmitter {
|
|
|
449
469
|
this.emit(eventName, eventObject, done);
|
|
450
470
|
}
|
|
451
471
|
};
|
|
472
|
+
/* istanbul ignore next */
|
|
452
473
|
this.getRequestBody = (options) => {
|
|
453
474
|
var _a;
|
|
454
475
|
if (options.routeCredential) {
|
|
@@ -461,6 +482,7 @@ class Strategy extends events.EventEmitter {
|
|
|
461
482
|
}
|
|
462
483
|
throw new Error('options.routeCredential missing values');
|
|
463
484
|
};
|
|
485
|
+
/* istanbul ignore next */
|
|
464
486
|
this.getUrlFromOptions = (options) => {
|
|
465
487
|
if (options.routeCredential) {
|
|
466
488
|
return `${options.logoutURL}/o/token`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;
|
|
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;AAGtD,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,CAuC/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,CAyDrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}
|
|
@@ -68,20 +68,21 @@ class OpenID extends models_1.Strategy {
|
|
|
68
68
|
// This function is hard to mock, come back to once we've mocked out easier prod code.
|
|
69
69
|
/* istanbul ignore next */
|
|
70
70
|
this.keepAliveHandler = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
71
|
-
var _a, _b
|
|
72
|
-
|
|
71
|
+
var _a, _b;
|
|
72
|
+
const reqsession = req.session;
|
|
73
|
+
if (!((_a = reqsession === null || reqsession === void 0 ? void 0 : reqsession.passport) === null || _a === void 0 ? void 0 : _a.user)) {
|
|
73
74
|
return next();
|
|
74
75
|
}
|
|
75
76
|
if (req.isAuthenticated() && this.getClient()) {
|
|
76
|
-
const userDetails =
|
|
77
|
+
const userDetails = reqsession.passport.user;
|
|
77
78
|
const currentAccessToken = userDetails.tokenset.accessToken;
|
|
78
79
|
if (currentAccessToken) {
|
|
79
80
|
try {
|
|
80
81
|
// TODO: ideally we need to introspect the tokens but currently unsupported in IDAM
|
|
81
82
|
if (this.isTokenExpired(currentAccessToken)) {
|
|
82
83
|
this.logger.log('token expired');
|
|
83
|
-
const tokenSet = yield ((
|
|
84
|
-
|
|
84
|
+
const tokenSet = yield ((_b = this.getClient()) === null || _b === void 0 ? void 0 : _b.refresh(reqsession.passport.user.tokenset.refreshToken));
|
|
85
|
+
reqsession.passport.user.tokenset = this.convertTokenSet(tokenSet);
|
|
85
86
|
if (!this.listenerCount(auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS)) {
|
|
86
87
|
this.logger.log(`refresh: no listener count: ${auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS}`);
|
|
87
88
|
return next();
|
|
@@ -179,14 +180,14 @@ class OpenID extends models_1.Strategy {
|
|
|
179
180
|
*/
|
|
180
181
|
/* istanbul ignore next */
|
|
181
182
|
this.loginHandler = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
182
|
-
var _d;
|
|
183
183
|
this.logger.log('OIDC loginHandler Hit');
|
|
184
184
|
const nonce = openid_client_1.generators.nonce();
|
|
185
185
|
const state = openid_client_1.generators.state();
|
|
186
|
+
const reqsession = req.session;
|
|
186
187
|
const promise = new Promise((resolve) => {
|
|
187
|
-
var _a;
|
|
188
|
+
var _a, _b;
|
|
188
189
|
if (req.session && ((_a = this.options) === null || _a === void 0 ? void 0 : _a.sessionKey)) {
|
|
189
|
-
|
|
190
|
+
reqsession[(_b = this.options) === null || _b === void 0 ? void 0 : _b.sessionKey] = { state };
|
|
190
191
|
req.session.save(() => {
|
|
191
192
|
this.logger.log('resolved promise, nonce & state saved');
|
|
192
193
|
resolve(true);
|
|
@@ -201,7 +202,7 @@ class OpenID extends models_1.Strategy {
|
|
|
201
202
|
yield promise;
|
|
202
203
|
this.logger.log('calling passport authenticate');
|
|
203
204
|
return passport_1.default.authenticate(this.strategyName, {
|
|
204
|
-
redirect_uri:
|
|
205
|
+
redirect_uri: reqsession === null || reqsession === void 0 ? void 0 : reqsession.callbackURL,
|
|
205
206
|
nonce,
|
|
206
207
|
state,
|
|
207
208
|
}, (error, user, info) => {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RedisSessionMetadata } from './sessionMetadata.interface';
|
|
2
2
|
import { default as connectRedis } from 'connect-redis';
|
|
3
|
-
import
|
|
3
|
+
import * as redis from 'redis';
|
|
4
4
|
import { SessionStore } from './sessionStore.class';
|
|
5
5
|
import { XuiLogger } from '../../common';
|
|
6
6
|
export declare class RedisSessionStore extends SessionStore {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisSessionStore.class.d.ts","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"redisSessionStore.class.d.ts","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAElE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAa,SAAS,EAAE,MAAM,cAAc,CAAA;AAEnD,qBAAa,iBAAkB,SAAQ,YAAY;IAC/C,SAAS,CAAC,WAAW,EAAE,KAAK,CAAC,WAAW,GAAG,GAAG,CAAA;gBAElC,MAAM,6CAAgC,EAAE,MAAM,GAAE,SAAsC;IAI3F,QAAQ,YAAa,oBAAoB,KAAG,aAAa,UAAU,CAezE;IAMM,wBAAwB,gBAAiB,MAAM,WAAW,UAMhE;IAGM,wBAAwB,gBAAiB,MAAM,WAAW,UAMhE;IAGM,SAAS,cAAe,MAAM,eAAe,GAAG,UAItD;CACJ;AAED,eAAO,MAAM,UAAU,mBAA0B,CAAA"}
|
|
@@ -1,4 +1,27 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
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);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
@@ -7,7 +30,7 @@ exports.redisStore = exports.RedisSessionStore = void 0;
|
|
|
7
30
|
const session_constants_1 = require("../session.constants");
|
|
8
31
|
const express_session_1 = __importDefault(require("express-session"));
|
|
9
32
|
const connect_redis_1 = __importDefault(require("connect-redis"));
|
|
10
|
-
const
|
|
33
|
+
const redis = __importStar(require("redis"));
|
|
11
34
|
const sessionStore_class_1 = require("./sessionStore.class");
|
|
12
35
|
const express_1 = require("express");
|
|
13
36
|
const common_1 = require("../../common");
|
|
@@ -18,7 +41,7 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
18
41
|
const tlsOptions = {
|
|
19
42
|
prefix: options.redisStoreOptions.redisKeyPrefix,
|
|
20
43
|
};
|
|
21
|
-
this.redisClient =
|
|
44
|
+
this.redisClient = redis.createClient(options.redisStoreOptions.redisCloudUrl, tlsOptions);
|
|
22
45
|
this.redisClientReadyListener(this.redisClient);
|
|
23
46
|
this.redisClientErrorListener(this.redisClient);
|
|
24
47
|
const redisStore = (0, connect_redis_1.default)(express_session_1.default);
|
|
@@ -30,6 +53,7 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
30
53
|
// TODO: This should be a pure function. Remove side effecting on redisClient,
|
|
31
54
|
// listenerCount, emit and logger, when you have Redis setup on a local machine,
|
|
32
55
|
// ( to check that it still works )
|
|
56
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
33
57
|
this.redisClientReadyListener = (redisClient) => {
|
|
34
58
|
redisClient.on('ready', () => {
|
|
35
59
|
this.emitEvent(session_constants_1.SESSION.EVENT.REDIS_CLIENT_READY, redisClient);
|
|
@@ -37,6 +61,7 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
37
61
|
this.logger.info('redisClient is ', redisClient);
|
|
38
62
|
});
|
|
39
63
|
};
|
|
64
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
40
65
|
this.redisClientErrorListener = (redisClient) => {
|
|
41
66
|
redisClient.on('error', (error) => {
|
|
42
67
|
this.logger.error(error);
|
|
@@ -44,6 +69,7 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
44
69
|
this.emitEvent(session_constants_1.SESSION.EVENT.REDIS_CLIENT_ERROR, error);
|
|
45
70
|
});
|
|
46
71
|
};
|
|
72
|
+
// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
|
|
47
73
|
this.emitEvent = (eventName, eventObject) => {
|
|
48
74
|
if (this.listenerCount(session_constants_1.SESSION.EVENT.REDIS_CLIENT_READY)) {
|
|
49
75
|
this.emit(eventName, eventObject);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8C;AAE9C,sEAAqC;AACrC,kEAAuD;AACvD,6CAA8B;AAC9B,6DAAmD;AACnD,qCAAgC;AAChC,yCAAmD;AAEnD,MAAa,iBAAkB,SAAQ,iCAAY;IAG/C,YAAY,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,SAAoB,IAAA,kBAAS,EAAC,eAAe,CAAC;QAC9F,KAAK,CAAC,2BAAO,CAAC,gBAAgB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAG5C,aAAQ,GAAG,CAAC,OAA6B,EAA2B,EAAE;YACzE,MAAM,UAAU,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc;aACnD,CAAA;YAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAE1F,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAE/C,MAAM,UAAU,GAAG,IAAA,uBAAY,EAAC,yBAAO,CAAC,CAAA;YACxC,OAAO,IAAI,UAAU,CAAC;gBAClB,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,GAAG,EAAE,OAAO,CAAC,iBAAiB,CAAC,QAAQ;aAC1C,CAAC,CAAA;QACN,CAAC,CAAA;QAED,8EAA8E;QAC9E,gFAAgF;QAChF,mCAAmC;QACnC,6EAA6E;QACtE,6BAAwB,GAAG,CAAC,WAA8B,EAAE,EAAE;YACjE,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE;gBACzB,IAAI,CAAC,SAAS,CAAC,2BAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAA;gBAC7D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAA;gBACvD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;YACpD,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QAED,6EAA6E;QACtE,6BAAwB,GAAG,CAAC,WAA8B,EAAE,EAAE;YACjE,WAAW,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAU,EAAE,EAAE;gBACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACxB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAA;gBAChD,IAAI,CAAC,SAAS,CAAC,2BAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;QACN,CAAC,CAAA;QAED,6EAA6E;QACtE,cAAS,GAAG,CAAC,SAAiB,EAAE,WAAgB,EAAE,EAAE;YACvD,IAAI,IAAI,CAAC,aAAa,CAAC,2BAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE;gBACtD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;aACpC;QACL,CAAC,CAAA;IA7CD,CAAC;CA8CJ;AAnDD,8CAmDC;AAEY,QAAA,UAAU,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hmcts/rpx-xui-node-lib",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "3.0.0-Node18Upgrade-3",
|
|
4
4
|
"description": "Common Nodejs library components for XUI",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -45,15 +45,15 @@
|
|
|
45
45
|
"@semantic-release/changelog": "^5.0.1",
|
|
46
46
|
"@semantic-release/git": "^9.0.0",
|
|
47
47
|
"@semantic-release/github": "^7.0.7",
|
|
48
|
-
"@types/connect-redis": "^0.0.
|
|
48
|
+
"@types/connect-redis": "^0.0.23",
|
|
49
49
|
"@types/csurf": "^1.9.36",
|
|
50
50
|
"@types/debug": "^4.1.5",
|
|
51
51
|
"@types/express": "^4.17.2",
|
|
52
|
-
"@types/express-session": "
|
|
52
|
+
"@types/express-session": "1.17.10",
|
|
53
53
|
"@types/hapi__joi": "^17.1.0",
|
|
54
54
|
"@types/jest": "^29.4.0",
|
|
55
55
|
"@types/jwt-decode": "^2.2.1",
|
|
56
|
-
"@types/node": "^
|
|
56
|
+
"@types/node": "^18.17.0",
|
|
57
57
|
"@types/passport": "^1.0.2",
|
|
58
58
|
"@types/passport-oauth2": "^1.4.9",
|
|
59
59
|
"@types/session-file-store": "^1.2.1",
|
|
@@ -77,7 +77,7 @@
|
|
|
77
77
|
"ts-node": "^10.8.1",
|
|
78
78
|
"tslint": "^6.1.0",
|
|
79
79
|
"tslint-config-prettier": "^1.18.0",
|
|
80
|
-
"typescript": "^4.
|
|
80
|
+
"typescript": "^4.8.2"
|
|
81
81
|
},
|
|
82
82
|
"config": {
|
|
83
83
|
"commitizen": {
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"passport": "^0.4.1",
|
|
103
103
|
"passport-oauth2": "^1.5.0",
|
|
104
104
|
"redis": "^3.0.2",
|
|
105
|
-
"session-file-store": "^1.
|
|
105
|
+
"session-file-store": "^1.5.0",
|
|
106
106
|
"ts-auto-mock": "^3.5.0",
|
|
107
107
|
"ttypescript": "^1.5.13"
|
|
108
108
|
}
|