@hmcts/rpx-xui-node-lib 2.30.14 → 2.30.15-package-update
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.
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { RedisSessionMetadata } from './sessionMetadata.interface';
|
|
2
|
-
import {
|
|
3
|
-
import
|
|
2
|
+
import { RedisStore } from 'connect-redis';
|
|
3
|
+
import { RedisClientType } from 'redis';
|
|
4
4
|
import { SessionStore } from './sessionStore.class';
|
|
5
5
|
import { XuiLogger } from '../../common';
|
|
6
6
|
export declare class RedisSessionStore extends SessionStore {
|
|
7
|
-
protected redisClient:
|
|
7
|
+
protected redisClient: RedisClientType;
|
|
8
8
|
constructor(router?: import("express-serve-static-core").Router, logger?: XuiLogger);
|
|
9
|
-
getStore: (options: RedisSessionMetadata) =>
|
|
10
|
-
redisClientReadyListener: (redisClient:
|
|
11
|
-
redisClientErrorListener: (redisClient:
|
|
9
|
+
getStore: (options: RedisSessionMetadata) => RedisStore;
|
|
10
|
+
redisClientReadyListener: (redisClient: RedisClientType) => void;
|
|
11
|
+
redisClientErrorListener: (redisClient: RedisClientType) => void;
|
|
12
12
|
emitEvent: (eventName: string, eventObject: any) => void;
|
|
13
13
|
}
|
|
14
14
|
export declare const redisStore: RedisSessionStore;
|
|
@@ -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;
|
|
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;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAC1C,OAAO,EAAgB,eAAe,EAAE,MAAM,OAAO,CAAA;AACrD,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,EAAG,eAAe,CAAA;gBAE3B,MAAM,6CAAgC,EAAE,MAAM,GAAE,SAAsC;IAI3F,QAAQ,GAAI,SAAS,oBAAoB,KAAG,UAAU,CAsB5D;IAKM,wBAAwB,GAAI,aAAa,eAAe,UAM9D;IAEM,wBAAwB,GAAI,aAAa,eAAe,UAM9D;IAEM,SAAS,GAAI,WAAW,MAAM,EAAE,aAAa,GAAG,UAItD;CACJ;AAED,eAAO,MAAM,UAAU,mBAA0B,CAAA"}
|
|
@@ -1,46 +1,9 @@
|
|
|
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 () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
36
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
37
|
-
};
|
|
38
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
3
|
exports.redisStore = exports.RedisSessionStore = void 0;
|
|
40
4
|
const session_constants_1 = require("../session.constants");
|
|
41
|
-
const
|
|
42
|
-
const
|
|
43
|
-
const redis = __importStar(require("redis"));
|
|
5
|
+
const connect_redis_1 = require("connect-redis");
|
|
6
|
+
const redis_1 = require("redis");
|
|
44
7
|
const sessionStore_class_1 = require("./sessionStore.class");
|
|
45
8
|
const express_1 = require("express");
|
|
46
9
|
const common_1 = require("../../common");
|
|
@@ -48,16 +11,22 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
48
11
|
constructor(router = (0, express_1.Router)({ mergeParams: true }), logger = (0, common_1.getLogger)('session:redis')) {
|
|
49
12
|
super(session_constants_1.SESSION.REDIS_STORE_NAME, router, logger);
|
|
50
13
|
this.getStore = (options) => {
|
|
51
|
-
const
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
this.redisClient =
|
|
14
|
+
const ttl = options.redisStoreOptions.redisTtl === undefined
|
|
15
|
+
? undefined
|
|
16
|
+
: Number(options.redisStoreOptions.redisTtl);
|
|
17
|
+
this.redisClient = (0, redis_1.createClient)({
|
|
18
|
+
url: options.redisStoreOptions.redisCloudUrl,
|
|
19
|
+
});
|
|
55
20
|
this.redisClientReadyListener(this.redisClient);
|
|
56
21
|
this.redisClientErrorListener(this.redisClient);
|
|
57
|
-
|
|
58
|
-
|
|
22
|
+
this.redisClient.connect().catch((error) => {
|
|
23
|
+
this.logger.error(error);
|
|
24
|
+
this.emitEvent(session_constants_1.SESSION.EVENT.REDIS_CLIENT_ERROR, error);
|
|
25
|
+
});
|
|
26
|
+
return new connect_redis_1.RedisStore({
|
|
59
27
|
client: this.redisClient,
|
|
60
|
-
|
|
28
|
+
prefix: options.redisStoreOptions.redisKeyPrefix,
|
|
29
|
+
ttl,
|
|
61
30
|
});
|
|
62
31
|
};
|
|
63
32
|
// TODO: This should be a pure function. Remove side effecting on redisClient,
|
|
@@ -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,iDAA0C;AAC1C,iCAAqD;AACrD,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,EAAc,EAAE;YAC5D,MAAM,GAAG,GAAG,OAAO,CAAC,iBAAiB,CAAC,QAAQ,KAAK,SAAS;gBACxD,CAAC,CAAC,SAAS;gBACX,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAA;YAEhD,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAY,EAAC;gBAC5B,GAAG,EAAE,OAAO,CAAC,iBAAiB,CAAC,aAAa;aAC/C,CAAC,CAAA;YAEF,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAE/C,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,CAAC,KAAY,EAAE,EAAE;gBAC9C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;gBACxB,IAAI,CAAC,SAAS,CAAC,2BAAO,CAAC,KAAK,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAA;YAC3D,CAAC,CAAC,CAAA;YAEF,OAAO,IAAI,0BAAU,CAAC;gBAClB,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc;gBAChD,GAAG;aACN,CAAC,CAAA;QACN,CAAC,CAAA;QAED,8EAA8E;QAC9E,gFAAgF;QAChF,mCAAmC;QAC5B,6BAAwB,GAAG,CAAC,WAA4B,EAAE,EAAE;YAC/D,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;QAEM,6BAAwB,GAAG,CAAC,WAA4B,EAAE,EAAE;YAC/D,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;QAEM,cAAS,GAAG,CAAC,SAAiB,EAAE,WAAgB,EAAE,EAAE;YACvD,IAAI,IAAI,CAAC,aAAa,CAAC,2BAAO,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBACvD,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAA;YACrC,CAAC;QACL,CAAC,CAAA;IAjDD,CAAC;CAkDJ;AAvDD,8CAuDC;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": "2.30.
|
|
3
|
+
"version": "2.30.15-package-update",
|
|
4
4
|
"description": "Common nodejs library components for XUI",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -50,7 +50,6 @@
|
|
|
50
50
|
"@semantic-release/changelog": "^6.0.3",
|
|
51
51
|
"@semantic-release/git": "^10.0.1",
|
|
52
52
|
"@semantic-release/github": "^8.1.0",
|
|
53
|
-
"@types/connect-redis": "^0.0.23",
|
|
54
53
|
"@types/debug": "^4.1.5",
|
|
55
54
|
"@types/express": "^4.17.2",
|
|
56
55
|
"@types/express-session": "1.17.10",
|
|
@@ -85,8 +84,8 @@
|
|
|
85
84
|
},
|
|
86
85
|
"dependencies": {
|
|
87
86
|
"@dr.pogodin/csurf": "^1.14.0",
|
|
88
|
-
"axios": "^1.
|
|
89
|
-
"connect-redis": "^
|
|
87
|
+
"axios": "^1.17.0",
|
|
88
|
+
"connect-redis": "^9.0.0",
|
|
90
89
|
"debug": "^4.3.7",
|
|
91
90
|
"deepmerge": "^4.2.2",
|
|
92
91
|
"express": "^4.20.0",
|
|
@@ -97,7 +96,7 @@
|
|
|
97
96
|
"otplib": "^13.4.0",
|
|
98
97
|
"passport": "^0.7.0",
|
|
99
98
|
"passport-oauth2": "^1.8.0",
|
|
100
|
-
"redis": "^
|
|
99
|
+
"redis": "^6.0.0",
|
|
101
100
|
"session-file-store": "^1.5.0"
|
|
102
101
|
},
|
|
103
102
|
"resolutions": {
|