Bugfix/ffdc 3331 region specific redirect uri

.github/workflows/develop.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
         package: [oidc, proxy, logger, ffdc-apis/corporate-accounts]
 
     steps:

.github/workflows/pr-build.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
         package: [oidc, proxy, logger, ffdc-apis/corporate-accounts]
 
     steps:

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [20.x]
         package: [oidc, proxy, logger, ffdc-apis/corporate-accounts]
 
     steps:

libs/logger/src/interceptors/common-http.interceptor.spec.ts

@@ -1,13 +1,16 @@
 import { createMock } from '@golevelup/nestjs-testing';
 import { CallHandler, ExecutionContext } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { of } from 'rxjs';
 import { HttpLoggingInterceptor } from './common-http.interceptor';
 
 describe('HttpLoggingInterceptor', () => {
   let interceptor;
+  let configService;
 
   beforeEach(() => {
-    interceptor = new HttpLoggingInterceptor();
+    configService = new ConfigService();
+    interceptor = new HttpLoggingInterceptor(configService);
   });
 
   it('should be defined', () => {

libs/logger/src/interceptors/common-http.interceptor.ts

@@ -1,24 +1,30 @@
 import { CallHandler, ExecutionContext, Injectable, Logger, NestInterceptor } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 
 @Injectable()
 export class HttpLoggingInterceptor implements NestInterceptor {
   readonly logger = new Logger(HttpLoggingInterceptor.name);
+  #instanceID: string;
+
+  constructor(configService: ConfigService) {
+    this.#instanceID = configService.get('SERVER_INSTANCE_ID');
+  }
 
   intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
     let req = context.switchToHttp().getRequest();
     let log = false;
 
     if (context['contextType'] !== 'graphql') {
       log = true;
-      this.logger.log(`START: ${context.getClass().name}.${context.getHandler().name}(): ${req.method} ${req.url}`);
+      this.logger.log(`START: ${context.getClass().name}.${context.getHandler().name}(): ${req.method} ${req.url} instanceID: ${this.#instanceID}`);
     }
 
     return next.handle().pipe(
       tap(() => {
         if (log) {
-          this.logger.log(`STOP: ${context.getClass().name}.${context.getHandler().name}(): ${req.method} ${req.url}`);
+          this.logger.log(`STOP: ${context.getClass().name}.${context.getHandler().name}(): ${req.method} ${req.url} instanceID: ${this.#instanceID}`);
         }
       }),
     );

libs/logger/src/logger.module.ts

@@ -2,7 +2,9 @@ import { Module } from '@nestjs/common';
 import { OMSLogger } from './oms/oms.logger.service';
 
 @Module({
-  providers: [ OMSLogger ],
-  exports: [ OMSLogger ],
+  providers: [
+    OMSLogger
+  ],
+  exports: [OMSLogger],
 })
-export class LoggerModule {}
+export class LoggerModule { }

libs/logger/src/oms/oms.logger.service.spec.ts

@@ -1,15 +1,18 @@
+import { ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { OMSLogger } from './oms.logger.service';
 
 describe('OMSLogger', () => {
   let service: OMSLogger;
+  let configService: ConfigService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [OMSLogger],
+      providers: [OMSLogger, ConfigService],
     }).compile();
 
     service = await module.resolve<OMSLogger>(OMSLogger);
+    configService = await module.resolve<ConfigService>(ConfigService);
     jest.spyOn(console, 'log').mockImplementation(() => 'test');
 
     process.stdout.isTTY = false;
@@ -52,13 +55,15 @@ describe('OMSLogger', () => {
 
 describe('OMSLogger - with mocked interactive console', () => {
   let service: OMSLogger;
+  let configService: ConfigService;
 
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [OMSLogger],
+      providers: [OMSLogger, ConfigService],
     }).compile();
 
     service = await module.resolve<OMSLogger>(OMSLogger);
+    configService = await module.resolve<ConfigService>(ConfigService);
     jest.spyOn(console, 'log').mockImplementation(() => 'test');
 
     process.stdout.isTTY = true;

libs/logger/src/oms/oms.logger.service.ts

@@ -1,8 +1,15 @@
 import { ConsoleLogger, Injectable, Scope } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
 import { OMSLogLevel } from './OMSLog.interface';
 
 @Injectable({ scope: Scope.TRANSIENT })
 export class OMSLogger extends ConsoleLogger {
+  #instanceID: string;
+  constructor(private configService: ConfigService) {
+    super();
+    this.#instanceID = configService.get('SERVER_INSTANCE_ID');
+  }
+
   private print(logLevel: OMSLogLevel, message: string, context?: string, stackTrace?: string) {
     let currentContext = context;
     if (typeof context === 'undefined') {
@@ -15,6 +22,7 @@ export class OMSLogger extends ConsoleLogger {
       msg: message,
       logger: currentContext,
       stack_trace: stackTrace,
+      instanceID: this.#instanceID,
     };
 
     console.log(JSON.stringify(logEntry));
@@ -41,4 +49,4 @@ export class OMSLogger extends ConsoleLogger {
   verbose(message: string, context?: string) {
     process.stdout.isTTY ? super.verbose.apply(this, arguments) : this.print(OMSLogLevel.VERBOSE, message, context);
   }
-}
+}