@hmcts/rpx-xui-node-lib 2.30.21-package-update-01 → 2.30.21-package-update-03
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.
|
@@ -10,6 +10,7 @@ export declare class RedisSessionStore extends SessionStore {
|
|
|
10
10
|
redisClientReadyListener: (redisClient: RedisClientType) => void;
|
|
11
11
|
redisClientErrorListener: (redisClient: RedisClientType) => void;
|
|
12
12
|
emitEvent: (eventName: string, eventObject: any) => void;
|
|
13
|
+
normalizeRedisUrl: (redisCloudUrl: string) => string;
|
|
13
14
|
}
|
|
14
15
|
export declare const redisStore: RedisSessionStore;
|
|
15
16
|
//# sourceMappingURL=redisSessionStore.class.d.ts.map
|
|
@@ -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;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,
|
|
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,CAuB5D;IAKM,wBAAwB,GAAI,aAAa,eAAe,UAM9D;IAEM,wBAAwB,GAAI,aAAa,eAAe,UAM9D;IAEM,SAAS,GAAI,WAAW,MAAM,EAAE,aAAa,GAAG,UAItD;IAIM,iBAAiB,GAAI,eAAe,MAAM,KAAG,MAAM,CAgBzD;CACJ;AAED,eAAO,MAAM,UAAU,mBAA0B,CAAA"}
|
|
@@ -14,8 +14,9 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
14
14
|
const ttl = options.redisStoreOptions.redisTtl === undefined
|
|
15
15
|
? undefined
|
|
16
16
|
: Number(options.redisStoreOptions.redisTtl);
|
|
17
|
+
const redisCloudUrl = this.normalizeRedisUrl(options.redisStoreOptions.redisCloudUrl);
|
|
17
18
|
this.redisClient = (0, redis_1.createClient)({
|
|
18
|
-
url:
|
|
19
|
+
url: redisCloudUrl,
|
|
19
20
|
});
|
|
20
21
|
this.redisClientReadyListener(this.redisClient);
|
|
21
22
|
this.redisClientErrorListener(this.redisClient);
|
|
@@ -51,6 +52,25 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
51
52
|
this.emit(eventName, eventObject);
|
|
52
53
|
}
|
|
53
54
|
};
|
|
55
|
+
// Keep compatibility with legacy Azure-style URLs: redis://...?...&tls=true
|
|
56
|
+
// redis@6 expects TLS via rediss:// or socket.tls.
|
|
57
|
+
this.normalizeRedisUrl = (redisCloudUrl) => {
|
|
58
|
+
var _a;
|
|
59
|
+
try {
|
|
60
|
+
const parsedRedisUrl = new URL(redisCloudUrl);
|
|
61
|
+
const tlsEnabledViaQuery = ((_a = parsedRedisUrl.searchParams.get('tls')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
|
|
62
|
+
if (tlsEnabledViaQuery && parsedRedisUrl.protocol === 'redis:') {
|
|
63
|
+
parsedRedisUrl.protocol = 'rediss:';
|
|
64
|
+
parsedRedisUrl.searchParams.delete('tls');
|
|
65
|
+
return parsedRedisUrl.toString();
|
|
66
|
+
}
|
|
67
|
+
return redisCloudUrl;
|
|
68
|
+
}
|
|
69
|
+
catch (_b) {
|
|
70
|
+
// Preserve previous behavior if URL parsing fails.
|
|
71
|
+
return redisCloudUrl;
|
|
72
|
+
}
|
|
73
|
+
};
|
|
54
74
|
}
|
|
55
75
|
}
|
|
56
76
|
exports.RedisSessionStore = RedisSessionStore;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@hmcts/rpx-xui-node-lib",
|
|
3
|
-
"version": "2.30.21-package-update-
|
|
3
|
+
"version": "2.30.21-package-update-03",
|
|
4
4
|
"description": "Common nodejs library components for XUI",
|
|
5
5
|
"main": "dist/index",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -96,7 +96,7 @@
|
|
|
96
96
|
"otplib": "^13.4.0",
|
|
97
97
|
"passport": "^0.7.0",
|
|
98
98
|
"passport-oauth2": "^1.8.0",
|
|
99
|
-
"redis": "^6.
|
|
99
|
+
"redis": "^6.1.0",
|
|
100
100
|
"session-file-store": "^1.5.0"
|
|
101
101
|
},
|
|
102
102
|
"resolutions": {
|