@hmcts/rpx-xui-node-lib 2.30.8-csurf-deprecated → 2.30.8-exui-4295-axios-update

package/README.md

@@ -108,4 +108,4 @@ which the object generated by this Node API can be transfered into.
 @see https://github.com/hmcts/rpx-xui-common-lib#timeout-notification-service
 for an example of how to integrate the Timeout Notification Service and Timeout Notification Service Modal.
 
-END2
+END2

package/dist/auth/models/authOptions.interface.d.ts

@@ -16,6 +16,7 @@ export interface AuthOptions {
     useCSRF?: boolean;
     routeCredential?: RouteCredential;
     serviceOverride?: boolean;
+    ssoLogoutURL?: string;
 }
 export interface RouteCredential {
     userName: string;

package/dist/auth/models/authOptions.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authOptions.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/authOptions.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,eAAe,CAAC,EAAE,OAAO,CAAA;CAC5B;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CAChB"}
+{"version":3,"file":"authOptions.interface.d.ts","sourceRoot":"","sources":["../../../src/auth/models/authOptions.interface.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,WAAW;IACxB,gBAAgB,EAAE,MAAM,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,YAAY,EAAE,MAAM,CAAA;IACpB,WAAW,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,iBAAiB,EAAE,MAAM,CAAA;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,aAAa,EAAE,MAAM,EAAE,CAAA;IACvB,uBAAuB,EAAE,MAAM,CAAA;IAC/B,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,eAAe,CAAC,EAAE,eAAe,CAAA;IACjC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAA;CACxB;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,EAAE,MAAM,CAAA;IAChB,QAAQ,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,KAAK,EAAE,MAAM,CAAA;CAChB"}

package/dist/auth/models/strategy.class.d.ts

@@ -2,18 +2,16 @@ import * as events from 'events';
 import { NextFunction, Request, RequestHandler, Response, Router } from 'express';
 import { XuiLogger } from '../../common';
 import { AuthOptions } from './authOptions.interface';
-declare module 'express-serve-static-core' {
-    interface Request {
-        csrfToken?: () => string;
-    }
-}
 export declare abstract class Strategy extends events.EventEmitter {
+    protected static readonly REDACTED_LOG_VALUE = "[REDACTED]";
+    private static readonly SENSITIVE_LOG_KEY_PATTERN;
     readonly strategyName: string;
     protected readonly router: Router;
     protected readonly logger: XuiLogger;
     protected options: AuthOptions;
     protected constructor(strategyName: string, router: Router, logger?: XuiLogger);
     validateOptions(options: any): boolean;
+    protected redactingLogReplacer: (key: string, value: any) => any;
     initialiseStrategy: (options: any) => Promise<void>;
     private saveStateInSession;
     /**
@@ -24,7 +22,7 @@ export declare abstract class Strategy extends events.EventEmitter {
      */
     loginHandler: (req: Request, res: Response, next: NextFunction) => Promise<RequestHandler>;
     setCallbackURL: (req: Request, _res: Response, next: NextFunction) => void;
-    logout: (req: Request, res: Response, next: NextFunction) => Promise<void>;
+    logout: (req: Request, res: Response) => Promise<void>;
     authRouteHandler: (req: Request, res: Response) => Response;
     destroySession: (req: Request) => Promise<any>;
     keepAliveHandler: (_req: Request, _res: Response, next: NextFunction) => void;

package/dist/auth/models/strategy.class.d.ts.map

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

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

@@ -50,10 +50,10 @@ const events = __importStar(require("events"));
 const passport_1 = __importDefault(require("passport"));
 const auth_constants_1 = require("../auth.constants");
 const common_1 = require("../../common");
-const joi_1 = __importDefault(require("joi"));
+const joi_1 = __importDefault(require("@hapi/joi"));
 const URL = __importStar(require("url"));
 const openid_client_1 = require("openid-client");
-const csurf_1 = __importDefault(require("@dr.pogodin/csurf"));
+const csurf_1 = __importDefault(require("csurf"));
 const jwt_decode_1 = __importDefault(require("jwt-decode"));
 class Strategy extends events.EventEmitter {
     constructor(strategyName, router, logger = (0, common_1.getLogger)('auth:strategy')) {
@@ -78,11 +78,17 @@ class Strategy extends events.EventEmitter {
             routeCredential: undefined,
             serviceOverride: false,
         };
+        this.redactingLogReplacer = (key, value) => {
+            if (key && Strategy.SENSITIVE_LOG_KEY_PATTERN.test(key)) {
+                return Strategy.REDACTED_LOG_VALUE;
+            }
+            return value;
+        };
         /* istanbul ignore next */
         this.initialiseStrategy = (options) => __awaiter(this, void 0, void 0, function* () {
             this.options = options;
             this.logger.log('initialising strategy, options:');
-            this.logger.log(JSON.stringify(options));
+            this.logger.log(JSON.stringify(options, this.redactingLogReplacer));
         });
         /**
          * The login route handler will attempt to setup security state param and redirect user if not authenticated
@@ -105,16 +111,15 @@ class Strategy extends events.EventEmitter {
                 return passport_1.default.authenticate(this.strategyName, {
                     redirect_uri: reqSession === null || reqSession === void 0 ? void 0 : reqSession.callbackURL,
                     state,
-                    keepSessionInfo: true,
                 }, (error, user, info) => {
                     var _a;
                     /* istanbul ignore next */
                     if (error) {
-                        this.logger.error('passport authenticate error ', JSON.stringify(error));
+                        this.logger.error('passport authenticate error ', JSON.stringify(error, this.redactingLogReplacer));
                     }
                     /* istanbul ignore next */
                     if (info) {
-                        this.logger.info('passport authenticate info', JSON.stringify(info));
+                        this.logger.info('passport authenticate info', JSON.stringify(info, this.redactingLogReplacer));
                     }
                     /* istanbul ignore next */
                     if (!user) {
@@ -137,6 +142,21 @@ class Strategy extends events.EventEmitter {
         this.setCallbackURL = (req, _res, next) => {
             var _a;
             const reqSession = req.session;
+            // Always ensure callbackURL is set to a non-empty string
+            const hasValidSessionCallback = typeof reqSession.callbackURL === 'string' &&
+                reqSession.callbackURL.trim().length > 0;
+            const hasValidOptionCallback = typeof this.options.callbackURL === 'string' &&
+                this.options.callbackURL.trim().length > 0;
+            if (!hasValidSessionCallback) {
+                req.app.set('trust proxy', true);
+                const pathname = hasValidOptionCallback ? this.options.callbackURL.trim() : req.originalUrl;
+                reqSession.callbackURL = URL.format({
+                    protocol: req.protocol,
+                    host: req.get('host'),
+                    pathname,
+                });
+            }
+            // 🔍 Log current config and session key status
             this.logger.log(`setCallbackURL, options.callbackurl: ${this.options.callbackURL}`);
             if (this.options.sessionKey) {
                 const sessionKey = this.options.sessionKey;
@@ -146,20 +166,10 @@ class Strategy extends events.EventEmitter {
             else {
                 this.logger.log('sessionKey not set');
             }
-            /* istanbul ignore else */
-            if (req.session && !reqSession.callbackURL) {
-                req.app.set('trust proxy', true);
-                reqSession.callbackURL = URL.format({
-                    protocol: req.protocol,
-                    host: req.get('host'),
-                    pathname: this.options.callbackURL,
-                });
-            }
-            /* istanbul ignore next */
             next();
         };
         /* istanbul ignore next */
-        this.logout = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
+        this.logout = (req, res) => __awaiter(this, void 0, void 0, function* () {
             const reqSession = req.session;
             try {
                 this.logger.log('logout start');
@@ -176,23 +186,26 @@ class Strategy extends events.EventEmitter {
                     },
                 });
                 //passport provides this method on request object
-                req.logout({ keepSessionInfo: true }, (err) => __awaiter(this, void 0, void 0, function* () {
-                    if (err) {
-                        console.error(err);
-                        return next(err);
-                    }
-                    yield this.destroySession(req);
-                    /* istanbul ignore next */
-                    if (req.query.noredirect) {
-                        res.status(200).send({ message: 'You have been logged out!' });
-                        return Promise.resolve();
-                    }
-                    const redirect = req.query.redirect ? req.query.redirect : auth_constants_1.AUTH.ROUTE.LOGIN;
-                    this.logger.log('redirecting to => ', redirect);
-                    // 401 is when no accessToken
-                    res.redirect(redirect);
-                    /* istanbul ignore next */
-                }));
+                req.logout((err) => {
+                    console.error(err);
+                });
+                yield this.destroySession(req);
+                /* istanbul ignore next */
+                if (req.query.noredirect) {
+                    res.status(200).send({ message: 'You have been logged out!' });
+                    return Promise.resolve();
+                }
+                const redirectUrl = URL.format({
+                    protocol: req.protocol,
+                    host: req.get('host'),
+                });
+                const params = new URLSearchParams({ post_logout_redirect_uri: redirectUrl });
+                const finalSSOLogoutUrl = `${this.options.ssoLogoutURL}?${params.toString()}`;
+                const redirect = finalSSOLogoutUrl ? finalSSOLogoutUrl : auth_constants_1.AUTH.ROUTE.LOGIN;
+                this.logger.log('redirecting to => ', redirect);
+                // 401 is when no accessToken
+                res.redirect(redirect);
+                /* istanbul ignore next */
             }
             catch (e) {
                 this.logger.error('error => ', e);
@@ -252,21 +265,23 @@ class Strategy extends events.EventEmitter {
             this.logger.log('in callbackHandler for url ' + req.url);
             const reqSession = req.session;
             const qstate = typeof req.query.state == 'string' ? req.query.state : undefined;
-            const { promise, state } = this.saveStateInSession(reqSession, qstate);
+            const INVALID_STATE_ERROR = 'Invalid authorization request state.';
             if (!qstate) {
-                req.query.state = state;
+                this.logger.log('Missing callback state in authorization response, rejecting request');
+                res.locals = res.locals || {};
+                res.locals.message = INVALID_STATE_ERROR;
+                this.emit(auth_constants_1.AUTH.EVENT.AUTHENTICATE_FAILURE, req, res, next);
+                res.redirect(auth_constants_1.AUTH.ROUTE.EXPIRED_LOGIN_LINK);
+                return;
             }
-            yield promise;
             if (this.options.sessionKey) {
                 const sessionKey = this.options.sessionKey;
                 this.logger.log(`sessionKey: ${sessionKey}`);
                 this.logger.log(`state from session = ${(_a = reqSession[sessionKey]) === null || _a === void 0 ? void 0 : _a.state}`);
-                this.logger.log('session data:' + JSON.stringify(reqSession));
             }
             else {
                 this.logger.log('sessionKey not set');
             }
-            const INVALID_STATE_ERROR = 'Invalid authorization request state.';
             const LOGIN_BOOKMARK_ERROR = 'LoginBookmarkUsed :';
             const emitAuthenticationFailure = (logMessages) => {
                 this.logger.log(`inside emitAuthenticationFailure, message count ${logMessages.length}`);
@@ -284,8 +299,6 @@ class Strategy extends events.EventEmitter {
             this.logger.log(`calling passport authenticate with ${this.strategyName} strategy`);
             passport_1.default.authenticate(this.strategyName, {
                 redirect_uri: reqSession === null || reqSession === void 0 ? void 0 : reqSession.callbackURL,
-                keepSessionInfo: true,
-                failureMessage: true,
             }, (error, user, info) => {
                 var _a, _b, _c;
                 if (info) {
@@ -423,7 +436,7 @@ class Strategy extends events.EventEmitter {
                 if (this.options.allowRolesRegex && !(0, common_1.arrayPatternMatch)(roles, this.options.allowRolesRegex)) {
                     this.logger.info(JSON.stringify(user.userInfo));
                     this.logger.error(`User has no application access, as they do not have a role that matches ${this.options.allowRolesRegex}.`);
-                    return this.logout(req, res, next);
+                    return this.logout(req, res);
                 }
                 if (!this.listenerCount(auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS)) {
                     this.logger.log(`redirecting, no listener count: ${auth_constants_1.AUTH.EVENT.AUTHENTICATE_SUCCESS}, user: ${user.email}`);
@@ -459,14 +472,12 @@ class Strategy extends events.EventEmitter {
                 });
                 // cookie options added via EXUI-986, fortify issues
                 const cookieOptions = {
-                    sameSite: 'none',
+                    sameSite: 'strict',
                     secure: true,
                 };
                 /* istanbul ignore next */
                 this.router.use(csrfProtection, (req, res, next) => {
-                    if (req.csrfToken) {
-                        res.cookie('XSRF-TOKEN', req.csrfToken(), cookieOptions);
-                    }
+                    res.cookie('XSRF-TOKEN', req.csrfToken(), cookieOptions);
                     next();
                 });
             }
@@ -500,7 +511,6 @@ class Strategy extends events.EventEmitter {
         /* istanbul ignore next */
         this.deserializeUser = () => {
             passport_1.default.deserializeUser((id, done) => {
-                this.logger.log(`${this.strategyName} deserializeUser`);
                 this.emitIfListenersExist(auth_constants_1.AUTH.EVENT.DESERIALIZE_USER, id, done);
             });
         };
@@ -540,7 +550,6 @@ class Strategy extends events.EventEmitter {
         /* istanbul ignore next */
         this.emitIfListenersExist = (eventName, eventObject, done) => {
             if (!this.listenerCount(eventName)) {
-                this.logger.error('no listeners for event ' + eventName);
                 done(null, eventObject);
             }
             else {
@@ -600,6 +609,7 @@ class Strategy extends events.EventEmitter {
             useCSRF: joi_1.default.bool(),
             serviceOverride: joi_1.default.bool(),
             routeCredential: joi_1.default.any(),
+            ssoLogoutURL: joi_1.default.string(),
         });
         const { error } = schema.validate(options);
         if (error) {
@@ -632,4 +642,6 @@ class Strategy extends events.EventEmitter {
     }
 }
 exports.Strategy = Strategy;
+Strategy.REDACTED_LOG_VALUE = '[REDACTED]';
+Strategy.SENSITIVE_LOG_KEY_PATTERN = /(clientSecret|client_secret|password|token|authorization)/i;
 //# sourceMappingURL=strategy.class.js.map

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/oauth2/models/oauth2.class.js

@@ -30,7 +30,7 @@ class OAuth2 extends models_1.Strategy {
         this.getOAuthOptions = (authOptions) => {
             const options = Object.assign(Object.assign({}, authOptions), {
                 logoutUrl: authOptions.logoutURL,
-                state: '1', // this is required to have oauth strategy chose the right sessionStore
+                state: true,
             });
             delete options.logoutURL;
             return options;

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

@@ -1 +1 @@
-{"version":3,"file":"oauth2.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA+B;AAC/B,0DAA4C;AAE5C,yCAAuC;AACvC,uEAA6D;AAG7D,qCAAgC;AAChC,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAQ;IAChC,YAAY,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,SAAoB,IAAA,kBAAS,EAAC,aAAa,CAAC;QAC5F,KAAK,CAAC,yBAAM,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAG/C;;;;WAIG;QACI,oBAAe,GAAG,CAAC,WAAwB,EAAkB,EAAE;YAClE,MAAM,OAAO,mCACN,WAAW,GACX;gBACC,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,KAAK,EAAE,GAAG,EAAE,uEAAuE;aACtF,CACJ,CAAA;YACD,OAAO,OAAO,CAAC,SAAS,CAAA;YACxB,OAAO,OAAyB,CAAA;QACpC,CAAC,CAAA;QAEM,uBAAkB,GAAG,CAAO,WAAwB,EAAiB,EAAE;YAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACjD,kBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,2CAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAC5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;QAC7C,CAAC,CAAA,CAAA;QAMM,WAAM,GAAG,CACZ,WAAmB,EACnB,YAAoB,EACpB,OAAY,EACZ,OAAY,EACZ,IAAoB,EAChB,EAAE;YACN,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9E,CAAC,CAAA;IAtCD,CAAC;IA0BM,aAAa;QAChB,OAAO,kBAAQ,CAAC,UAAU,IAAI,IAAI,CAAA;IACtC,CAAC;CAWJ;AA1CD,wBA0CC;AAEY,QAAA,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA"}
+{"version":3,"file":"oauth2.class.js","sourceRoot":"","sources":["../../../../src/auth/oauth2/models/oauth2.class.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,wDAA+B;AAC/B,0DAA4C;AAE5C,yCAAuC;AACvC,uEAA6D;AAG7D,qCAAgC;AAChC,4CAAsD;AAEtD,MAAa,MAAO,SAAQ,iBAAQ;IAChC,YAAY,MAAM,GAAG,IAAA,gBAAM,EAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,EAAE,SAAoB,IAAA,kBAAS,EAAC,aAAa,CAAC;QAC5F,KAAK,CAAC,yBAAM,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,CAAC,CAAA;QAG/C;;;;WAIG;QACI,oBAAe,GAAG,CAAC,WAAwB,EAAkB,EAAE;YAClE,MAAM,OAAO,mCACN,WAAW,GACX;gBACC,SAAS,EAAE,WAAW,CAAC,SAAS;gBAChC,KAAK,EAAE,IAAI;aACd,CACJ,CAAA;YACD,OAAO,OAAO,CAAC,SAAS,CAAA;YACxB,OAAO,OAAyB,CAAA;QACpC,CAAC,CAAA;QAEM,uBAAkB,GAAG,CAAO,WAAwB,EAAiB,EAAE;YAC1E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAC,CAAA;YAC3C,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;YACjD,kBAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,2CAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;YAC5E,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,CAAC,CAAA;QAC7C,CAAC,CAAA,CAAA;QAMM,WAAM,GAAG,CACZ,WAAmB,EACnB,YAAoB,EACpB,OAAY,EACZ,OAAY,EACZ,IAAoB,EAChB,EAAE;YACN,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAA;QAC9E,CAAC,CAAA;IAtCD,CAAC;IA0BM,aAAa;QAChB,OAAO,kBAAQ,CAAC,UAAU,IAAI,IAAI,CAAA;IACtC,CAAC;CAWJ;AA1CD,wBA0CC;AAEY,QAAA,MAAM,GAAG,IAAI,MAAM,EAAE,CAAA"}

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":"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,KAAG,cAAc,CAanE;IAKM,gBAAgB,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAuC/F;IAEM,QAAQ,QAAa,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAclD;IAEM,kBAAkB,GAAU,aAAa,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAM1E;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,CAQN;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,SAAS,cAAc,KAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAUtF;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,CA2DrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}
+{"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,KAAG,cAAc,CAanE;IAKM,gBAAgB,GAAU,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,OAAO,CAAC,IAAI,CAAC,CAuC/F;IAEM,QAAQ,QAAa,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAclD;IAEM,kBAAkB,GAAU,aAAa,WAAW,KAAG,OAAO,CAAC,IAAI,CAAC,CAM1E;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,SAAS,cAAc,KAAG,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAUtF;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,CAyDrG;CACJ;AAED,eAAO,MAAM,IAAI,QAAe,CAAA"}

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

@@ -135,7 +135,9 @@ class OpenID extends models_1.Strategy {
                 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 });
             }
-            this.logger.info('verify okay, user:', userinfo);
+            const allowedKeys = ['ssoProvider', 'uid', 'identity', 'roles', 'iss'];
+            const filteredUserinfo = Object.fromEntries(Object.entries(userinfo).filter(([key]) => allowedKeys.includes(key)));
+            this.logger.info('verify okay, user:', filteredUserinfo);
             return done(null, { tokenset: this.convertTokenSet(tokenset), userinfo });
         };
         this.discoverIssuer = () => __awaiter(this, void 0, void 0, function* () {
@@ -215,16 +217,14 @@ class OpenID extends models_1.Strategy {
                     redirect_uri: reqsession === null || reqsession === void 0 ? void 0 : reqsession.callbackURL,
                     nonce,
                     state,
-                    keepSessionInfo: true,
-                    failureMessage: true,
                 }, (error, user, info) => {
                     this.logger.log('passport authenticate');
                     if (error) {
-                        this.logger.error('loginHandler error: ', JSON.stringify(error));
+                        this.logger.error('loginHandler error: ', JSON.stringify(error, this.redactingLogReplacer));
                     }
                     /* istanbul ignore next */
                     if (info) {
-                        this.logger.info('loginHandler info: ', JSON.stringify(info));
+                        this.logger.info('loginHandler info: ', JSON.stringify(info, this.redactingLogReplacer));
                     }
                     /* istanbul ignore next */
                     if (user) {

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":"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"}
+{"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.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,CAqBzF;IAEM,aAAa,QAAO,OAAO,CAOjC;IAEM,QAAQ,QAAO,QAAQ,CAE7B;IAEM,iBAAiB,QAAO,IAAI,CAIlC;IAED,OAAO,CAAC,aAAa,CAYpB;IAED,OAAO,CAAC,YAAY,CAYnB;IAEM,qBAAqB,QAAa,OAAO,CAAC,MAAM,CAAC,CAQvD;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,CAapB;IAED,OAAO,CAAC,YAAY,CAYnB;IAEM,qBAAqB,QAAa,OAAO,CAAC,MAAM,CAAC,CAOvD;IAED;;;OAGG;IACI,SAAS,QAAO,MAAM,EAAE,CAE9B;CACJ;AAED,eAAO,MAAM,GAAG,SAAgB,CAAA"}

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

@@ -49,12 +49,10 @@ class S2SAuth extends events_1.EventEmitter {
             try {
                 const token = yield this.serviceTokenGenerator();
                 if (token) {
-                    this.logger.info('Adding S2S token to request headers');
                     req.headers.ServiceAuthorization = `Bearer ${token}`;
                     // If there are no listeners for a success event from this emitter, just return this middleware using
                     // next(), else emit a success event with the S2S token
                     if (!this.listenerCount(s2s_constants_1.S2S.EVENT.AUTHENTICATE_SUCCESS)) {
-                        this.logger.info(`S2SAuth: no listener count: ${s2s_constants_1.S2S.EVENT.AUTHENTICATE_SUCCESS}`);
                         return next();
                     }
                     else {
@@ -68,7 +66,6 @@ class S2SAuth extends events_1.EventEmitter {
             }
         });
         this.validateCache = () => {
-            this.logger.info('Validating S2S token cache');
             const currentTime = Math.floor(Date.now() / 1000);
             if (!this.store[this.s2sConfig.microservice]) {
                 return false;
@@ -84,7 +81,7 @@ class S2SAuth extends events_1.EventEmitter {
             }
         };
         this.generateToken = () => __awaiter(this, void 0, void 0, function* () {
-            this.logger.info('Getting new S2S token');
+            this.logger.info('Generating new S2S token');
             const token = yield this.postS2SLease();
             const tokenData = (0, jwt_decode_1.default)(token);
             this.store[this.s2sConfig.microservice] = {
@@ -105,7 +102,6 @@ class S2SAuth extends events_1.EventEmitter {
         });
         this.serviceTokenGenerator = () => __awaiter(this, void 0, void 0, function* () {
             if (this.validateCache()) {
-                this.logger.info('Getting cached S2S token');
                 const tokenData = this.getToken();
                 return tokenData.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":"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"}

package/dist/common/models/xuiNode.class.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xuiNode.class.d.ts","sourceRoot":"","sources":["../../../src/common/models/xuiNode.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAqB,SAAS,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAE1E,qBAAa,OAAQ,SAAQ,YAAY;IACrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACjC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;IAC7B,sBAAsB,EAAE,GAAG,CAAA;gBAE9B,MAAM,GAAE,MAAsC,EAE9C,WAAW,GAAE,KAAK,CAAC,MAAM,CAAuB,EAChD,MAAM,GAAE,SAAuC;IAQ5C,YAAY,GAAI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAK5E;IAED;;;;;;;OAOG;IACI,mBAAmB,GACtB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,MAAM,YAAY,KACnB,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAU3C;IAEM,SAAS,GAAI,SAAS,cAAc,KAAG,cAAc,CAG3D;IAED;;;;;OAKG;IACI,gBAAgB,GAAU,YAAY,MAAM,2EAUlD;IAEM,eAAe,GAAU,YAAY,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAAC,CAM1F;IAEM,oBAAoB,GAAI,iBAAiB,GAAG,EAAE,SAAS,GAAG,KAAG,IAAI,CAYvE;IAED;;;OAGG;IACI,WAAW,GAAI,YAAY,0BAA0B,KAAG,IAAI,CAQlE;CACJ;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}
+{"version":3,"file":"xuiNode.class.d.ts","sourceRoot":"","sources":["../../../src/common/models/xuiNode.class.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAC3D,OAAO,EAAqB,SAAS,EAAE,MAAM,SAAS,CAAA;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAA;AAE1E,qBAAa,OAAQ,SAAQ,YAAY;IACrC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;IACjC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA;IAC7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,CAAA;IAC7B,sBAAsB,EAAE,GAAG,CAAA;gBAE9B,MAAM,GAAE,MAAsC,EAE9C,WAAW,GAAE,KAAK,CAAC,MAAM,CAAuB,EAChD,MAAM,GAAE,SAAuC;IAQ5C,YAAY,GAAI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,KAAG,IAAI,CAG5E;IAED;;;;;;;OAOG;IACI,mBAAmB,GACtB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,MAAM,YAAY,KACnB,IAAI,GAAG,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAU3C;IAEM,SAAS,GAAI,SAAS,cAAc,KAAG,cAAc,CAG3D;IAED;;;;;OAKG;IACI,gBAAgB,GAAU,YAAY,MAAM,2EAUlD;IAEM,eAAe,GAAU,YAAY,MAAM,EAAE,SAAS,cAAc,KAAG,OAAO,CAAC,IAAI,CAAC,CAM1F;IAEM,oBAAoB,GAAI,iBAAiB,GAAG,EAAE,SAAS,GAAG,KAAG,IAAI,CAYvE;IAED;;;OAGG;IACI,WAAW,GAAI,YAAY,0BAA0B,KAAG,IAAI,CAQlE;CACJ;AAED,eAAO,MAAM,OAAO,SAAgB,CAAA"}

package/dist/common/models/xuiNode.class.js

@@ -53,9 +53,7 @@ class XuiNode extends events_1.EventEmitter {
         super();
         this.authenticate = (req, res, next) => {
             const authMiddleware = this.authenticateMiddleware ? this.authenticateMiddleware : this.authenticateDefault;
-            this.logger.info('authenticate: authMiddleware = ', authMiddleware.name);
             authMiddleware(req, res, next);
-            this.logger.log('authenticate: end');
         };
         /**
          * the proxied authenticate method which is publicly exposed

package/dist/common/models/xuiNode.class.js.map

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

package/dist/common/util/contentSecurityPolicy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentSecurityPolicy.d.ts","sourceRoot":"","sources":["../../../src/common/util/contentSecurityPolicy.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAsD3B,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,QAAQ,GAAG,QAEnD,CAAA"}
+{"version":3,"file":"contentSecurityPolicy.d.ts","sourceRoot":"","sources":["../../../src/common/util/contentSecurityPolicy.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,eAAe;;;;;;;;;;;;;CAmD3B,CAAA;AAED,eAAO,MAAM,wBAAwB,GAAI,QAAQ,GAAG,QAEnD,CAAA"}

package/dist/common/util/contentSecurityPolicy.js

@@ -41,15 +41,12 @@ exports.SECURITY_POLICY = {
         mediaSrc: ["'self'"],
         scriptSrc: [
             "'self'",
-            "'unsafe-inline'",
-            "'unsafe-eval'",
             'https://*.google-analytics.com',
             'https://*.googletagmanager.com',
             'az416426.vo.msecnd.net',
         ],
         styleSrc: [
             "'self'",
-            "'unsafe-inline'",
             'https://fonts.googleapis.com',
             'https://fonts.gstatic.com',
             'https://www.googletagmanager.com',

package/dist/common/util/contentSecurityPolicy.js.map

@@ -1 +1 @@
-{"version":3,"file":"contentSecurityPolicy.js","sourceRoot":"","sources":["../../../src/common/util/contentSecurityPolicy.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG;IAC3B,UAAU,EAAE;QACR,UAAU,EAAE;YACR,oBAAoB;YACpB,UAAU;YACV,8BAA8B;YAC9B,oBAAoB;YACpB,gCAAgC;YAChC,gCAAgC;YAChC,gCAAgC;YAChC,aAAa;YACb,6BAA6B;YAC7B,+CAA+C;YAC/C,gDAAgD;YAChD,oDAAoD;YACpD,gDAAgD;YAChD,gDAAgD;YAChD,2CAA2C;YAC3C,4CAA4C;YAC5C,6BAA6B;SAChC;QACD,UAAU,EAAE,CAAC,QAAQ,CAAC;QACtB,OAAO,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,OAAO,CAAC;QACzD,UAAU,EAAE,CAAC,QAAQ,CAAC;QACtB,cAAc,EAAE,CAAC,QAAQ,CAAC;QAC1B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,MAAM,EAAE;YACJ,QAAQ;YACR,OAAO;YACP,gCAAgC;YAChC,gCAAgC;YAChC,0CAA0C;YAC1C,kCAAkC;YAClC,0BAA0B;YAC1B,0BAA0B;YAC1B,2BAA2B;SAC9B;QACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,SAAS,EAAE;YACP,QAAQ;YACR,iBAAiB;YACjB,eAAe;YACf,gCAAgC;YAChC,gCAAgC;YAChC,wBAAwB;SAC3B;QACD,QAAQ,EAAE;YACN,QAAQ;YACR,iBAAiB;YACjB,8BAA8B;YAC9B,2BAA2B;YAC3B,kCAAkC;SACrC;KACJ;CACJ,CAAA;AAEM,MAAM,wBAAwB,GAAG,CAAC,MAAW,EAAE,EAAE;IACpD,OAAO,MAAM,CAAC,qBAAqB,CAAC,uBAAe,CAAC,CAAA;AACxD,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC"}
+{"version":3,"file":"contentSecurityPolicy.js","sourceRoot":"","sources":["../../../src/common/util/contentSecurityPolicy.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG;IAC3B,UAAU,EAAE;QACR,UAAU,EAAE;YACR,oBAAoB;YACpB,UAAU;YACV,8BAA8B;YAC9B,oBAAoB;YACpB,gCAAgC;YAChC,gCAAgC;YAChC,gCAAgC;YAChC,aAAa;YACb,6BAA6B;YAC7B,+CAA+C;YAC/C,gDAAgD;YAChD,oDAAoD;YACpD,gDAAgD;YAChD,gDAAgD;YAChD,2CAA2C;YAC3C,4CAA4C;YAC5C,6BAA6B;SAChC;QACD,UAAU,EAAE,CAAC,QAAQ,CAAC;QACtB,OAAO,EAAE,CAAC,QAAQ,EAAE,2BAA2B,EAAE,OAAO,CAAC;QACzD,UAAU,EAAE,CAAC,QAAQ,CAAC;QACtB,cAAc,EAAE,CAAC,QAAQ,CAAC;QAC1B,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,MAAM,EAAE;YACJ,QAAQ;YACR,OAAO;YACP,gCAAgC;YAChC,gCAAgC;YAChC,0CAA0C;YAC1C,kCAAkC;YAClC,0BAA0B;YAC1B,0BAA0B;YAC1B,2BAA2B;SAC9B;QACD,QAAQ,EAAE,CAAC,QAAQ,CAAC;QACpB,SAAS,EAAE;YACP,QAAQ;YACR,gCAAgC;YAChC,gCAAgC;YAChC,wBAAwB;SAC3B;QACD,QAAQ,EAAE;YACN,QAAQ;YACR,8BAA8B;YAC9B,2BAA2B;YAC3B,kCAAkC;SACrC;KACJ;CACJ,CAAA;AAEM,MAAM,wBAAwB,GAAG,CAAC,MAAW,EAAE,EAAE;IACpD,OAAO,MAAM,CAAC,qBAAqB,CAAC,uBAAe,CAAC,CAAA;AACxD,CAAC,CAAA;AAFY,QAAA,wBAAwB,4BAEpC"}

package/dist/common/util/csp.d.ts

@@ -0,0 +1,10 @@
+import { Request, Response, NextFunction } from 'express';
+export declare function csp({ extraScript, extraStyle, extraConnect, extraFont, extraImg, defaultCsp }?: {
+    extraScript?: string[] | undefined;
+    extraStyle?: string[] | undefined;
+    extraConnect?: string[] | undefined;
+    extraFont?: string[] | undefined;
+    extraImg?: string[] | undefined;
+    defaultCsp?: {} | undefined;
+}): (req: Request, res: Response, next: NextFunction) => void;
+//# sourceMappingURL=csp.d.ts.map

package/dist/common/util/csp.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"csp.d.ts","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAK1D,wBAAgB,GAAG,CAAC,EAClB,WAA6E,EAC7E,UAA2E,EAC3E,YAA+E,EAC/E,SAAyE,EACzE,QAAuE,EACvE,UAAe,EAChB;;;;;;;CAAK,IACI,KAAK,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,YAAY,UAgCxD"}

package/dist/common/util/csp.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.csp = csp;
+const helmet_1 = __importDefault(require("helmet"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
+const deepmerge_1 = __importDefault(require("deepmerge"));
+function csp(_a) {
+    var _b, _c, _d, _e, _f;
+    var { extraScript = ((_b = process.env.CSP_SCRIPT_EXTRA) !== null && _b !== void 0 ? _b : '').split(',').filter(Boolean), extraStyle = ((_c = process.env.CSP_STYLE_EXTRA) !== null && _c !== void 0 ? _c : '').split(',').filter(Boolean), extraConnect = ((_d = process.env.CSP_CONNECT_EXTRA) !== null && _d !== void 0 ? _d : '').split(',').filter(Boolean), extraFont = ((_e = process.env.CSP_FONT_EXTRA) !== null && _e !== void 0 ? _e : '').split(',').filter(Boolean), extraImg = ((_f = process.env.CSP_IMG_EXTRA) !== null && _f !== void 0 ? _f : '').split(',').filter(Boolean), defaultCsp = {} } = _a === void 0 ? {} : _a;
+    return (req, res, next) => {
+        const nonce = node_crypto_1.default.randomBytes(16).toString('base64');
+        res.locals.cspNonce = nonce;
+        const newCsp = {
+            useDefaults: true,
+            directives: {
+                // dashed form is fine too, but keep the SAME spelling everywhere
+                defaultSrc: ["'self'"],
+                scriptSrc: ["'self'", `'nonce-${nonce}'`, ...extraScript],
+                styleSrc: ["'self'", `'nonce-${nonce}'`, ...extraStyle],
+                // inline style attributes still allowed - should be phased out in future
+                styleSrcAttr: ["'unsafe-inline'"],
+                connectSrc: ["'self'", "blob:", "data:", ...extraConnect],
+                imgSrc: ["'self'", "data:", ...extraImg],
+                fontSrc: ["'self'", "data:", "https://fonts.gstatic.com", ...extraFont],
+                objectSrc: ["'none'"],
+                frameSrc: ["'self'"],
+                frameAncestors: ["'self'"],
+                formAction: ["'none'"]
+            },
+            reportOnly: process.env.CSP_REPORT_ONLY === 'true'
+        };
+        // deep‑merge so we don’t lose anything from SECURITY_POLICY
+        const finalCsp = (0, deepmerge_1.default)(defaultCsp, newCsp);
+        helmet_1.default.contentSecurityPolicy(finalCsp)(req, res, next);
+    };
+}
+//# sourceMappingURL=csp.js.map

package/dist/common/util/csp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"csp.js","sourceRoot":"","sources":["../../../src/common/util/csp.ts"],"names":[],"mappings":";;;;;AAKA,kBAwCC;AA5CD,oDAA4B;AAC5B,8DAAiC;AACjC,0DAA8B;AAE9B,SAAgB,GAAG,CAAC,EAOd;;QAPc,EAClB,WAAW,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,gBAAgB,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC7E,UAAU,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,eAAe,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC3E,YAAY,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,iBAAiB,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAC/E,SAAS,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,cAAc,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACzE,QAAQ,GAAG,CAAC,MAAA,OAAO,CAAC,GAAG,CAAC,aAAa,mCAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EACvE,UAAU,GAAG,EAAE,EAChB,mBAAG,EAAE;IACJ,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;QACzD,MAAM,KAAK,GAAG,qBAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACxD,GAAG,CAAC,MAAM,CAAC,QAAQ,GAAG,KAAK,CAAC;QAE5B,MAAM,MAAM,GAAG;YACb,WAAW,EAAE,IAAI;YACjB,UAAU,EAAE;gBACV,iEAAiE;gBACjE,UAAU,EAAE,CAAC,QAAQ,CAAC;gBACtB,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,KAAK,GAAG,EAAE,GAAG,WAAW,CAAC;gBACzD,QAAQ,EAAE,CAAC,QAAQ,EAAE,UAAU,KAAK,GAAG,EAAE,GAAG,UAAU,CAAC;gBAEvD,yEAAyE;gBACzE,YAAY,EAAE,CAAC,iBAAiB,CAAC;gBAEjC,UAAU,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;gBACzD,MAAM,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,GAAG,QAAQ,CAAC;gBACxC,OAAO,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,2BAA2B,EAAE,GAAG,SAAS,CAAC;gBAEvE,SAAS,EAAE,CAAC,QAAQ,CAAC;gBACrB,QAAQ,EAAE,CAAC,QAAQ,CAAC;gBACpB,cAAc,EAAE,CAAC,QAAQ,CAAC;gBAC1B,UAAU,EAAE,CAAC,QAAQ,CAAC;aACvB;YACD,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM;SACnD,CAAC;QAEF,4DAA4D;QAC5D,MAAM,QAAQ,GAAG,IAAA,mBAAK,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QAE3C,gBAAM,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC,CAAC;AACJ,CAAC"}

package/dist/common/util/index.d.ts

@@ -1,3 +1,5 @@
+export { SECURITY_POLICY } from './contentSecurityPolicy';
+export { csp } from './csp';
 export { hasKey } from './hasKey';
 export { getLogger, XuiLogger } from './debug.logger';
 export { getContentSecurityPolicy } from './contentSecurityPolicy';

package/dist/common/util/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/common/util/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACjC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AACvD,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA"}

package/dist/common/util/index.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserSessionTimeout = exports.arrayPatternMatch = exports.isStringPatternMatch = exports.sortArray = exports.getContentSecurityPolicy = exports.getLogger = exports.hasKey = void 0;
+exports.getUserSessionTimeout = exports.arrayPatternMatch = exports.isStringPatternMatch = exports.sortArray = exports.getContentSecurityPolicy = exports.getLogger = exports.hasKey = exports.csp = exports.SECURITY_POLICY = void 0;
+var contentSecurityPolicy_1 = require("./contentSecurityPolicy");
+Object.defineProperty(exports, "SECURITY_POLICY", { enumerable: true, get: function () { return contentSecurityPolicy_1.SECURITY_POLICY; } });
+var csp_1 = require("./csp");
+Object.defineProperty(exports, "csp", { enumerable: true, get: function () { return csp_1.csp; } });
 var hasKey_1 = require("./hasKey");
 Object.defineProperty(exports, "hasKey", { enumerable: true, get: function () { return hasKey_1.hasKey; } });
 var debug_logger_1 = require("./debug.logger");
 Object.defineProperty(exports, "getLogger", { enumerable: true, get: function () { return debug_logger_1.getLogger; } });
-var contentSecurityPolicy_1 = require("./contentSecurityPolicy");
-Object.defineProperty(exports, "getContentSecurityPolicy", { enumerable: true, get: function () { return contentSecurityPolicy_1.getContentSecurityPolicy; } });
+var contentSecurityPolicy_2 = require("./contentSecurityPolicy");
+Object.defineProperty(exports, "getContentSecurityPolicy", { enumerable: true, get: function () { return contentSecurityPolicy_2.getContentSecurityPolicy; } });
 var sortArray_1 = require("./sortArray");
 Object.defineProperty(exports, "sortArray", { enumerable: true, get: function () { return sortArray_1.sortArray; } });
 var stringPatternMatch_1 = require("./stringPatternMatch");

package/dist/common/util/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/util/index.ts"],"names":[],"mappings":";;;AAAA,mCAAiC;AAAxB,gGAAA,MAAM,OAAA;AACf,+CAAqD;AAA5C,yGAAA,SAAS,OAAA;AAClB,iEAAkE;AAAzD,iIAAA,wBAAwB,OAAA;AACjC,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2DAA2D;AAAlD,0HAAA,oBAAoB,OAAA;AAC7B,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,6CAA8E;AAArE,oHAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/util/index.ts"],"names":[],"mappings":";;;AAAA,iEAA0D;AAAjD,wHAAA,eAAe,OAAA;AACxB,6BAA2B;AAAlB,0FAAA,GAAG,OAAA;AACZ,mCAAiC;AAAxB,gGAAA,MAAM,OAAA;AACf,+CAAqD;AAA5C,yGAAA,SAAS,OAAA;AAClB,iEAAkE;AAAzD,iIAAA,wBAAwB,OAAA;AACjC,yCAAuC;AAA9B,sGAAA,SAAS,OAAA;AAClB,2DAA2D;AAAlD,0HAAA,oBAAoB,OAAA;AAC7B,yDAAuD;AAA9C,sHAAA,iBAAiB,OAAA;AAC1B,6CAA8E;AAArE,oHAAA,qBAAqB,OAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/rpx-xui-node-lib",
-  "version": "2.30.8-csurf-deprecated",
+  "version": "2.30.8-exui-4295-axios-update",
   "description": "Common nodejs library components for XUI",
   "main": "dist/index",
   "types": "dist/index.d.ts",
@@ -40,6 +40,9 @@
   "files": [
     "dist/**/*"
   ],
+  "peerDependencies": {
+    "helmet": "^7.0.0"
+  },
   "devDependencies": {
     "@commitlint/cli": "^17.8.1",
     "@commitlint/config-conventional": "^8.2.0",
@@ -49,6 +52,7 @@
     "@semantic-release/git": "^10.0.1",
     "@semantic-release/github": "^8.1.0",
     "@types/connect-redis": "^0.0.23",
+    "@types/csurf": "^1.9.36",
     "@types/debug": "^4.1.5",
     "@types/express": "^4.17.2",
     "@types/express-session": "1.17.10",
@@ -63,6 +67,7 @@
     "commitlint-config-cz": "^0.13.1",
     "cz-conventional-changelog": "^3.3.0",
     "eslint": "^9.25.1",
+    "helmet": "^7.0.0",
     "husky": "^8.0.0",
     "jest": "^29.7.0",
     "jest-config": "29.5.0",
@@ -84,29 +89,30 @@
     }
   },
   "dependencies": {
-    "@dr.pogodin/csurf": "^1.14.0",
-    "axios": "^1.7.7",
+    "@hapi/joi": "^17.1.1",
+    "axios": "^1.15.0",
     "caller-path": "^3.0.0",
     "connect-redis": "^4.0.4",
+    "csurf": "^1.11.0",
     "debug": "^4.3.7",
     "deepmerge": "^4.2.2",
     "express": "^4.20.0",
     "express-session": "^1.17.0",
     "jest-mock-axios": "^4.8.0",
     "jest-ts-auto-mock": "^2.1.0",
-    "joi": "^17.13.3 ",
     "jwt-decode": "^3.1.2",
-    "openid-client": "^5.7.1",
+    "openid-client": "^3.10.0",
     "otplib": "^12.0.1",
-    "passport": "^0.7.0",
-    "passport-oauth2": "^1.8.0",
+    "passport": "^0.5.3",
+    "passport-oauth2": "^1.5.0",
     "redis": "^3.0.2",
     "session-file-store": "^1.5.0"
   },
   "resolutions": {
     "@babel/traverse": "7.23.2",
     "minimatch": "3.0.5",
-    "minimist": "1.2.6"
+    "minimist": "1.2.6",
+    "tar": "7.5.9"
   },
   "packageManager": "yarn@4.5.1"
 }