remove req.body and req.headers logging, http exception filer name, i…

…nstance id for oidc

libs/oidc/src/filters/http-exception.filter.ts

@@ -7,17 +7,18 @@ import { SSRPagesService } from '../services';
 export class HttpExceptionFilter implements ExceptionFilter {
   readonly logger = new Logger(HttpExceptionFilter.name);
 
-  constructor(private ssrPagesService: SSRPagesService) {}
+  constructor(private ssrPagesService: SSRPagesService) { }
 
   catch(exception: any, host: ArgumentsHost) {
     const ctx = host.switchToHttp();
     const response = ctx.getResponse<Response>();
     const request = ctx.getRequest();
     const status = exception instanceof HttpException ? exception.getStatus() : HttpStatus.INTERNAL_SERVER_ERROR;
 
-    const { body, headers, method, params, query, url, user } = request;
+    const { method, params, query, url, user } = request;
 
-    this.logger.error({ request: { body, headers, method, params, query, url, user }, exception });
+    // this.logger.error({ request: { method, params, query, url, user }, exception });
+    this.logger.error(`${{ 'HttpExceptionFilter': method, params, query, url, user, exception }}`);
 
     switch (status) {
       case MisdirectedStatus.MISDIRECTED:

libs/oidc/src/oidc.module.spec.ts

@@ -15,7 +15,7 @@ describe('OidcModule', () => {
       IssuerMock.keystore = jest.fn();
       jest.spyOn(Issuer, 'discover').mockImplementation(() => Promise.resolve(IssuerMock));
       module = await Test.createTestingModule({
-        imports: [OidcModule.forRoot(MOCK_OIDC_MODULE_OPTIONS)],
+        imports: [OidcModule.forRoot(MOCK_OIDC_MODULE_OPTIONS, randomUUID())],
       }).compile();
     });
 

libs/oidc/src/oidc.module.ts

@@ -1,3 +1,4 @@
+import { SERVER_INSTANCE_ID } from '@finastra/nestjs-logger';
 import { DynamicModule, Global, MiddlewareConsumer, Module, NestModule, Provider, RequestMethod } from '@nestjs/common';
 import { APP_FILTER, APP_GUARD } from '@nestjs/core';
 import { JwtModule } from '@nestjs/jwt';
@@ -58,7 +59,7 @@ export class OidcModule implements NestModule {
       );
   }
 
-  static forRoot(options: OidcModuleOptions): DynamicModule {
+  static forRoot(options: OidcModuleOptions, serverInstanceID: string): DynamicModule {
     options = mergeDefaults(options);
     return {
       module: OidcModule,
@@ -67,6 +68,7 @@ export class OidcModule implements NestModule {
           provide: OIDC_MODULE_OPTIONS,
           useValue: options,
         },
+        { provide: SERVER_INSTANCE_ID, useValue: serverInstanceID }
       ],
     };
   }

libs/oidc/src/services/oidc.service.ts

@@ -1,3 +1,4 @@
+import { SERVER_INSTANCE_ID } from '@finastra/nestjs-logger';
 import { HttpStatus, Inject, Injectable, Logger, Next, OnModuleInit, Param, Req, Res } from '@nestjs/common';
 import axios from 'axios';
 import { Request, Response } from 'express';
@@ -36,7 +37,7 @@ export class OidcService implements OnModuleInit {
 
   constructor(
     @Inject(OIDC_MODULE_OPTIONS) public options: OidcModuleOptions,
-    @Inject('SERVER_INSTANCE_ID') private serverInstanceID: string,
+    @Inject(SERVER_INSTANCE_ID) private serverInstanceID: string,
     private ssrPagesService: SSRPagesService,
   ) {
     this.isMultitenant = !!this.options.issuerOrigin;
@@ -94,14 +95,14 @@ export class OidcService implements OnModuleInit {
     } catch (err) {
       if (this.isMultitenant) {
         const errorMsg = JSON.stringify({
-          error: err.message,
+          error: err?.message,
           debug: {
             origin: this.options.origin,
             tenantId,
             channelType,
           },
         });
-        this.logger.error(err.message, err.stack, errorMsg);
+        this.logger.error(err?.message, err?.stack, errorMsg);
         throw new Error();
       }
       const docUrl = 'https://github.com/finastra/finastra-nodejs-libs/blob/develop/libs/oidc/README.md';
@@ -125,7 +126,7 @@ export class OidcService implements OnModuleInit {
   }
 
   async login(@Req() req: Request, @Res() res: Response, @Next() next: Function, @Param() params) {
-    this.logger.log(`url: ${req.url}, body: ${JSON.stringify(req.body)}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}`);
+    this.logger.log(`url: ${req.url}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}`);
     try {
       const tenantId = params.tenantId || req.session['tenant'];
       const channel = this.options.channelType || params.channelType || req.session['channel'];
@@ -174,12 +175,12 @@ export class OidcService implements OnModuleInit {
           },
           (err, user, info) => {
             if (err || !user) {
-              this.logger.error(`url: ${req.url}, body: ${JSON.stringify(req.body)}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, message: ${err.message}`);
+              this.logger.error(`url: ${req.url}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, error message: ${err?.message}`);
               return next(err || info);
             }
             req.logIn(user, err => {
               if (err) {
-                this.logger.error(`url: ${req.url}, body: ${JSON.stringify(req.body)}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, message: ${err.message}`);
+                this.logger.error(`url: ${req.url}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, error message: ${err?.message}`);
                 return next(err);
               }
               this.updateSessionDuration(req);
@@ -203,7 +204,7 @@ export class OidcService implements OnModuleInit {
         )(req, res, next);
       }
     } catch (err) {
-      this.logger.error(`url: ${req.url}, body: ${JSON.stringify(req.body)}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, message: ${err.message}`);
+      this.logger.error(`url: ${req.url}, session: ${JSON.stringify(req.session)}, ip: ${req.ip}, method: ${req.method}, instanceID: ${this.serverInstanceID}, message: ${err.message}`);
       res.status(HttpStatus.NOT_FOUND).send();
     }
   }