@hmcts/rpx-xui-node-lib 2.30.7-exui-4185-4 → 2.30.7-exui-4179
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/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":"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.7-exui-
|
|
3
|
+
"version": "2.30.7-exui-4179",
|
|
4
4
|
"description": "Common nodejs library components for XUI",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
"jest-ts-auto-mock": "^2.1.0",
|
|
103
103
|
"jwt-decode": "^3.1.2",
|
|
104
104
|
"openid-client": "^3.10.0",
|
|
105
|
-
"otplib": "
|
|
105
|
+
"otplib": "13.4.0",
|
|
106
106
|
"passport": "^0.5.3",
|
|
107
107
|
"passport-oauth2": "^1.5.0",
|
|
108
108
|
"redis": "^3.0.2",
|