@mojaloop/sdk-scheme-adapter 24.12.0 → 24.13.0

package/.yarnrc.yml

@@ -4,4 +4,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.10.1.cjs
+yarnPath: .yarn/releases/yarn-4.10.2.cjs

package/CHANGELOG.md

@@ -1,4 +1,16 @@
 # Changelog: [mojaloop/sdk-scheme-adapter](https://github.com/mojaloop/sdk-scheme-adapter)
+## [24.13.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.12.0...v24.13.0) (2025-10-06)
+
+
+### Features
+
+* **csi-1665:** improved logging ([#616](https://github.com/mojaloop/sdk-scheme-adapter/issues/616)) ([b8cae73](https://github.com/mojaloop/sdk-scheme-adapter/commit/b8cae734c71f5e94fef53cd0da1953042750bf54))
+
+
+### Chore
+
+* **sbom:** update sbom [skip ci] ([4cc79d0](https://github.com/mojaloop/sdk-scheme-adapter/commit/4cc79d0093732849ab25ba6d9357ce079347ab95))
+
 ## [24.12.0](https://github.com/mojaloop/sdk-scheme-adapter/compare/v24.11.0...v24.12.0) (2025-09-22)
 
 

package/docker-compose.yml

@@ -95,7 +95,7 @@ services:
   kafka:
     networks:
       - mojaloop-net
-    image: docker.io/bitnami/kafka:3.4.0
+    image: docker.io/bitnamilegacy/kafka:3.4.0
     container_name: kafka
     ports:
       - "9092:9092"
@@ -156,7 +156,7 @@ services:
   init-kafka:
     networks:
       - mojaloop-net
-    image: docker.io/bitnami/kafka:3.4.0
+    image: docker.io/bitnamilegacy/kafka:3.4.0
     depends_on:
       kafka:
         condition: service_healthy

package/modules/api-svc/.env.example

@@ -126,7 +126,7 @@ CHECK_ILP=true
 # set to true to enable test features such as request cacheing and retrieval endpoints
 ENABLE_TEST_FEATURES=false
 
-# set to true to mock WSO2 oauth2 token endpoint
+# set to true to mock OIDC oauth2 token endpoint
 ENABLE_OAUTH_TOKEN_ENDPOINT=false
 OAUTH_TOKEN_ENDPOINT_CLIENT_KEY=test-client-key
 OAUTH_TOKEN_ENDPOINT_CLIENT_SECRET=test-client-secret
@@ -135,7 +135,7 @@ OAUTH_TOKEN_ENDPOINT_LISTEN_PORT=6000
 # WSO2 Bearer Token specific to golden-fsp instance and environment
 WSO2_BEARER_TOKEN=7718fa9b-be13-3fe7-87f0-a12cf1628168
 
-# OAuth2 data used to obtain WSO2 bearer token
+# OAuth2 data used to obtain OIDC bearer token
 OAUTH_TOKEN_ENDPOINT=
 OAUTH_CLIENT_KEY=
 OAUTH_CLIENT_SECRET=

package/modules/api-svc/package.json

@@ -64,21 +64,21 @@
   },
   "dependencies": {
     "@koa/cors": "5.0.0",
-    "@mojaloop/api-snippets": "18.1.1",
-    "@mojaloop/central-services-error-handling": "13.1.2",
+    "@mojaloop/api-snippets": "18.2.0",
+    "@mojaloop/central-services-error-handling": "13.1.3",
     "@mojaloop/central-services-logger": "11.10.1",
-    "@mojaloop/central-services-metrics": "12.7.1",
-    "@mojaloop/central-services-shared": "18.33.3",
-    "@mojaloop/event-sdk": "14.7.0",
+    "@mojaloop/central-services-metrics": "12.8.0",
+    "@mojaloop/central-services-shared": "18.34.0",
+    "@mojaloop/event-sdk": "14.8.0",
     "@mojaloop/logging-bc-client-lib": "0.5.8",
     "@mojaloop/ml-schema-transformer-lib": "2.7.8",
     "@mojaloop/sdk-scheme-adapter-private-shared-lib": "workspace:^",
-    "@mojaloop/sdk-standard-components": "19.17.0",
+    "@mojaloop/sdk-standard-components": "19.18.0",
     "ajv": "8.17.1",
     "axios": "1.12.2",
     "body-parser": "2.2.0",
     "co-body": "6.2.0",
-    "dotenv": "17.2.2",
+    "dotenv": "17.2.3",
     "env-var": "7.5.0",
     "express": "4.21.2",
     "fast-json-patch": "3.1.1",
@@ -96,7 +96,7 @@
     "prom-client": "15.1.3",
     "promise-timeout": "1.3.0",
     "random-word-slugs": "0.1.7",
-    "redis": "5.8.2",
+    "redis": "5.8.3",
     "retry": "^0.13.1",
     "uuidv4": "6.2.13",
     "ws": "8.18.3"
@@ -108,7 +108,7 @@
     "@types/jest": "30.0.0",
     "@types/retry": "^0",
     "axios-mock-adapter": "2.1.0",
-    "babel-jest": "30.1.2",
+    "babel-jest": "30.2.0",
     "eslint": "9.15.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-plugin-import": "2.32.0",

package/modules/api-svc/src/FSPIOPEventHandler/handlers/bulk-quotes-requested.js

@@ -43,7 +43,7 @@ module.exports.handleBulkQuotesRequestedDmEvt = async (
             ...options.config,
             cache: options.cache,
             logger: logger,
-            wso2: options.wso2,
+            oidc: options.oidc,
         });
 
         await model.initialize(event.request);

package/modules/api-svc/src/FSPIOPEventHandler/handlers/bulk-transfers-requested.js

@@ -43,7 +43,7 @@ module.exports.handleBulkTransfersRequestedDmEvt = async (
             ...options.config,
             cache: options.cache,
             logger: logger,
-            wso2: options.wso2,
+            oidc: options.oidc,
         });
 
         await model.initialize(event.request);

package/modules/api-svc/src/FSPIOPEventHandler/handlers/party-info-requested.js

@@ -46,7 +46,7 @@ module.exports.handlePartyInfoRequestedDmEvt = async (
             ...options.config,
             cache: options.cache,
             logger: logger,
-            wso2: options.wso2,
+            oidc: options.oidc,
         };
 
         const cacheKey = PartiesModel.generateKey(args);

package/modules/api-svc/src/FSPIOPEventHandler/index.js

@@ -44,11 +44,11 @@ const {
 } = require('./handlers');
 
 class FSPIOPEventHandler {
-    constructor({ config, logger, cache, wso2 }) {
+    constructor({ config, logger, cache, oidc }) {
         this._conf = config;
         this._logger = logger.push({ component: this.constructor.name });
         this._cache = cache;
-        this._wso2 = wso2;
+        this._oidc = oidc;
 
         this._loggerFromLoggingBC = new DefaultLogger(BC_CONFIG.bcName, 'fspiop-event-handler', '0.0.1', config.logLevel);
 
@@ -70,7 +70,7 @@ class FSPIOPEventHandler {
             producer: this._producer,
             consumer: this._consumer,
             cache: this._cache,
-            wso2: this._wso2,
+            oidc: this._oidc,
             config: this._conf,
         };
 

package/modules/api-svc/src/InboundServer/handlers.js

@@ -74,7 +74,7 @@ const createInboundTransfersModel = (ctx) => new InboundTransfersModel({
     },
     cache: ctx.state.cache,
     logger: ctx.state.logger,
-    wso2: ctx.state.wso2,
+    oidc: ctx.state.oidc,
     resourceVersions: ctx.resourceVersions,
     backendSharedAgents: ctx.state.backendSharedAgents,
     mojaloopSharedAgents: ctx.state.mojaloopSharedAgents,
@@ -1133,14 +1133,14 @@ const createPutFxTransfersHandler = (success) => async (ctx) => {
 };
 
 const handlePostPing = (ctx) => {
-    const { jwsPingValidationResult, conf, logger, wso2 } = ctx.state;
+    const { jwsPingValidationResult, conf, logger, oidc } = ctx.state;
     const { sourceFspId, body, headers } = extractBodyHeadersSourceFspId(ctx);
 
     const model = new InboundPingModel({
         ...conf,
         resourceVersions: ctx.resourceVersions,
         logger,
-        wso2,
+        oidc,
     });
     model.postPing({ jwsPingValidationResult, sourceFspId, body, headers })
         .catch(err => logger.error('error in handlePostPing:', err));

package/modules/api-svc/src/InboundServer/index.js

@@ -48,7 +48,7 @@ const _validator = new Validate({ logExcludePaths });
 let _initialize;
 
 class InboundApi extends EventEmitter {
-    constructor(conf, logger, cache, validator, wso2, mojaloopSharedAgents) {
+    constructor(conf, logger, cache, validator, oidc, mojaloopSharedAgents) {
         super({ captureExceptions: true });
         this._conf = conf;
         this._cache = cache;
@@ -72,7 +72,7 @@ class InboundApi extends EventEmitter {
             validator,
             cache,
             jwsVerificationKeys: this._jwsVerificationKeys,
-            wso2,
+            oidc,
             backendSharedAgents: this.backendSharedAgents,
             mojaloopSharedAgents: this.mojaloopSharedAgents,
         });
@@ -121,7 +121,7 @@ class InboundApi extends EventEmitter {
         }
     }
 
-    static _SetupApi({ conf, logger, validator, cache, jwsVerificationKeys, wso2, backendSharedAgents, mojaloopSharedAgents }) {
+    static _SetupApi({ conf, logger, validator, cache, jwsVerificationKeys, oidc, backendSharedAgents, mojaloopSharedAgents }) {
         const api = new Koa();
 
         api.use(middlewares.createErrorHandler(logger));
@@ -133,7 +133,7 @@ class InboundApi extends EventEmitter {
             api.use(middlewares.createJwsValidator(logger, jwsVerificationKeys, jwsExclusions));
         }
 
-        api.use(middlewares.applyState({ conf, cache, wso2, logExcludePaths, backendSharedAgents, mojaloopSharedAgents }));
+        api.use(middlewares.applyState({ conf, cache, oidc, logExcludePaths, backendSharedAgents, mojaloopSharedAgents }));
         api.use(middlewares.createPingMiddleware(conf, jwsVerificationKeys));
         api.use(middlewares.createRequestValidator(validator));
         api.use(middlewares.assignFspiopIdentifier());
@@ -189,7 +189,7 @@ class InboundApi extends EventEmitter {
 }
 
 class InboundServer extends EventEmitter {
-    constructor(conf, logger, cache, wso2, mojaloopSharedAgents) {
+    constructor(conf, logger, cache, oidc, mojaloopSharedAgents) {
         super({ captureExceptions: true });
         this._conf = conf;
         this._logger = logger.push({ app: this.constructor.name });
@@ -198,7 +198,7 @@ class InboundServer extends EventEmitter {
             this._logger,
             cache,
             _validator,
-            wso2,
+            oidc,
             mojaloopSharedAgents,
         );
         this._api.on('error', (...args) => {

package/modules/api-svc/src/InboundServer/middlewares.js

@@ -46,7 +46,9 @@ const { transformHeadersIsoToFspiop } = require('../lib/utils');
 const { API_TYPES } = require('../constants');
 const Config = require('../config');
 
-const INTERNAL_ROUTES = env.LOG_INTERNAL_ROUTES ? env.LOG_INTERNAL_ROUTES.split(',') : ['/health', '/metrics', '/ready'];
+const INTERNAL_ROUTES = env.LOG_INTERNAL_ROUTES ? env.LOG_INTERNAL_ROUTES.split(',') : [
+    '/health', '/metrics', '/ready', '/ping'
+];
 const shouldLog = (path, log) => log.isInfoEnabled && !INTERNAL_ROUTES.includes(path);
 
 /**
@@ -541,7 +543,9 @@ const createPingMiddleware = (config, validationKeys) => async (ctx, next) => {
 
 const extractRequestBody = async (conf, ctx) => {
     try {
-        ctx.request.body = await coBody.json(ctx.req, { limit: conf.fspiopApiServerMaxRequestBytes });
+        const body =  await coBody.json(ctx.req, { limit: conf.fspiopApiServerMaxRequestBytes });
+        ctx.request.body = body;
+        ctx.state.logger.debug('incoming request body: ', { body });
         return true;
     } catch (err) {
         // error parsing body

package/modules/api-svc/src/OutboundServer/handlers.js

@@ -128,7 +128,7 @@ const createOutboundTransfersModel = (ctx) => new OutboundTransfersModel({
     ...(ctx.state.path?.params?.dfspId && { dfspId: ctx.state.path.params.dfspId }),
     cache: ctx.state.cache,
     logger: ctx.state.logger,
-    wso2: ctx.state.wso2,
+    oidc: ctx.state.oidc,
     metricsClient: ctx.state.metricsClient,
     mojaloopSharedAgents: ctx.state.sharedAgents,
 });
@@ -138,7 +138,7 @@ const createOutboundBulkTransfersModel = (ctx) => new OutboundBulkTransfersModel
     ...(ctx.state.path?.params?.dfspId && { dfspId: ctx.state.path.params.dfspId }),
     cache: ctx.state.cache,
     logger: ctx.state.logger,
-    wso2: ctx.state.wso2,
+    oidc: ctx.state.oidc,
 });
 
 /**
@@ -341,7 +341,7 @@ const postBulkQuotes = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         await model.initialize(bulkQuoteRequest);
@@ -373,7 +373,7 @@ const getBulkQuoteById = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         await model.initialize(bulkQuoteRequest);
@@ -404,7 +404,7 @@ const postRequestToPayTransfer = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         // initialize the transfer model and start it running
@@ -432,7 +432,7 @@ const putRequestToPayTransfer = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         // TODO: check the incoming body to reject party or quote when requested to do so
@@ -466,7 +466,7 @@ const postAccounts = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
             mojaloopSharedAgents: ctx.state.sharedAgents,
         });
 
@@ -497,7 +497,7 @@ const deleteAccountByTypeAndId = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
             mojaloopSharedAgents: ctx.state.sharedAgents,
         });
 
@@ -534,7 +534,7 @@ const postRequestToPay = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         // initialize the transfer model and start it running
@@ -563,7 +563,7 @@ const putRequestToPay = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         });
 
         // TODO: check the incoming body to reject party or quote when requested to do so
@@ -605,7 +605,7 @@ const getPartiesByTypeAndId = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         };
 
         const cacheKey = PartiesModel.generateKey(args);
@@ -640,7 +640,7 @@ const postQuotes = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         };
 
         const cacheKey = QuotesModel.generateKey(args);
@@ -671,7 +671,7 @@ const postSimpleTransfers = async (ctx) => {
             ...ctx.state.path?.params?.dfspId && {dfspId: ctx.state.path.params.dfspId},
             cache: ctx.state.cache,
             logger: ctx.state.logger,
-            wso2: ctx.state.wso2,
+            oidc: ctx.state.oidc,
         };
 
         const cacheKey = TransfersModel.generateKey(args);

package/modules/api-svc/src/OutboundServer/index.js

@@ -51,7 +51,7 @@ const _validator = new Validate({ logExcludePaths });
 let _initialize;
 
 class OutboundApi extends EventEmitter {
-    constructor(conf, logger, cache, validator, metricsClient, wso2, eventProducer, eventLogger, sharedAgents) {
+    constructor(conf, logger, cache, validator, metricsClient, oidc, eventProducer, eventLogger, sharedAgents) {
         super({ captureExceptions: true });
         this._logger = logger.push({ component: this.constructor.name });
         this._api = new Koa();
@@ -67,7 +67,7 @@ class OutboundApi extends EventEmitter {
         })); // outbound always expects application/json
         this._api.use(middlewares.applyState({
             cache,
-            wso2,
+            oidc,
             conf,
             metricsClient,
             logExcludePaths,
@@ -86,7 +86,7 @@ class OutboundApi extends EventEmitter {
                 peerEndpoint: conf.peerEndpoint.replace(endpointRegex, ''),
                 proxyConfig: conf.proxyConfig,
                 logger: this._logger,
-                wso2: wso2,
+                oidc: oidc,
                 tls: conf.outbound.tls,
             }));
         }
@@ -106,7 +106,7 @@ class OutboundApi extends EventEmitter {
 }
 
 class OutboundServer extends EventEmitter {
-    constructor(conf, logger, cache, metricsClient, wso2, mojaloopSharedAgents) {
+    constructor(conf, logger, cache, metricsClient, oidc, mojaloopSharedAgents) {
         super({ captureExceptions: true });
         this._conf = conf;
         this._logger = logger.push({ app: this.constructor.name });
@@ -126,7 +126,7 @@ class OutboundServer extends EventEmitter {
             cache,
             _validator,
             metricsClient,
-            wso2,
+            oidc,
             this._eventProducer,
             this._eventLogger,
             {

package/modules/api-svc/src/config.js

@@ -201,17 +201,17 @@ module.exports = {
         clientSecret: env.get('OAUTH_TOKEN_ENDPOINT_CLIENT_SECRET').asString(),
         listenPort: env.get('OAUTH_TOKEN_ENDPOINT_LISTEN_PORT').asPortNumber(),
     },
-    wso2: {
+    oidc: {
         auth: {
-            staticToken: env.get('WSO2_BEARER_TOKEN').asString(),
-            tokenEndpoint: env.get('OAUTH_TOKEN_ENDPOINT').asString(),
+            staticToken: env.get('OIDC_BEARER_TOKEN').asString() || env.get('WSO2_BEARER_TOKEN').asString(), // for backward compatibility
+            tokenEndpoint: env.get('OAUTH_TOKEN_ENDPOINT').asString(), // Keycloak
             clientKey: env.get('OAUTH_CLIENT_KEY').asString(),
             clientSecret: env.get('OAUTH_CLIENT_SECRET').asString(),
             refreshSeconds: env.get('OAUTH_REFRESH_SECONDS').default('60').asIntPositive(),
             refreshRetrySeconds: env.get('OAUTH_REFRESH_RETRY_SECONDS').default('10').asIntPositive(),
         },
         mTlsEnabled: env.get('OAUTH_MUTUAL_TLS_ENABLED').default('false').asBool(),
-        requestAuthFailureRetryTimes: env.get('WSO2_AUTH_FAILURE_REQUEST_RETRIES').default('0').asIntPositive(),
+        requestAuthFailureRetryTimes: env.get('OIDC_AUTH_FAILURE_REQUEST_RETRIES').default('0').asIntPositive(),
     },
     rejectExpiredQuoteResponses: env.get('REJECT_EXPIRED_QUOTE_RESPONSES').default('false').asBool(),
     rejectTransfersOnExpiredQuotes: env.get('REJECT_TRANSFERS_ON_EXPIRED_QUOTES').default('false').asBool(),

package/modules/api-svc/src/index.js

@@ -81,16 +81,16 @@ class Server extends EventEmitter {
         // Create shared Mojaloop agents for switch communication (used by both servers)
         this.mojaloopSharedAgents = this._createMojaloopSharedAgents(this.conf);
 
-        this.wso2 = createAuthClient(conf, logger);
-        this.wso2.auth.on('error', (msg) => {
-            this.emit('error', 'WSO2 auth error in InboundApi', msg);
+        this.oidc = createAuthClient(conf, logger);
+        this.oidc.auth.on('error', (msg) => {
+            this.emit('error', 'OIDC auth error in InboundApi', msg);
         });
 
         this.inboundServer = new InboundServer(
             this.conf,
             this.logger,
             this.cache,
-            this.wso2,
+            this.oidc,
             this.mojaloopSharedAgents,
         );
         this.inboundServer.on('error', (...args) => {
@@ -103,7 +103,7 @@ class Server extends EventEmitter {
             this.logger,
             this.cache,
             this.metricsClient,
-            this.wso2,
+            this.oidc,
             this.mojaloopSharedAgents,
         );
         this.outboundServer.on('error', (...args) => {
@@ -141,7 +141,7 @@ class Server extends EventEmitter {
                 config: this.conf,
                 logger: this.logger,
                 cache: this.cache,
-                wso2: this.wso2,
+                oidc: this.oidc,
             });
         }
     }
@@ -205,7 +205,7 @@ class Server extends EventEmitter {
 
     async start() {
         await this.cache.connect();
-        await this.wso2.auth.start();
+        await this.oidc.auth.start();
 
         // We only start the control client if we're running within Mojaloop Payment Manager.
         // The control server is the Payment Manager Management API Service.
@@ -275,16 +275,16 @@ class Server extends EventEmitter {
             restartActionsTaken.updateCache = true;
         }
 
-        const updateWSO2 = !_.isEqual(this.conf.wso2, newConf.wso2)
+        const updateOIDC = !_.isEqual(this.conf.oidc, newConf.oidc)
             || !_.isEqual(this.conf.outbound.tls, newConf.outbound.tls);
-        if (updateWSO2) {
-            this.wso2.auth.stop();
-            this.wso2 = createAuthClient(newConf, this.logger);
-            this.wso2.auth.on('error', (msg) => {
-                this.emit('error', 'WSO2 auth error in InboundApi', msg);
+        if (updateOIDC) {
+            this.oidc.auth.stop();
+            this.oidc = createAuthClient(newConf, this.logger);
+            this.oidc.auth.on('error', (msg) => {
+                this.emit('error', 'OIDC auth error in InboundApi', msg);
             });
-            await this.wso2.auth.start();
-            restartActionsTaken.updateWSO2 = true;
+            await this.oidc.auth.start();
+            restartActionsTaken.updateOIDC = true;
         }
 
         this.logger.isDebugEnabled && this.logger.push({ oldConf: this.conf.inbound, newConf: newConf.inbound }).debug('Inbound server configuration');
@@ -300,7 +300,7 @@ class Server extends EventEmitter {
                 newConf,
                 this.logger,
                 this.cache,
-                this.wso2,
+                this.oidc,
                 this.mojaloopSharedAgents,
             );
             this.inboundServer.on('error', (...args) => {
@@ -328,7 +328,7 @@ class Server extends EventEmitter {
                 this.logger,
                 this.cache,
                 this.metricsClient,
-                this.wso2,
+                this.oidc,
                 this.mojaloopSharedAgents,
             );
             this.outboundServer.on('error', (...args) => {
@@ -350,7 +350,7 @@ class Server extends EventEmitter {
                 config: newConf,
                 logger: this.logger,
                 cache: this.cache,
-                wso2: this.wso2,
+                oidc: this.oidc,
             });
             await this.fspiopEventHandler.start();
             restartActionsTaken.updateFspiopEventHandler = true;
@@ -445,7 +445,7 @@ class Server extends EventEmitter {
 
     stop() {
         clearTimeout(this.pingTimeout);
-        this.wso2.auth.stop();
+        this.oidc.auth.stop();
         this.controlClient?.removeAllListeners();
         this.inboundServer.removeAllListeners();
         return Promise.all([

package/modules/api-svc/src/lib/cache.js

@@ -201,7 +201,7 @@ class Cache {
 
     /**
      * Subscribes to a channel and waits for a single message with timeout support.
-     * 
+     *
      * NOTE:
      * This implementation uses EventEmitter to handle Redis pub/sub concurrency issues
      * that occur when multiple subscribers listen to the same channel simultaneously.
@@ -267,7 +267,7 @@ class Cache {
                 isResolved = true;
 
                 this._logger.push({ channel, needParse }).debug('Received message on subscribed channel');
-                
+
                 cleanup();
 
                 try {
@@ -285,7 +285,7 @@ class Cache {
             // Subscribe to Redis channel
             this._subscriptionClient.subscribe(channel, (msg) => {
                 this._channelEmitter.emit(channel, msg);
-                
+
                 // Auto-unsubscribe if no more listeners
                 unsubscribeFromRedis('auto-cleanup').catch(err => {
                     this._logger.push({ channel }).warn('Auto-unsubscribe failed', err);
@@ -386,8 +386,9 @@ class Cache {
         } else {
             // we should not be asked to unsubscribe from a subscription we do not have. Raise this as a promise
             // rejection so it can be spotted. It may indicate a logic bug somewhere else
-            this._logger.isErrorEnabled && this._logger.error(`Cache not subscribed to channel ${channel} for callbackId ${callbackId}`);
-            throw new Error(`Channel ${channel} does not have a callback with id ${callbackId} subscribed`);
+            const errMessage = `Cache not subscribed to channel ${channel} for callbackId ${callbackId}`;
+            this._logger.error(errMessage);
+            throw new Error(errMessage);
         }
     }
 
@@ -395,7 +396,7 @@ class Cache {
         if (channelKey && typeof subId === 'number') {
             return this.unsubscribe(channelKey, subId)
                 .catch(err => {
-                    this._logger.push({ err }).warn(`Unsubscribing cache error [${channelKey} ${subId}]: ${err.stack}`);
+                    this._logger.warn(`Unsubscribing cache error [${channelKey} ${subId}]: `, err);
                 });
         }
     }
@@ -413,11 +414,11 @@ class Cache {
         const client = redis.createClient({ url: this._url });
 
         client.on('error', (err) => {
-            this._logger.isErrorEnabled && this._logger.push({ err }).error('Error from REDIS client getting subscriber');
+            this._logger.error('Error from REDIS client getting subscriber: ', err);
         });
 
-        client.on('reconnecting', (err) => {
-            this._logger.isDebugEnabled &&  this._logger.push({ err }).debug('REDIS client Reconnecting');
+        client.on('reconnecting', () => {
+            this._logger.verbose('REDIS client reconnecting...');
         });
 
         client.on('subscribe', (channel, count) => {
@@ -431,11 +432,11 @@ class Cache {
         });
 
         client.on('connect', () => {
-            this._logger.isDebugEnabled && this._logger.debug(`REDIS client connected at: ${this._url}`);
+            this._logger.verbose(`REDIS client connected at: ${this._url}`);
         });
 
         client.on('ready', () => {
-            this._logger.isDebugEnabled && this._logger.debug(`Connected to REDIS at: ${this._url}`);
+            this._logger.info('REDIS client is ready');
         });
         await client.connect();
 

package/modules/api-svc/src/lib/model/AccountsModel.js

@@ -60,7 +60,7 @@ class AccountsModel {
             },
             jwsSign: config.jwsSign,
             jwsSigningKey: config.jwsSigningKey,
-            wso2: config.wso2,
+            oidc: config.oidc,
             resourceVersions: config.resourceVersions,
             apiType: config.apiType
         };

package/modules/api-svc/src/lib/model/Async2SyncModel.js

@@ -253,7 +253,7 @@ function generate({
                         jwsSign: config.jwsSign,
                         jwsSignPutParties: config.jwsSignPutParties,
                         jwsSigningKey: config.jwsSigningKey,
-                        wso2: config.wso2,
+                        oidc: config.oidc,
                         apiType: config.apiType
                     })
                 }