@hmcts/rpx-xui-node-lib 2.30.13 → 2.30.14
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/oidc/models/openid.class.d.ts.map +1 -1
- package/dist/auth/oidc/models/openid.class.js +12 -5
- package/dist/auth/oidc/models/openid.class.js.map +1 -1
- package/dist/auth/s2s/s2s.class.d.ts.map +1 -1
- package/dist/auth/s2s/s2s.class.js +3 -1
- package/dist/auth/s2s/s2s.class.js.map +1 -1
- package/dist/common/models/test/passportRequest.mock.d.ts +15 -0
- package/dist/common/models/test/passportRequest.mock.d.ts.map +1 -0
- package/dist/common/models/test/passportRequest.mock.js +17 -0
- package/dist/common/models/test/passportRequest.mock.js.map +1 -0
- package/package.json +2 -2
|
@@ -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;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,GAAI,SAAS,WAAW,KAAG,IAAI,CAyB3D;IAEM,gBAAgB,GAAI,aAAa,WAAW,EAAE,kBAAkB,GAAG,KAAG,cAAc,CAa1F;IAKM,gBAAgB,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,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;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,GAAI,SAAS,WAAW,KAAG,IAAI,CAyB3D;IAEM,gBAAgB,GAAI,aAAa,WAAW,EAAE,kBAAkB,GAAG,KAAG,cAAc,CAa1F;IAKM,gBAAgB,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAgD/F;IAEM,QAAQ,QAAa,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAQlD;IAEM,kBAAkB,GAAU,aAAa,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAK1E;IAEM,eAAe,GAAI,UAAU,QAAQ,GAAG,SAAS,KAAG,GAAG,CAM7D;IAEM,MAAM,GACT,UAAU,QAAQ,EAClB,UAAU,gBAAgB,EAC1B,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,IAAI,KACpD,IAAI,CAYN;IAEM,cAAc,QAAa,OAAO,CAAC,GAAG,CAAC,CAE7C;IAEM,SAAS,GAAI,UAAU,GAAG,KAAG,MAAM,CAAC,MAAM,CAAC,CAGjD;IAEM,WAAW,GAAI,cAAc,MAAM,EAAE,UAAU,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,KAAG,IAAI,CAE9E;IAMM,iBAAiB,GAAU,aAAa,WAAW,KAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAYvF;IAEM,cAAc,GAAI,SAAS,cAAc,EAAE,QAAQ,MAAM,KAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAYvF;IAEM,mBAAmB,GAAI,QAAQ,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,cAAc,KAAG,MAAM,GAAG,SAAS,CAEjG;IAEM,SAAS,QAAO,MAAM,GAAG,SAAS,CAExC;IAED;;;;;OAKG;IAEI,YAAY,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,cAAc,CAAC,CA2DrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}
|
|
@@ -68,7 +68,7 @@ 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;
|
|
71
|
+
var _a, _b, _c;
|
|
72
72
|
const reqsession = req.session;
|
|
73
73
|
if (!((_a = reqsession === null || reqsession === void 0 ? void 0 : reqsession.passport) === null || _a === void 0 ? void 0 : _a.user)) {
|
|
74
74
|
return next();
|
|
@@ -76,12 +76,19 @@ class OpenID extends models_1.Strategy {
|
|
|
76
76
|
if (req.isAuthenticated() && this.getClient()) {
|
|
77
77
|
const userDetails = reqsession.passport.user;
|
|
78
78
|
const currentAccessToken = userDetails.tokenset.accessToken;
|
|
79
|
+
const client = this.getClient();
|
|
80
|
+
const canIntrospect = Boolean((_c = (_b = client === null || client === void 0 ? void 0 : client.issuer) === null || _b === void 0 ? void 0 : _b.metadata) === null || _c === void 0 ? void 0 : _c.introspection_endpoint);
|
|
79
81
|
if (currentAccessToken) {
|
|
80
82
|
try {
|
|
81
|
-
|
|
82
|
-
if (
|
|
83
|
-
|
|
84
|
-
const
|
|
83
|
+
let tokenExpiredOrInvalid = this.isTokenExpired(currentAccessToken);
|
|
84
|
+
if (canIntrospect) {
|
|
85
|
+
const now = Math.floor(Date.now() / 1000);
|
|
86
|
+
const introspection = yield (client === null || client === void 0 ? void 0 : client.introspect(currentAccessToken));
|
|
87
|
+
tokenExpiredOrInvalid = !(introspection === null || introspection === void 0 ? void 0 : introspection.active) || !(introspection === null || introspection === void 0 ? void 0 : introspection.exp) || introspection.exp <= now;
|
|
88
|
+
}
|
|
89
|
+
if (tokenExpiredOrInvalid) {
|
|
90
|
+
this.logger.log('token expired or inactive');
|
|
91
|
+
const tokenSet = yield (client === null || client === void 0 ? void 0 : client.refresh(reqsession.passport.user.tokenset.refreshToken));
|
|
85
92
|
reqsession.passport.user.tokenset = this.convertTokenSet(tokenSet);
|
|
86
93
|
if (!this.listenerCount(auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS)) {
|
|
87
94
|
this.logger.log(`refresh: no listener count: ${auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS}`);
|
|
@@ -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;AAGtD,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,EAAE,gBAAqB,EAAkB,EAAE;YAC1F,OAAO;gBACH,SAAS,EAAE,WAAW,CAAC,QAAQ;gBAC/B,aAAa,EAAE,WAAW,CAAC,YAAY;gBACvC,kBAAkB,EAAE,WAAW,CAAC,iBAAiB;gBACjD,UAAU,EAAE,gBAAgB,CAAC,MAAM;gBACnC,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,MAAM,UAAU,GAAG,GAAG,CAAC,OAAwB,CAAA;YAE/C,IAAI,CAAC,CAAA,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,QAAQ,0CAAE,IAAI,CAAA,EAAE,CAAC;gBAC9B,OAAO,IAAI,EAAE,CAAA;YACjB,CAAC;YAED,IAAI,GAAG,CAAC,eAAe,EAAE,IAAI,IAAI,CAAC,SAAS,EAAE,EAAE,CAAC;gBAC5C,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAA;gBAC5C,MAAM,kBAAkB,GAAG,WAAW,CAAC,QAAQ,CAAC,WAAW,CAAA;
|
|
1
|
+
{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,GAAI,WAAW,SAAS,EAAE,QAAQ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,KAAG,cAAc,CAQ7F;IAEM,UAAU,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAmBzF;IAEM,aAAa,QAAO,OAAO,CAMjC;IAEM,QAAQ,QAAO,QAAQ,CAE7B;IAEM,iBAAiB,QAAO,IAAI,CAIlC;IAED,OAAO,CAAC,aAAa,CAapB;IAED,OAAO,CAAC,YAAY,
|
|
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,GAAI,WAAW,SAAS,EAAE,QAAQ;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,CAAA;KAAE,KAAG,cAAc,CAQ7F;IAEM,UAAU,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAmBzF;IAEM,aAAa,QAAO,OAAO,CAMjC;IAEM,QAAQ,QAAO,QAAQ,CAE7B;IAEM,iBAAiB,QAAO,IAAI,CAIlC;IAED,OAAO,CAAC,aAAa,CAapB;IAED,OAAO,CAAC,YAAY,CAanB;IAEM,qBAAqB,QAAa,OAAO,CAAC,MAAM,CAAC,CAOvD;IAED;;;OAGG;IACI,SAAS,QAAO,MAAM,EAAE,CAE9B;CACJ;AAED,eAAO,MAAM,GAAG,SAAgB,CAAA"}
|
|
@@ -92,7 +92,9 @@ class S2SAuth extends events_1.EventEmitter {
|
|
|
92
92
|
});
|
|
93
93
|
this.postS2SLease = () => __awaiter(this, void 0, void 0, function* () {
|
|
94
94
|
const { s2sSecret, microservice, s2sEndpointUrl } = this.s2sConfig;
|
|
95
|
-
const
|
|
95
|
+
const secretBytes = new otplib_1.ScureBase32Plugin().decode(s2sSecret);
|
|
96
|
+
const guardrails = (0, otplib_1.createGuardrails)({ MIN_SECRET_BYTES: secretBytes.length });
|
|
97
|
+
const oneTimePassword = yield (0, otplib_1.generate)({ secret: s2sSecret, guardrails, strategy: 'totp' });
|
|
96
98
|
this.logger.info('Requesting S2S token for microservice:', microservice);
|
|
97
99
|
const request = yield common_1.http.post(`${s2sEndpointUrl}`, {
|
|
98
100
|
microservice,
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"s2s.class.js","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { Request } from 'express';
|
|
2
|
+
export interface PassportRequest extends Request {
|
|
3
|
+
user?: any;
|
|
4
|
+
isAuthenticated(): this is AuthenticatedRequest;
|
|
5
|
+
isUnauthenticated(): this is UnauthenticatedRequest;
|
|
6
|
+
}
|
|
7
|
+
interface AuthenticatedRequest extends Request {
|
|
8
|
+
user: any;
|
|
9
|
+
}
|
|
10
|
+
interface UnauthenticatedRequest extends Request {
|
|
11
|
+
user?: undefined;
|
|
12
|
+
}
|
|
13
|
+
export declare function createMockPassportRequest(user?: any, overrides?: Partial<PassportRequest>): PassportRequest;
|
|
14
|
+
export {};
|
|
15
|
+
//# sourceMappingURL=passportRequest.mock.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passportRequest.mock.d.ts","sourceRoot":"","sources":["../../../../src/common/models/test/passportRequest.mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AAGjC,MAAM,WAAW,eAAgB,SAAQ,OAAO;IAC5C,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,eAAe,IAAI,IAAI,IAAI,oBAAoB,CAAC;IAChD,iBAAiB,IAAI,IAAI,IAAI,sBAAsB,CAAC;CACvD;AAED,UAAU,oBAAqB,SAAQ,OAAO;IAC1C,IAAI,EAAE,GAAG,CAAC;CACb;AAED,UAAU,sBAAuB,SAAQ,OAAO;IAC5C,IAAI,CAAC,EAAE,SAAS,CAAC;CACpB;AAED,wBAAgB,yBAAyB,CACrC,IAAI,CAAC,EAAE,GAAG,EACV,SAAS,GAAE,OAAO,CAAC,eAAe,CAAM,GACzC,eAAe,CAajB"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createMockPassportRequest = createMockPassportRequest;
|
|
4
|
+
const ts_jest_1 = require("@golevelup/ts-jest");
|
|
5
|
+
function createMockPassportRequest(user, overrides = {}) {
|
|
6
|
+
const req = (0, ts_jest_1.createMock)();
|
|
7
|
+
req.user = user !== null && user !== void 0 ? user : undefined;
|
|
8
|
+
req.isAuthenticated = function () {
|
|
9
|
+
return !!this.user;
|
|
10
|
+
};
|
|
11
|
+
req.isUnauthenticated = function () {
|
|
12
|
+
return !this.user;
|
|
13
|
+
};
|
|
14
|
+
Object.assign(req, overrides);
|
|
15
|
+
return req;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=passportRequest.mock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passportRequest.mock.js","sourceRoot":"","sources":["../../../../src/common/models/test/passportRequest.mock.ts"],"names":[],"mappings":";;AAiBA,8DAgBC;AAhCD,gDAA+C;AAgB/C,SAAgB,yBAAyB,CACrC,IAAU,EACV,YAAsC,EAAE;IAExC,MAAM,GAAG,GAAG,IAAA,oBAAU,GAAyC,CAAA;IAE/D,GAAG,CAAC,IAAI,GAAG,IAAI,aAAJ,IAAI,cAAJ,IAAI,GAAI,SAAS,CAAA;IAC5B,GAAG,CAAC,eAAe,GAAG;QAClB,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IACtB,CAAC,CAAA;IACD,GAAG,CAAC,iBAAiB,GAAG;QACpB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAA;IACrB,CAAC,CAAA;IAED,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC7B,OAAO,GAAG,CAAA;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hmcts/rpx-xui-node-lib",
|
|
3
|
-
"version": "2.30.
|
|
3
|
+
"version": "2.30.14",
|
|
4
4
|
"description": "Common nodejs library components for XUI",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -94,7 +94,7 @@
|
|
|
94
94
|
"joi": "^18.1.2",
|
|
95
95
|
"jwt-decode": "^3.1.2",
|
|
96
96
|
"openid-client": "^5.7.1",
|
|
97
|
-
"otplib": "^
|
|
97
|
+
"otplib": "^13.4.0",
|
|
98
98
|
"passport": "^0.7.0",
|
|
99
99
|
"passport-oauth2": "^1.8.0",
|
|
100
100
|
"redis": "^3.0.2",
|