Merge pull request #10 from DISIC:dev

fix(pencil): adding logs and env variables validation with joi

Author: youssefElMkhantar

package-lock.json

@@ -41,6 +41,7 @@
     "cross-env": "^7.0.3",
     "dotenv": "^16.3.1",
     "https-proxy-agent": "^7.0.4",
+    "joi": "^17.12.3",
     "moment": "^2.30.1",
     "nodemailer": "^6.9.11",
     "openid-client": "^5.6.4",
@@ -56,6 +57,7 @@
     "@nestjs/testing": "^10.0.0",
     "@types/express": "^4.17.17",
     "@types/jest": "^29.5.2",
+    "@types/joi": "^17.2.3",
     "@types/node": "^20.3.1",
     "@types/supertest": "^2.0.12",
     "@typescript-eslint/eslint-plugin": "^6.0.0",

package.json

@@ -1,3 +1,4 @@
+import { configValidationSchema } from './config.schema';
 import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -13,43 +14,53 @@ import { MailerModule } from '@nestjs-modules/mailer';
 
 @Module({
   imports: [
-    MailerModule.forRoot({
-      transport: {
-        pool: process.env.EMAIL_SMTP_POOL,
-        host: process.env.EMAIL_SMTP_HOST,
-        port: process.env.EMAIL_SMTP_PORT,
-        secure: process.env.EMAIL_SMTP_SECURE === 'true',
-        // ignoneTLS: true,
-        auth: {
-          user: process.env.EMAIL_SMTP_AUTH_USER,
-          pass: process.env.EMAIL_SMTP_AUTH_PASS,
-        },
-        tls: {
-          // do not fail on invalid certs
-          rejectUnauthorized:
-            process.env.EMAIL_SMTP_TLS_REJECTUNAUTHORIZED === 'true',
-        },
-      },
-      defaults: {
-        from: '"nest-modules" <[email protected]>',
+    MailerModule.forRootAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: async (configService: ConfigService) => {
+        return {
+          transport: {
+            pool: configService.get('EMAIL_SMTP_POOL'),
+            host: configService.get('EMAIL_SMTP_HOST'),
+            port: configService.get('EMAIL_SMTP_PORT'),
+            secure: configService.get('EMAIL_SMTP_SECURE') === 'true',
+            auth: {
+              user: configService.get('EMAIL_SMTP_AUTH_USER'),
+              pass: configService.get('EMAIL_SMTP_AUTH_PASS'),
+            },
+            tls: {
+              rejectUnauthorized:
+                configService.get('EMAIL_SMTP_TLS_REJECTUNAUTHORIZED') ===
+                'true',
+            },
+          },
+          defaults: {
+            from: '"nest-modules" <[email protected]>',
+          },
+        };
       },
     }),
-    JwtModule.register({
+    JwtModule.registerAsync({
+      imports: [ConfigModule],
+      inject: [ConfigService],
+      useFactory: async (configService: ConfigService) => {
+        return { secret: configService.get('JITSI_JITSIJWT_SECRET') };
+      },
       global: true,
-      secret: process.env.JITSI_JITSIJWT_SECRET,
     }),
     ConfigModule.forRoot({
       isGlobal: true,
       envFilePath: `.env.${process.env.NODE_ENV}`,
+      validationSchema: configValidationSchema,
     }),
     MongooseModule.forRootAsync({
       imports: [ConfigModule],
+      inject: [ConfigService],
       useFactory: (configService: ConfigService) => {
         return {
           uri: configService.get('MONGO_URI'),
         };
       },
-      inject: [ConfigService],
     }),
     AuthenticationModule,
     ConferenceModule,

src/app.module.ts

@@ -0,0 +1,10 @@
+import { Injectable } from '@nestjs/common';
+import { IsString } from 'class-validator';
+
+@Injectable()
+export class LoginCallbackDTO {
+  @IsString()
+  state: string;
+  @IsString()
+  code: string;
+}

src/authentication/DTOs/LoginCallbackDTO.ts

@@ -0,0 +1,8 @@
+import { Injectable } from '@nestjs/common';
+import { IsString } from 'class-validator';
+
+@Injectable()
+export class LogoutCallbackDTO {
+  @IsString()
+  state: string;
+}

src/authentication/DTOs/LogoutCallbackDTO.ts

@@ -1,3 +1,4 @@
+import { ConfigService } from '@nestjs/config';
 import { AuthenticationService } from './authentication.service';
 import {
   Controller,
@@ -14,22 +15,16 @@ import * as crypto from 'crypto';
 import { ConferenceService } from 'src/conference/conference.service';
 import { JwtService } from '@nestjs/jwt';
 import * as moment from 'moment';
-
-interface LoginCallbackQuery {
-  code: string;
-  state: string;
-}
-
-interface LogoutCallbackQuery {
-  state: string;
-}
+import { LoginCallbackDTO } from './DTOs/LoginCallbackDTO';
+import { LogoutCallbackDTO } from './DTOs/LogoutCallbackDTO';
 
 @Controller('authentication')
 export class AuthenticationController {
   constructor(
     private readonly authenticationService: AuthenticationService,
     private readonly conferenceService: ConferenceService,
     private readonly jwtService: JwtService,
+    private readonly configService: ConfigService,
   ) {}
 
   @Get('whereami')
@@ -60,7 +55,7 @@ export class AuthenticationController {
 
   @Get('login_callback')
   async loginCallback(
-    @Query() query: LoginCallbackQuery,
+    @Query() query: LoginCallbackDTO,
     @Req() request: Request,
     @Res({ passthrough: true }) response: Response,
   ) {
@@ -71,9 +66,9 @@ export class AuthenticationController {
       await this.authenticationService.loginCallback(code, state, sendedState);
 
     const tokenClaims = {
-      iss: process.env.JITSI_JITSIJWT_ISS,
-      aud: process.env.JITSI_JITSIJWT_AUD,
-      sub: process.env.JITSI_JITSIJWT_SUB,
+      iss: this.configService.get('JITSI_JITSIJWT_ISS'),
+      aud: this.configService.get('JITSI_JITSIJWT_AUD'),
+      sub: this.configService.get('JITSI_JITSIJWT_SUB'),
       email: this.jwtService.decode(userinfo)?.email,
       idToken,
     };
@@ -121,7 +116,7 @@ export class AuthenticationController {
   @Get('logout_callback')
   // @Redirect('', 302)
   logoutCallback(
-    @Query() query: LogoutCallbackQuery,
+    @Query() query: LogoutCallbackDTO,
     @Req() request: Request,
     @Res({ passthrough: true }) response: Response,
   ) {
@@ -149,9 +144,9 @@ export class AuthenticationController {
       await this.jwtService.verify(refreshToken);
 
       const tokenClaims = {
-        iss: process.env.JITSI_JITSIJWT_ISS,
-        aud: process.env.JITSI_JITSIJWT_AUD,
-        sub: process.env.JITSI_JITSIJWT_SUB,
+        iss: this.configService.get('JITSI_JITSIJWT_ISS'),
+        aud: this.configService.get('JITSI_JITSIJWT_AUD'),
+        sub: this.configService.get('JITSI_JITSIJWT_SUB'),
         email: this.jwtService.decode(refreshToken)?.email,
         idToken: this.jwtService.decode(refreshToken)?.idToken,
       };
@@ -174,7 +169,7 @@ export class AuthenticationController {
 
       return { accessToken };
     } catch (error) {
-      throw new UnauthorizedException('veuillez vous authetifier');
+      throw new UnauthorizedException('veuillez vous authentifier');
     }
   }
 }