@hmcts/rpx-xui-node-lib 2.30.21-openid-client → 2.30.21-package-update-03

package/dist/auth/models/strategy.class.js

@@ -52,9 +52,9 @@ const auth_constants_1 = require("../auth.constants");
 const common_1 = require("../../common");
 const joi_1 = __importDefault(require("joi"));
 const URL = __importStar(require("url"));
-const crypto_1 = require("crypto");
+const openid_client_1 = require("openid-client");
 const csurf_1 = __importDefault(require("@dr.pogodin/csurf"));
-const jwt_decode_1 = __importDefault(require("jwt-decode"));
+const jwt_decode_1 = require("jwt-decode");
 class Strategy extends events.EventEmitter {
     constructor(strategyName, router, logger = (0, common_1.getLogger)('auth:strategy')) {
         super();
@@ -379,7 +379,7 @@ class Strategy extends events.EventEmitter {
         });
         /* istanbul ignore next */
         this.isTokenExpired = (token) => {
-            const jwtData = (0, jwt_decode_1.default)(token);
+            const jwtData = (0, jwt_decode_1.jwtDecode)(token);
             return this.jwTokenExpired(jwtData);
         };
         /* istanbul ignore next */
@@ -655,7 +655,7 @@ class Strategy extends events.EventEmitter {
     }
     saveStateInSession(reqSession, state) {
         if (!state) {
-            state = (0, crypto_1.randomBytes)(32).toString('base64url');
+            state = openid_client_1.generators.state();
             this.logger.log(`state not found, generating new state ${state}`);
         }
         const p = new Promise((resolve) => {
@@ -674,7 +674,7 @@ class Strategy extends events.EventEmitter {
                 resolve(false);
             }
         });
-        return { promise: p, state };
+        return { promise: p, state: state };
     }
     getLoginHint(req) {
         var _a;

package/dist/auth/models/strategy.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"strategy.class.js","sourceRoot":"","sources":["../../../src/auth/models/strategy.class.ts"],"names":[],"mappings":"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"}

package/dist/auth/oidc/models/OpenIDMetadata.interface.d.ts

@@ -1,4 +1,4 @@
-import type { ClientMetadata } from 'openid-client';
+import { ClientMetadata } from 'openid-client';
 export interface OpenIDMetadata extends ClientMetadata {
     discovery_endpoint: string;
     issuer_url: string;

package/dist/auth/oidc/models/OpenIDMetadata.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"OpenIDMetadata.interface.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/OpenIDMetadata.interface.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAEnD,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB"}
+{"version":3,"file":"OpenIDMetadata.interface.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/OpenIDMetadata.interface.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAE9C,MAAM,WAAW,cAAe,SAAQ,cAAc;IAClD,kBAAkB,EAAE,MAAM,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,OAAO,CAAA;CACtB"}

package/dist/auth/oidc/models/openid.class.d.ts

@@ -1,50 +1,31 @@
 import { NextFunction, Request, RequestHandler, Response, Router } from 'express';
-import type { Configuration, IntrospectionResponse, TokenEndpointResponse, TokenEndpointResponseHelpers, UserInfoResponse } from 'openid-client';
-import type { Strategy as PassportStrategy } from 'passport';
+import { Client, Issuer, Strategy, TokenSet, UserinfoResponse, HttpOptions } from 'openid-client';
 import { OpenIDMetadata } from './OpenIDMetadata.interface';
 import { Strategy as AuthStrategy } from '../../models';
 import { AuthOptions } from '../../models';
 import { XuiLogger } from '../../../common';
-export interface HttpOptions {
-    retry?: number;
-    timeout?: number;
-    [key: string]: unknown;
-}
-export type TokenSet = TokenEndpointResponse & TokenEndpointResponseHelpers;
-interface OpenIDPassportModule {
-    Strategy: new (options: any, verify: any) => PassportStrategy & {
-        authorizationRequestParams: (req: Request, options: any) => URLSearchParams | Record<string, string> | undefined;
-    };
-}
 export declare class OpenID extends AuthStrategy {
-    protected client: Configuration | undefined;
-    private httpOptions;
+    protected issuer: Issuer<Client> | undefined;
+    protected client: Client | undefined;
     constructor(router?: Router, logger?: XuiLogger, options?: HttpOptions);
     /**
      * Helper function to customise GOT defaults and hooks to provide debug information
      * @param options
      */
     setHttpOptionsDefaults: (options: HttpOptions) => void;
-    /** Preserve native ESM imports when this library is compiled to CommonJS. */
-    loadOpenIdClient: () => Promise<typeof import("openid-client")>;
-    /** Preserve native ESM imports when this library is compiled to CommonJS. */
-    loadOpenIdPassport: () => Promise<OpenIDPassportModule>;
     getOpenIDOptions: (authOptions: AuthOptions, discoveryOptions: any) => OpenIDMetadata;
     keepAliveHandler: (req: Request, res: Response, next: NextFunction) => Promise<void>;
-    discover: () => Promise<Configuration>;
+    discover: () => Promise<Issuer<Client>>;
     initialiseStrategy: (authOptions: AuthOptions) => Promise<void>;
     convertTokenSet: (tokenset: TokenSet | undefined) => any;
-    verify: (tokenset: TokenSet, done: (err: any, user?: any, message?: any) => void) => Promise<void>;
-    verifyUserInfo: (tokenset: TokenSet, userinfo: UserInfoResponse, done: (err: any, user?: any, message?: any) => void) => void;
-    getUserInfo: (tokenset: TokenSet) => Promise<UserInfoResponse>;
-    discoverIssuer: () => Promise<Configuration>;
-    private getClientAuth;
-    introspect: (accessToken: string) => Promise<IntrospectionResponse>;
-    refresh: (refreshToken: string) => Promise<TokenSet>;
-    useStrategy: (strategyName: string, strategy: PassportStrategy) => void;
-    createNewStrategy: (authOptions: AuthOptions) => Promise<PassportStrategy>;
-    getNewStrategy: (options: OpenIDMetadata, client: Configuration) => Promise<PassportStrategy>;
-    getClient: () => Configuration | undefined;
+    verify: (tokenset: TokenSet, userinfo: UserinfoResponse, done: (err: any, user?: any, message?: any) => void) => void;
+    discoverIssuer: () => Promise<any>;
+    newIssuer: (metadata: any) => Issuer<Client>;
+    useStrategy: (strategyName: string, strategy: Strategy<any, any>) => void;
+    createNewStrategy: (authOptions: AuthOptions) => Promise<Strategy<any, any>>;
+    getNewStrategy: (options: OpenIDMetadata, client: Client) => Strategy<any, Client>;
+    getClientFromIssuer: (issuer: Issuer<Client>, options: OpenIDMetadata) => Client | undefined;
+    getClient: () => Client | undefined;
     /**
      * The login route handler, will attempt to setup security state and nonce param and redirect user if not authenticated
      * @param req Request
@@ -54,5 +35,4 @@ export declare class OpenID extends AuthStrategy {
     loginHandler: (req: Request, res: Response, next: NextFunction) => Promise<RequestHandler>;
 }
 export declare const oidc: OpenID;
-export {};
 //# sourceMappingURL=openid.class.d.ts.map

package/dist/auth/oidc/models/openid.class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"openid.class.d.ts","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"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"}
+{"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,CA6DrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}

package/dist/auth/oidc/models/openid.class.js

@@ -14,8 +14,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.oidc = exports.OpenID = void 0;
 const express_1 = require("express");
+const openid_client_1 = require("openid-client");
 const passport_1 = __importDefault(require("passport"));
-const crypto_1 = require("crypto");
 const oidc_constants_1 = require("../oidc.constants");
 const auth_constants_1 = require("../../auth.constants");
 const models_1 = require("../../models");
@@ -30,15 +30,25 @@ class OpenID extends models_1.Strategy {
          */
         /* istanbul ignore next */
         this.setHttpOptionsDefaults = (options) => {
-            this.httpOptions = Object.assign({ retry: 3, timeout: 15000 }, options);
-        };
-        /** Preserve native ESM imports when this library is compiled to CommonJS. */
-        this.loadOpenIdClient = () => {
-            return Function('specifier', 'return import(specifier)')('openid-client');
-        };
-        /** Preserve native ESM imports when this library is compiled to CommonJS. */
-        this.loadOpenIdPassport = () => {
-            return Function('specifier', 'return import(specifier)')('openid-client/passport');
+            const defaults = {
+                retry: 3,
+                timeout: 15000,
+                hooks: {
+                    beforeRequest: [
+                        (options) => {
+                            this.logger.log('--> %s %s', options.method.toUpperCase(), options.href);
+                        },
+                    ],
+                    afterResponse: [
+                        (response) => {
+                            this.logger.log('<-- %i FROM %s %s', response.statusCode, response.request.gotOptions.method.toUpperCase(), response.request.gotOptions.href);
+                            return response;
+                        },
+                    ],
+                },
+            };
+            const httpOptions = Object.assign(Object.assign({}, defaults), options);
+            openid_client_1.custom.setHttpOptionsDefaults(httpOptions);
         };
         this.getOpenIDOptions = (authOptions, discoveryOptions) => {
             return {
@@ -58,7 +68,7 @@ class OpenID extends models_1.Strategy {
         // This function is hard to mock, come back to once we've mocked out easier prod code.
         /* istanbul ignore next */
         this.keepAliveHandler = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _a, _b, _c;
             const reqsession = req.session;
             if (!((_a = reqsession === null || reqsession === void 0 ? void 0 : reqsession.passport) === null || _a === void 0 ? void 0 : _a.user)) {
                 return next();
@@ -67,18 +77,18 @@ class OpenID extends models_1.Strategy {
                 const userDetails = reqsession.passport.user;
                 const currentAccessToken = userDetails.tokenset.accessToken;
                 const client = this.getClient();
-                const canIntrospect = Boolean(client === null || client === void 0 ? void 0 : client.serverMetadata().introspection_endpoint);
+                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);
                 if (currentAccessToken) {
                     try {
                         let tokenExpiredOrInvalid = this.isTokenExpired(currentAccessToken);
                         if (canIntrospect) {
                             const now = Math.floor(Date.now() / 1000);
-                            const introspection = yield this.introspect(currentAccessToken);
+                            const introspection = yield (client === null || client === void 0 ? void 0 : client.introspect(currentAccessToken));
                             tokenExpiredOrInvalid = !(introspection === null || introspection === void 0 ? void 0 : introspection.active) || !(introspection === null || introspection === void 0 ? void 0 : introspection.exp) || introspection.exp <= now;
                         }
                         if (tokenExpiredOrInvalid) {
                             this.logger.log('token expired or inactive');
-                            const tokenSet = yield this.refresh(reqsession.passport.user.tokenset.refreshToken);
+                            const tokenSet = yield (client === null || client === void 0 ? void 0 : client.refresh(reqsession.passport.user.tokenset.refreshToken));
                             reqsession.passport.user.tokenset = this.convertTokenSet(tokenSet);
                             if (!this.listenerCount(auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS)) {
                                 this.logger.log(`refresh: no listener count: ${auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS}`);
@@ -101,9 +111,10 @@ class OpenID extends models_1.Strategy {
         });
         this.discover = () => __awaiter(this, void 0, void 0, function* () {
             this.logger.info(`discovering endpoint: ${this.options.discoveryEndpoint}`);
-            const client = yield this.discoverIssuer();
-            this.logger.log('discover metadata', client.serverMetadata());
-            return client;
+            const issuer = yield this.discoverIssuer();
+            const metadata = issuer.metadata;
+            this.logger.log('discover metadata', metadata);
+            return this.newIssuer(metadata);
         });
         this.initialiseStrategy = (authOptions) => __awaiter(this, void 0, void 0, function* () {
             this.logger.log('initialiseStrategy start');
@@ -118,16 +129,7 @@ class OpenID extends models_1.Strategy {
                 idToken: tokenset === null || tokenset === void 0 ? void 0 : tokenset.id_token,
             };
         };
-        this.verify = (tokenset, done) => __awaiter(this, void 0, void 0, function* () {
-            try {
-                const userinfo = yield this.getUserInfo(tokenset);
-                this.verifyUserInfo(tokenset, userinfo, done);
-            }
-            catch (error) {
-                done(error);
-            }
-        });
-        this.verifyUserInfo = (tokenset, userinfo, done) => {
+        this.verify = (tokenset, userinfo, done) => {
             if (!(userinfo === null || userinfo === void 0 ? void 0 : userinfo.roles)) {
                 this.logger.warn(messaging_constants_1.VERIFY_ERROR_MESSAGE_NO_ACCESS_ROLES);
                 return done(null, false, { message: messaging_constants_1.VERIFY_ERROR_MESSAGE_NO_ACCESS_ROLES });
@@ -137,55 +139,13 @@ class OpenID extends models_1.Strategy {
             this.logger.info('verify okay, user:', filteredUserinfo);
             return done(null, { tokenset: this.convertTokenSet(tokenset), userinfo });
         };
-        this.getUserInfo = (tokenset) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            if (!this.client || !tokenset.access_token) {
-                throw new Error('client or access token not initialised');
-            }
-            const subject = (_a = tokenset.claims()) === null || _a === void 0 ? void 0 : _a.sub;
-            if (!subject) {
-                throw new Error('ID token subject not available');
-            }
-            const openid = yield this.loadOpenIdClient();
-            return openid.fetchUserInfo(this.client, tokenset.access_token, subject);
-        });
         this.discoverIssuer = () => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const openid = yield this.loadOpenIdClient();
-            const authMethod = this.getClientAuth(openid);
-            const client = yield openid.discovery(new URL(this.options.discoveryEndpoint), this.options.clientID, {
-                client_secret: this.options.clientSecret,
-                response_types: this.options.responseTypes,
-                token_endpoint_auth_method: this.options.tokenEndpointAuthMethod,
-            }, authMethod, { timeout: Math.ceil(((_a = this.httpOptions.timeout) !== null && _a !== void 0 ? _a : 15000) / 1000) });
-            return client;
+            return yield openid_client_1.Issuer.discover(`${this.options.discoveryEndpoint}`);
         });
-        this.getClientAuth = (openid) => {
-            switch (this.options.tokenEndpointAuthMethod) {
-                case 'client_secret_basic':
-                    return openid.ClientSecretBasic(this.options.clientSecret);
-                case 'client_secret_post':
-                    return openid.ClientSecretPost(this.options.clientSecret);
-                case 'client_secret_jwt':
-                    return openid.ClientSecretJwt(this.options.clientSecret);
-                case 'none':
-                    return openid.None();
-                default:
-                    return undefined;
-            }
+        this.newIssuer = (metadata) => {
+            this.logger.log('newIssuer');
+            return new openid_client_1.Issuer(metadata);
         };
-        this.introspect = (accessToken) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.client)
-                throw new Error('client not initialised');
-            const openid = yield this.loadOpenIdClient();
-            return openid.tokenIntrospection(this.client, accessToken);
-        });
-        this.refresh = (refreshToken) => __awaiter(this, void 0, void 0, function* () {
-            if (!this.client)
-                throw new Error('client not initialised');
-            const openid = yield this.loadOpenIdClient();
-            return openid.refreshTokenGrant(this.client, refreshToken);
-        });
         this.useStrategy = (strategyName, strategy) => {
             passport_1.default.use(strategyName, strategy);
         };
@@ -194,41 +154,32 @@ class OpenID extends models_1.Strategy {
         // Why? - this makes the function more pure, and allows it to be easily testable.
         /* istanbul ignore next */
         this.createNewStrategy = (authOptions) => __awaiter(this, void 0, void 0, function* () {
-            this.client = yield this.discover();
-            if (!this.client) {
+            this.issuer = yield this.discover();
+            if (!this.issuer) {
                 throw new Error('auto discovery failed');
             }
-            const options = this.getOpenIDOptions(authOptions, this.client.serverMetadata());
+            const options = this.getOpenIDOptions(authOptions, this.issuer);
             this.logger.log('initialiseStrategy options', options);
+            this.client = this.getClientFromIssuer(this.issuer, options);
+            if (!this.client) {
+                throw new Error('client not initialised');
+            }
             return this.getNewStrategy(options, this.client);
         });
         /* istanbul ignore next */
-        this.getNewStrategy = (options, client) => __awaiter(this, void 0, void 0, function* () {
-            const { Strategy } = yield this.loadOpenIdPassport();
-            const strategy = new Strategy({
-                config: client,
-                name: this.strategyName,
-                scope: options.scope,
+        this.getNewStrategy = (options, client) => {
+            return new openid_client_1.Strategy({
+                client,
+                params: {
+                    prompt: oidc_constants_1.OIDC.PROMPT,
+                    scope: options.scope,
+                },
                 sessionKey: options.sessionKey,
             }, this.verify);
-            const authorizationRequestParams = strategy.authorizationRequestParams.bind(strategy);
-            strategy.authorizationRequestParams = (req, authenticateOptions) => {
-                const params = new URLSearchParams(authorizationRequestParams(req, authenticateOptions));
-                const supplied = authenticateOptions;
-                params.set('prompt', oidc_constants_1.OIDC.PROMPT);
-                if (supplied.nonce)
-                    params.set('nonce', supplied.nonce);
-                if (supplied.state)
-                    params.set('state', supplied.state);
-                return params;
-            };
-            const authenticate = strategy.authenticate;
-            strategy.authenticate = function (req, authenticateOptions) {
-                const callbackURL = authenticateOptions === null || authenticateOptions === void 0 ? void 0 : authenticateOptions.redirect_uri;
-                authenticate.call(this, req, callbackURL ? Object.assign(Object.assign({}, authenticateOptions), { callbackURL }) : authenticateOptions);
-            };
-            return strategy;
-        });
+        };
+        this.getClientFromIssuer = (issuer, options) => {
+            return new issuer.Client(options);
+        };
         this.getClient = () => {
             return this.client;
         };
@@ -241,8 +192,8 @@ class OpenID extends models_1.Strategy {
         /* istanbul ignore next */
         this.loginHandler = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
             this.logger.log('OIDC loginHandler Hit');
-            const nonce = (0, crypto_1.randomBytes)(32).toString('base64url');
-            const state = (0, crypto_1.randomBytes)(32).toString('base64url');
+            const nonce = openid_client_1.generators.nonce();
+            const state = openid_client_1.generators.state();
             const reqsession = req.session;
             const promise = new Promise((resolve) => {
                 var _a, _b;
@@ -290,7 +241,6 @@ class OpenID extends models_1.Strategy {
                 throw new Error(`this should not throw an ${error}`);
             }
         });
-        this.httpOptions = options;
         this.setHttpOptionsDefaults(options);
     }
 }

package/dist/auth/oidc/models/openid.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAiF;AASjF,wDAA+B;AAE/B,mCAAoC;AACpC,sDAAwC;AAExC,yDAA2C;AAC3C,yCAAuD;AAEvD,mEAAgF;AAChF,4CAAsD;AAiBtD,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;QAK7C;;;WAGG;QACH,0BAA0B;QACnB,2BAAsB,GAAG,CAAC,OAAoB,EAAQ,EAAE;YAC3D,IAAI,CAAC,WAAW,mBAAK,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,KAAK,IAAK,OAAO,CAAE,CAAA;QAC/D,CAAC,CAAA;QAED,6EAA6E;QACtE,qBAAgB,GAAG,GAA4C,EAAE;YACpE,OAAO,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC,eAAe,CAAC,CAAA;QAC7E,CAAC,CAAA;QAED,6EAA6E;QACtE,uBAAkB,GAAG,GAAkC,EAAE;YAC5D,OAAO,QAAQ,CAAC,WAAW,EAAE,0BAA0B,CAAC,CAAC,wBAAwB,CAAC,CAAA;QACtF,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,aAAa;gBACzC,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,UAAU,EAAE,WAAW,CAAC,UAAU;gBAClC,0BAA0B,EAAE,WAAW,CAAC,uBAAuB;gBAC/D,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;gBAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,CAAA;gBAC/B,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,cAAc,GAAG,sBAAsB,CAAC,CAAA;gBAE9E,IAAI,kBAAkB,EAAE,CAAC;oBACrB,IAAI,CAAC;wBACD,IAAI,qBAAqB,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAA;wBAEnE,IAAI,aAAa,EAAE,CAAC;4BAChB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;4BACzC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAA;4BAC/D,qBAAqB,GAAG,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,CAAA,IAAI,CAAC,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,GAAG,CAAA,IAAI,aAAa,CAAC,GAAG,IAAI,GAAG,CAAA;wBACrG,CAAC;wBAED,IAAI,qBAAqB,EAAE,CAAC;4BACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAA;4BAE5C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAA;4BAEnF,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAA;4BAElE,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;gCACvD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,CAAC,CAAA;gCACjF,OAAO,IAAI,EAAE,CAAA;4BACjB,CAAC;iCAAM,CAAC;gCACJ,GAAG,CAAC,SAAS,GAAG,IAAI,CAAA;gCACpB,IAAI,CAAC,IAAI,CAAC,qBAAI,CAAC,KAAK,CAAC,oBAAoB,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;gCAC1D,OAAM;4BACV,CAAC;wBACL,CAAC;oBACL,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAA;wBACzC,IAAI,CAAC,CAAC,CAAC,CAAA;oBACX,CAAC;gBACL,CAAC;YACL,CAAC;YACD,IAAI,EAAE,CAAA;QACV,CAAC,CAAA,CAAA;QAEM,aAAQ,GAAG,GAAiC,EAAE;YACjD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAAA;YAC3E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAA;YAC1C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;YAC7D,OAAO,MAAM,CAAA;QACjB,CAAC,CAAA,CAAA;QAEM,uBAAkB,GAAG,CAAO,WAAwB,EAAiB,EAAE;YAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YAC3C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAA;YAC1D,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;YAC7C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;QAC7C,CAAC,CAAA,CAAA;QAEM,oBAAe,GAAG,CAAC,QAA8B,EAAO,EAAE;YAC7D,OAAO;gBACH,WAAW,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY;gBACnC,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,aAAa;gBACrC,OAAO,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ;aAC9B,CAAA;QACL,CAAC,CAAA;QAEM,WAAM,GAAG,CACZ,QAAkB,EAClB,IAAmD,EACtC,EAAE;YACf,IAAI,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;gBACjD,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAA;YACjD,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,CAAC,CAAA;YACf,CAAC;QACL,CAAC,CAAA,CAAA;QAEM,mBAAc,GAAG,CACpB,QAAkB,EAClB,QAA0B,EAC1B,IAAmD,EAC/C,EAAE;YACN,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,CAAA,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0DAAoC,CAAC,CAAA;gBACtD,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,0DAAoC,EAAE,CAAC,CAAA;YAC/E,CAAC;YACD,MAAM,WAAW,GAAG,CAAC,aAAa,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;YACtE,MAAM,gBAAgB,GAAG,MAAM,CAAC,WAAW,CACvC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CACxE,CAAA;YACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,gBAAgB,CAAC,CAAA;YAExD,OAAO,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAA;QAC7E,CAAC,CAAA;QAEM,gBAAW,GAAG,CAAO,QAAkB,EAA6B,EAAE;;YACzE,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC;gBACzC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAA;YAC7D,CAAC;YACD,MAAM,OAAO,GAAG,MAAA,QAAQ,CAAC,MAAM,EAAE,0CAAE,GAAG,CAAA;YACtC,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;YACrD,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC5C,OAAO,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAA;QAC5E,CAAC,CAAA,CAAA;QAEM,mBAAc,GAAG,GAAiC,EAAE;;YACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC5C,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YAC7C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CACjC,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,EACvC,IAAI,CAAC,OAAO,CAAC,QAAQ,EACrB;gBACI,aAAa,EAAE,IAAI,CAAC,OAAO,CAAC,YAAY;gBACxC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa;gBAC1C,0BAA0B,EAAE,IAAI,CAAC,OAAO,CAAC,uBAAuB;aACnE,EACD,UAAU,EACV,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,MAAA,IAAI,CAAC,WAAW,CAAC,OAAO,mCAAI,KAAK,CAAC,GAAG,IAAI,CAAC,EAAE,CACrE,CAAA;YACD,OAAO,MAAM,CAAA;QACjB,CAAC,CAAA,CAAA;QAEO,kBAAa,GAAG,CAAC,MAAsC,EAA0B,EAAE;YACvF,QAAQ,IAAI,CAAC,OAAO,CAAC,uBAAuB,EAAE,CAAC;gBAC3C,KAAK,qBAAqB;oBACtB,OAAO,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC9D,KAAK,oBAAoB;oBACrB,OAAO,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC7D,KAAK,mBAAmB;oBACpB,OAAO,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAA;gBAC5D,KAAK,MAAM;oBACP,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;gBACxB;oBACI,OAAO,SAAS,CAAA;YACxB,CAAC;QACL,CAAC,CAAA;QAEM,eAAU,GAAG,CAAO,WAAmB,EAAkC,EAAE;YAC9E,IAAI,CAAC,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC5C,OAAO,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,MAAM,EAAE,WAAW,CAAC,CAAA;QAC9D,CAAC,CAAA,CAAA;QAEM,YAAO,GAAG,CAAO,YAAoB,EAAqB,EAAE;YAC/D,IAAI,CAAC,IAAI,CAAC,MAAM;gBAAE,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAA;YAC3D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAA;YAC5C,OAAO,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;QAC9D,CAAC,CAAA,CAAA;QAEM,gBAAW,GAAG,CAAC,YAAoB,EAAE,QAA0B,EAAQ,EAAE;YAC5E,kBAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QACxC,CAAC,CAAA;QAED,yEAAyE;QACzE,yEAAyE;QACzE,iFAAiF;QACjF,0BAA0B;QACnB,sBAAiB,GAAG,CAAO,WAAwB,EAA6B,EAAE;YACrF,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAA;YACnC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;gBACf,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;YAC5C,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,gBAAgB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE,CAAC,CAAA;YAChF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,EAAE,OAAO,CAAC,CAAA;YACtD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;QACpD,CAAC,CAAA,CAAA;QACD,0BAA0B;QACnB,mBAAc,GAAG,CAAO,OAAuB,EAAE,MAAqB,EAA6B,EAAE;YACxG,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAA;YACpD,MAAM,QAAQ,GAAG,IAAI,QAAQ,CACzB;gBACI,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,IAAI,CAAC,YAAY;gBACvB,KAAK,EAAE,OAAO,CAAC,KAAK;gBACpB,UAAU,EAAE,OAAO,CAAC,UAAU;aACjC,EACD,IAAI,CAAC,MAAM,CACd,CAAA;YACD,MAAM,0BAA0B,GAAG,QAAQ,CAAC,0BAA0B,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;YACrF,QAAQ,CAAC,0BAA0B,GAAG,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;gBAC/D,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC,0BAA0B,CAAC,GAAG,EAAE,mBAAmB,CAAC,CAAC,CAAA;gBACxF,MAAM,QAAQ,GAAG,mBAA0B,CAAA;gBAC3C,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,qBAAI,CAAC,MAAM,CAAC,CAAA;gBACjC,IAAI,QAAQ,CAAC,KAAK;oBAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACvD,IAAI,QAAQ,CAAC,KAAK;oBAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAA;gBACvD,OAAO,MAAM,CAAA;YACjB,CAAC,CAAA;YACD,MAAM,YAAY,GAAG,QAAQ,CAAC,YAAY,CAAA;YAC1C,QAAQ,CAAC,YAAY,GAAG,UAAU,GAAY,EAAE,mBAAwB;gBACpE,MAAM,WAAW,GAAG,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,YAAY,CAAA;gBACrD,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,EAAE,WAAW,CAAC,CAAC,iCAAM,mBAAmB,KAAE,WAAW,IAAG,CAAC,CAAC,mBAAmB,CAAC,CAAA;YAC7G,CAAC,CAAA;YACD,OAAO,QAAQ,CAAA;QACnB,CAAC,CAAA,CAAA;QAEM,cAAS,GAAG,GAA8B,EAAE;YAC/C,OAAO,IAAI,CAAC,MAAM,CAAA;QACtB,CAAC,CAAA;QAED;;;;;WAKG;QACH,0BAA0B;QACnB,iBAAY,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAA2B,EAAE;YACrG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;YAExC,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;YACnD,MAAM,KAAK,GAAG,IAAA,oBAAW,EAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;YACnD,MAAM,UAAU,GAAG,GAAG,CAAC,OAAwB,CAAA;YAE/C,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;;gBACpC,IAAI,GAAG,CAAC,OAAO,KAAI,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU,CAAA,EAAE,CAAC;oBAC1C,UAAU,CAAC,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU,CAAC,GAAG,EAAE,KAAK,EAAE,CAAA;oBAChD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;oBAC1C,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE;wBAClB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;wBACzC,OAAO,CAAC,IAAI,CAAC,CAAA;oBACjB,CAAC,CAAC,CAAA;gBACN,CAAC;qBAAM,CAAC;oBACJ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAA;oBAC1D,OAAO,CAAC,KAAK,CAAC,CAAA;gBAClB,CAAC;YACL,CAAC,CAAC,CAAA;YAEF,IAAI,CAAC;gBACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;gBACxD,MAAM,OAAO,CAAA;gBACb,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,+BAA+B,CAAC,CAAA;gBAChD,MAAM,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;gBACxC,OAAO,kBAAQ,CAAC,YAAY,CACxB,IAAI,CAAC,YAAY,EACjB,8BACI,YAAY,EAAE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EACrC,KAAK;oBACL,KAAK,IACF,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAC/C,eAAe,EAAE,KAAK,EACtB,cAAc,EAAE,IAAI,GAChB,EACR,CAAC,KAAU,EAAE,IAAS,EAAE,IAAS,EAAE,EAAE;oBACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;oBAExC,IAAI,KAAK,EAAE,CAAC;wBACR,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA;oBAC/F,CAAC;oBACD,0BAA0B;oBAC1B,IAAI,IAAI,EAAE,CAAC;wBACP,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,oBAAoB,CAAC,CAAC,CAAA;oBAC5F,CAAC;oBACD,0BAA0B;oBAC1B,IAAI,IAAI,EAAE,CAAC;wBACP,MAAM,OAAO,GAAG,6DAA6D,CAAA;wBAC7E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAC5B,CAAC;oBACD,IAAI,CAAC,IAAI,EAAE,CAAC;wBACR,MAAM,OAAO,GAAG,gEAAgE,CAAA;wBAChF,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAC5B,CAAC;gBACL,CAAC,CACJ,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YACrB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAA;gBACnD,MAAM,IAAI,KAAK,CAAC,4BAA4B,KAAK,EAAE,CAAC,CAAA;YACxD,CAAC;QACL,CAAC,CAAA,CAAA;QA3TG,IAAI,CAAC,WAAW,GAAG,OAAO,CAAA;QAC1B,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAA;IACxC,CAAC;CA0TJ;AAtUD,wBAsUC;AAEY,QAAA,IAAI,GAAG,IAAI,MAAM,EAAE,CAAA"}
+{"version":3,"file":"openid.class.js","sourceRoot":"","sources":["../../../../src/auth/oidc/models/openid.class.ts"],"names":[],"mappings":"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"}

package/dist/auth/s2s/s2s.class.d.ts

@@ -26,8 +26,8 @@ export declare class S2SAuth extends EventEmitter {
     getToken: () => S2SToken;
     deleteCachedToken: () => void;
     private generateToken;
-    private postS2SLease;
-    serviceTokenGenerator: () => Promise<string>;
+    private readonly postS2SLease;
+    serviceTokenGenerator: () => Promise<string | undefined>;
     /**
      * Get all the events that this strategy emits
      * @return string[]

package/dist/auth/s2s/s2s.class.d.ts.map

@@ -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,CAanB;IAEM,qBAAqB,QAAa,OAAO,CAAC,MAAM,CAAC,CAOvD;IAED;;;OAGG;IACI,SAAS,QAAO,MAAM,EAAE,CAE9B;CACJ;AAED,eAAO,MAAM,GAAG,SAAgB,CAAA"}
+{"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,CAgBpB;IAED,OAAO,CAAC,QAAQ,CAAC,YAAY,CAa5B;IAEM,qBAAqB,QAAa,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAOnE;IAED;;;OAGG;IACI,SAAS,QAAO,MAAM,EAAE,CAE9B;CACJ;AAED,eAAO,MAAM,GAAG,SAAgB,CAAA"}

package/dist/auth/s2s/s2s.class.js

@@ -8,14 +8,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.s2s = exports.S2SAuth = void 0;
 const events_1 = require("events");
 const express_1 = require("express");
-const jwt_decode_1 = __importDefault(require("jwt-decode"));
+const jwt_decode_1 = require("jwt-decode");
 const otplib_1 = require("otplib");
 const common_1 = require("../../common");
 const s2s_constants_1 = require("./s2s.constants");
@@ -83,7 +80,10 @@ class S2SAuth extends events_1.EventEmitter {
         this.generateToken = () => __awaiter(this, void 0, void 0, function* () {
             this.logger.info('Generating new S2S token');
             const token = yield this.postS2SLease();
-            const tokenData = (0, jwt_decode_1.default)(token);
+            if (!token) {
+                return undefined;
+            }
+            const tokenData = (0, jwt_decode_1.jwtDecode)(token);
             this.store[this.s2sConfig.microservice] = {
                 expiresAt: tokenData.exp,
                 token,

package/dist/auth/s2s/s2s.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"s2s.class.js","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"s2s.class.js","sourceRoot":"","sources":["../../../src/auth/s2s/s2s.class.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,mCAAqC;AACrC,qCAAiF;AACjF,2CAAsC;AACtC,mCAAsE;AACtE,yCAAyD;AAEzD,mDAAqC;AAIrC,MAAa,OAAQ,SAAQ,qBAAY;IAcrC,YAAY,SAAoB,IAAA,kBAAS,EAAC,UAAU,CAAC;QACjD,KAAK,EAAE,CAAA;QAdQ,WAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAA;QAE/C,cAAS,GAAc;YAC7B,YAAY,EAAE,EAAE;YAChB,cAAc,EAAE,EAAE;YAClB,SAAS,EAAE,EAAE;SAChB,CAAA;QAED,oDAAoD;QAC1C,UAAK,GAAgC,EAAE,CAAA;QASjD;;;;;;WAMG;QACI,cAAS,GAAG,CAAC,SAAoB,EAAE,KAAmC,EAAkB,EAAE;YAC7F,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;YAC1B,IAAI,KAAK,EAAE,CAAC;gBACR,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YACtB,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAA;YAEhC,OAAO,IAAI,CAAC,MAAM,CAAA;QACtB,CAAC,CAAA;QAEM,eAAU,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAiB,EAAE;YACzF,IAAI,CAAC;gBACD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAA;gBAEhD,IAAI,KAAK,EAAE,CAAC;oBACR,GAAG,CAAC,OAAO,CAAC,oBAAoB,GAAG,UAAU,KAAK,EAAE,CAAA;oBAEpD,qGAAqG;oBACrG,uDAAuD;oBACvD,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,mBAAG,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE,CAAC;wBACtD,OAAO,IAAI,EAAE,CAAA;oBACjB,CAAC;yBAAM,CAAC;wBACJ,IAAI,CAAC,IAAI,CAAC,mBAAG,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;wBAChE,OAAM;oBACV,CAAC;gBACL,CAAC;YACL,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,CAAC,CAAA;YACf,CAAC;QACL,CAAC,CAAA,CAAA;QAEM,kBAAa,GAAG,GAAY,EAAE;YACjC,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;YACjD,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC3C,OAAO,KAAK,CAAA;YAChB,CAAC;YACD,OAAO,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,SAAS,CAAA;QAC1E,CAAC,CAAA;QAEM,aAAQ,GAAG,GAAa,EAAE;YAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;QAClD,CAAC,CAAA;QAEM,sBAAiB,GAAG,GAAS,EAAE;YAClC,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CAAC;gBAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAA;YAClD,CAAC;QACL,CAAC,CAAA;QAEO,kBAAa,GAAG,GAAsC,EAAE;YAC5D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;YAE5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAA;YACvC,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,OAAO,SAAS,CAAA;YACpB,CAAC;YAED,MAAM,SAAS,GAAe,IAAA,sBAAS,EAAC,KAAK,CAAC,CAAA;YAE9C,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,GAAG;gBACtC,SAAS,EAAE,SAAS,CAAC,GAAG;gBACxB,KAAK;aACI,CAAA;YAEb,OAAO,KAAK,CAAA;QAChB,CAAC,CAAA,CAAA;QAEgB,iBAAY,GAAG,GAAsC,EAAE;YACpE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,SAAS,CAAA;YAClE,MAAM,WAAW,GAAG,IAAI,0BAAiB,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;YAC7D,MAAM,UAAU,GAAG,IAAA,yBAAgB,EAAC,EAAE,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAA;YAC7E,MAAM,eAAe,GAAG,MAAM,IAAA,iBAAQ,EAAC,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAA;YAC3F,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wCAAwC,EAAE,YAAY,CAAC,CAAA;YAExE,MAAM,OAAO,GAAG,MAAM,aAAI,CAAC,IAAI,CAAC,GAAG,cAAc,EAAE,EAAE;gBACjD,YAAY;gBACZ,eAAe;aAClB,CAAC,CAAA;YAEF,OAAO,OAAO,CAAC,IAAI,CAAA;QACvB,CAAC,CAAA,CAAA;QAEM,0BAAqB,GAAG,GAAsC,EAAE;YACnE,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;gBACvB,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAA;gBACjC,OAAO,SAAS,CAAC,KAAK,CAAA;YAC1B,CAAC;iBAAM,CAAC;gBACJ,OAAO,MAAM,IAAI,CAAC,aAAa,EAAE,CAAA;YACrC,CAAC;QACL,CAAC,CAAA,CAAA;QAED;;;WAGG;QACI,cAAS,GAAG,GAAa,EAAE;YAC9B,OAAO,MAAM,CAAC,MAAM,CAAS,mBAAG,CAAC,KAAK,CAAC,CAAA;QAC3C,CAAC,CAAA;QA3GG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;IACxB,CAAC;CA2GJ;AA5HD,0BA4HC;AAEY,QAAA,GAAG,GAAG,IAAI,OAAO,EAAE,CAAA"}

package/dist/session/models/redisSessionStore.class.d.ts

@@ -1,15 +1,16 @@
 import { RedisSessionMetadata } from './sessionMetadata.interface';
-import { default as connectRedis } from 'connect-redis';
-import * as redis from 'redis';
+import { RedisStore } from 'connect-redis';
+import { RedisClientType } from 'redis';
 import { SessionStore } from './sessionStore.class';
 import { XuiLogger } from '../../common';
 export declare class RedisSessionStore extends SessionStore {
-    protected redisClient: redis.RedisClient | any;
+    protected redisClient: RedisClientType;
     constructor(router?: import("express-serve-static-core").Router, logger?: XuiLogger);
-    getStore: (options: RedisSessionMetadata) => connectRedis.RedisStore;
-    redisClientReadyListener: (redisClient: redis.RedisClient) => void;
-    redisClientErrorListener: (redisClient: redis.RedisClient) => void;
+    getStore: (options: RedisSessionMetadata) => RedisStore;
+    redisClientReadyListener: (redisClient: RedisClientType) => void;
+    redisClientErrorListener: (redisClient: RedisClientType) => void;
     emitEvent: (eventName: string, eventObject: any) => void;
+    normalizeRedisUrl: (redisCloudUrl: string) => string;
 }
 export declare const redisStore: RedisSessionStore;
 //# sourceMappingURL=redisSessionStore.class.d.ts.map

package/dist/session/models/redisSessionStore.class.d.ts.map

@@ -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;AAElE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,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,EAAE,KAAK,CAAC,WAAW,GAAG,GAAG,CAAA;gBAElC,MAAM,6CAAgC,EAAE,MAAM,GAAE,SAAsC;IAI3F,QAAQ,GAAI,SAAS,oBAAoB,KAAG,YAAY,CAAC,UAAU,CAezE;IAKM,wBAAwB,GAAI,aAAa,KAAK,CAAC,WAAW,UAMhE;IAEM,wBAAwB,GAAI,aAAa,KAAK,CAAC,WAAW,UAMhE;IAEM,SAAS,GAAI,WAAW,MAAM,EAAE,aAAa,GAAG,UAItD;CACJ;AAED,eAAO,MAAM,UAAU,mBAA0B,CAAA"}
+{"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"}

package/dist/session/models/redisSessionStore.class.js

@@ -1,46 +1,9 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.redisStore = exports.RedisSessionStore = void 0;
 const session_constants_1 = require("../session.constants");
-const express_session_1 = __importDefault(require("express-session"));
-const connect_redis_1 = __importDefault(require("connect-redis"));
-const redis = __importStar(require("redis"));
+const connect_redis_1 = require("connect-redis");
+const redis_1 = require("redis");
 const sessionStore_class_1 = require("./sessionStore.class");
 const express_1 = require("express");
 const common_1 = require("../../common");
@@ -48,16 +11,23 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
     constructor(router = (0, express_1.Router)({ mergeParams: true }), logger = (0, common_1.getLogger)('session:redis')) {
         super(session_constants_1.SESSION.REDIS_STORE_NAME, router, logger);
         this.getStore = (options) => {
-            const tlsOptions = {
-                prefix: options.redisStoreOptions.redisKeyPrefix,
-            };
-            this.redisClient = redis.createClient(options.redisStoreOptions.redisCloudUrl, tlsOptions);
+            const ttl = options.redisStoreOptions.redisTtl === undefined
+                ? undefined
+                : Number(options.redisStoreOptions.redisTtl);
+            const redisCloudUrl = this.normalizeRedisUrl(options.redisStoreOptions.redisCloudUrl);
+            this.redisClient = (0, redis_1.createClient)({
+                url: redisCloudUrl,
+            });
             this.redisClientReadyListener(this.redisClient);
             this.redisClientErrorListener(this.redisClient);
-            const redisStore = (0, connect_redis_1.default)(express_session_1.default);
-            return new redisStore({
+            this.redisClient.connect().catch((error) => {
+                this.logger.error(error);
+                this.emitEvent(session_constants_1.SESSION.EVENT.REDIS_CLIENT_ERROR, error);
+            });
+            return new connect_redis_1.RedisStore({
                 client: this.redisClient,
-                ttl: options.redisStoreOptions.redisTtl,
+                prefix: options.redisStoreOptions.redisKeyPrefix,
+                ttl,
             });
         };
         // TODO: This should be a pure function. Remove side effecting on redisClient,
@@ -82,6 +52,25 @@ class RedisSessionStore extends sessionStore_class_1.SessionStore {
                 this.emit(eventName, eventObject);
             }
         };
+        // Keep compatibility with legacy Azure-style URLs: redis://...?...&tls=true
+        // redis@6 expects TLS via rediss:// or socket.tls.
+        this.normalizeRedisUrl = (redisCloudUrl) => {
+            var _a;
+            try {
+                const parsedRedisUrl = new URL(redisCloudUrl);
+                const tlsEnabledViaQuery = ((_a = parsedRedisUrl.searchParams.get('tls')) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'true';
+                if (tlsEnabledViaQuery && parsedRedisUrl.protocol === 'redis:') {
+                    parsedRedisUrl.protocol = 'rediss:';
+                    parsedRedisUrl.searchParams.delete('tls');
+                    return parsedRedisUrl.toString();
+                }
+                return redisCloudUrl;
+            }
+            catch (_b) {
+                // Preserve previous behavior if URL parsing fails.
+                return redisCloudUrl;
+            }
+        };
     }
 }
 exports.RedisSessionStore = RedisSessionStore;

package/dist/session/models/redisSessionStore.class.js.map

@@ -1 +1 @@
-{"version":3,"file":"redisSessionStore.class.js","sourceRoot":"","sources":["../../../src/session/models/redisSessionStore.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA8C;AAE9C,sEAAqC;AACrC,kEAAuD;AACvD,6CAA8B;AAC9B,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,EAA2B,EAAE;YACzE,MAAM,UAAU,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,iBAAiB,CAAC,cAAc;aACnD,CAAA;YAED,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC,YAAY,CAAC,OAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;YAE1F,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAC/C,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YAE/C,MAAM,UAAU,GAAG,IAAA,uBAAY,EAAC,yBAAO,CAAC,CAAA;YACxC,OAAO,IAAI,UAAU,CAAC;gBAClB,MAAM,EAAE,IAAI,CAAC,WAAW;gBACxB,GAAG,EAAE,OAAO,CAAC,iBAAiB,CAAC,QAAQ;aAC1C,CAAC,CAAA;QACN,CAAC,CAAA;QAED,8EAA8E;QAC9E,gFAAgF;QAChF,mCAAmC;QAC5B,6BAAwB,GAAG,CAAC,WAA8B,EAAE,EAAE;YACjE,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,WAA8B,EAAE,EAAE;YACjE,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;IA1CD,CAAC;CA2CJ;AAhDD,8CAgDC;AAEY,QAAA,UAAU,GAAG,IAAI,iBAAiB,EAAE,CAAA"}
+{"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;YAChD,MAAM,aAAa,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAA;YAErF,IAAI,CAAC,WAAW,GAAG,IAAA,oBAAY,EAAC;gBAC5B,GAAG,EAAE,aAAa;aACrB,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;QAED,4EAA4E;QAC5E,mDAAmD;QAC5C,sBAAiB,GAAG,CAAC,aAAqB,EAAU,EAAE;;YACzD,IAAI,CAAC;gBACD,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,CAAA;gBAC7C,MAAM,kBAAkB,GAAG,CAAA,MAAA,cAAc,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,0CAAE,WAAW,EAAE,MAAK,MAAM,CAAA;gBAE3F,IAAI,kBAAkB,IAAI,cAAc,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC7D,cAAc,CAAC,QAAQ,GAAG,SAAS,CAAA;oBACnC,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;oBACzC,OAAO,cAAc,CAAC,QAAQ,EAAE,CAAA;gBACpC,CAAC;gBAED,OAAO,aAAa,CAAA;YACxB,CAAC;YAAC,WAAM,CAAC;gBACL,mDAAmD;gBACnD,OAAO,aAAa,CAAA;YACxB,CAAC;QACL,CAAC,CAAA;IAtED,CAAC;CAuEJ;AA5ED,8CA4EC;AAEY,QAAA,UAAU,GAAG,IAAI,iBAAiB,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-node-lib",
-  "version": "2.30.21-openid-client",
+  "version": "2.30.21-package-update-03",
   "description": "Common nodejs library components for XUI",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -50,7 +50,6 @@
     "@semantic-release/changelog": "^6.0.3",
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^8.1.0",
-    "@types/connect-redis": "^0.0.23",
     "@types/debug": "^4.1.5",
     "@types/express": "^5.0.0",
     "@types/express-session": "1.17.10",
@@ -84,20 +83,20 @@
     }
   },
   "dependencies": {
-    "@dr.pogodin/csurf": "^1.14.0",
+    "@dr.pogodin/csurf": "^1.16.9",
     "axios": "^1.18.1",
-    "connect-redis": "^4.0.4",
-    "debug": "^4.3.7",
-    "deepmerge": "^4.2.2",
+    "connect-redis": "^9.0.0",
+    "debug": "^4.4.3",
+    "deepmerge": "^4.3.1",
     "express": "^5.2.1",
     "express-session": "^1.17.0",
     "joi": "^18.1.2",
-    "jwt-decode": "^3.1.2",
-    "openid-client": "6.8.4",
+    "jwt-decode": "^4.0.0",
+    "openid-client": "^5.7.1",
     "otplib": "^13.4.0",
     "passport": "^0.7.0",
     "passport-oauth2": "^1.8.0",
-    "redis": "^3.0.2",
+    "redis": "^6.1.0",
     "session-file-store": "^1.5.0"
   },
   "resolutions": {