fix(whatsapp): join link

ReseauEntourage · Sep 27, 2024 · 470398a · 470398a
1 parent 695dddd
commit 470398a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/auth/auth.controller.ts b/src/auth/auth.controller.ts
@@ -162,7 +162,7 @@ export class AuthController {
       updatedUser.email
     );
 
-    return currentUser.toJSON();
+    return currentUser;
   }
 
   @Public()

diff --git a/src/auth/auth.service.ts b/src/auth/auth.service.ts
@@ -29,7 +29,7 @@ export class AuthService {
         await this.usersService.findOneComplete(user.id);
 
       if (validatePassword(password, userPassword, userSalt)) {
-        return user.toJSON();
+        return user;
       }
     }
 

diff --git a/src/users/models/user.model.ts b/src/users/models/user.model.ts
@@ -178,21 +178,21 @@ export class User extends HistorizedModel {
   get whatsappZoneCoachName(): string {
     const zone = this.getDataValue('zone') as AdminZone;
     const isCoach = this.getDataValue('role') === UserRoles.COACH;
-    return isCoach && WhatsappByZone[zone] ? WhatsappByZone[zone].name : null;
+    return isCoach && zone ? WhatsappByZone[zone].name : '';
   }
 
   @Column(DataType.VIRTUAL)
   get whatsappZoneCoachUrl(): string {
     const zone = this.getDataValue('zone') as AdminZone;
     const isCoach = this.getDataValue('role') === UserRoles.COACH;
-    return isCoach && WhatsappByZone[zone] ? WhatsappByZone[zone].url : null;
+    return isCoach && zone ? WhatsappByZone[zone].url : '';
   }
 
   @Column(DataType.VIRTUAL)
   get whatsappZoneCoachQR(): string {
     const zone = this.getDataValue('zone') as AdminZone;
     const isCoach = this.getDataValue('role') === UserRoles.COACH;
-    return isCoach && WhatsappByZone[zone] ? WhatsappByZone[zone].qr : null;
+    return isCoach && zone ? WhatsappByZone[zone].qr : '';
   }
 
   @BelongsToMany(

diff --git a/src/utils/types/WhatsappZone.ts b/src/utils/types/WhatsappZone.ts
@@ -19,7 +19,7 @@ export const WhatsappByZone = {
   [AdminZones.RENNES]: {
     name: 'Bretagne // Rennes & Lorient',
     qr: '/static/img/whatsapp-qrcode-coach/whatsapp-qrcode-rennes-lorient.png',
-    url: process.env.WHATSAPP_COACH_URL_RENNES_ORIENT as string,
+    url: process.env.WHATSAPP_COACH_URL_RENNES_LORIENT as string,
   },
   [AdminZones.LORIENT]: {
     name: 'Bretagne // Rennes & Lorient',