@hmcts/rpx-xui-node-lib 2.30.21-package-update-04 → 2.30.21-package-update-05
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.
|
@@ -14,15 +14,14 @@ export declare class RedisSessionStore extends SessionStore {
|
|
|
14
14
|
parseTtl: (redisTtl: number | string | undefined) => number | undefined;
|
|
15
15
|
getRedisClientConfig: (redisCloudUrl: string) => {
|
|
16
16
|
url: string;
|
|
17
|
-
socket?: undefined;
|
|
18
|
-
password?: undefined;
|
|
19
17
|
} | {
|
|
18
|
+
password: string;
|
|
19
|
+
username?: string | undefined;
|
|
20
20
|
socket: {
|
|
21
21
|
tls?: true | undefined;
|
|
22
22
|
host: string;
|
|
23
23
|
port: number;
|
|
24
24
|
};
|
|
25
|
-
password: string;
|
|
26
25
|
url?: undefined;
|
|
27
26
|
};
|
|
28
27
|
}
|
|
@@ -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,CAmB5D;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,
|
|
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,CAmB5D;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,CAuBzD;IAGM,QAAQ,GAAI,UAAU,MAAM,GAAG,MAAM,GAAG,SAAS,KAAG,MAAM,GAAG,SAAS,CAO5E;IAIM,oBAAoB,GAAI,eAAe,MAAM;;;;;;;;;;;MAmCnD;CACJ;AAED,eAAO,MAAM,UAAU,mBAA0B,CAAA"}
|
|
@@ -54,13 +54,19 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
54
54
|
var _a;
|
|
55
55
|
try {
|
|
56
56
|
const parsedRedisUrl = new URL(redisCloudUrl);
|
|
57
|
+
const hasUsernameOnlyCredentials = parsedRedisUrl.username !== '' && parsedRedisUrl.password === '';
|
|
57
58
|
const tlsEnabledViaQuery = ((_a = parsedRedisUrl.searchParams.get('tls')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
|
|
59
|
+
// Some environments provide redis://<access-key>@host:port (without ':').
|
|
60
|
+
// Redis v6 expects password auth, so rewrite to redis://:password@host:port.
|
|
61
|
+
if (hasUsernameOnlyCredentials) {
|
|
62
|
+
parsedRedisUrl.password = decodeURIComponent(parsedRedisUrl.username);
|
|
63
|
+
parsedRedisUrl.username = '';
|
|
64
|
+
}
|
|
58
65
|
if (tlsEnabledViaQuery && parsedRedisUrl.protocol === 'redis:') {
|
|
59
66
|
parsedRedisUrl.protocol = 'rediss:';
|
|
60
67
|
parsedRedisUrl.searchParams.delete('tls');
|
|
61
|
-
return parsedRedisUrl.toString();
|
|
62
68
|
}
|
|
63
|
-
return
|
|
69
|
+
return parsedRedisUrl.toString();
|
|
64
70
|
}
|
|
65
71
|
catch (_b) {
|
|
66
72
|
// Preserve previous behavior if URL parsing fails.
|
|
@@ -78,7 +84,7 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
78
84
|
// Supports both URL-style values and legacy Azure cache strings:
|
|
79
85
|
// host:port,password=...,ssl=true,abortConnect=false
|
|
80
86
|
this.getRedisClientConfig = (redisCloudUrl) => {
|
|
81
|
-
var _a, _b;
|
|
87
|
+
var _a, _b, _c, _d;
|
|
82
88
|
const normalizedRedisUrl = this.normalizeRedisUrl(redisCloudUrl);
|
|
83
89
|
if (/^rediss?:\/\//i.test(normalizedRedisUrl)) {
|
|
84
90
|
return { url: normalizedRedisUrl };
|
|
@@ -98,11 +104,8 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
|
|
|
98
104
|
return accumulator;
|
|
99
105
|
}, {});
|
|
100
106
|
const tlsEnabled = ((_a = parsedParts.ssl) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true' || ((_b = parsedParts.tls) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'true';
|
|
101
|
-
return {
|
|
102
|
-
|
|
103
|
-
port }, (tlsEnabled ? { tls: true } : {})),
|
|
104
|
-
password: parsedParts.password,
|
|
105
|
-
};
|
|
107
|
+
return Object.assign(Object.assign({ socket: Object.assign({ host,
|
|
108
|
+
port }, (tlsEnabled ? { tls: true } : {})) }, (parsedParts.password ? { username: (_d = (_c = parsedParts.user) !== null && _c !== void 0 ? _c : parsedParts.username) !== null && _d !== void 0 ? _d : 'default' } : {})), { password: parsedParts.password });
|
|
106
109
|
};
|
|
107
110
|
}
|
|
108
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":"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"}
|