From 1bfcbf09043d8edecb53043d6921ac5279d2b515 Mon Sep 17 00:00:00 2001
From: Ammar Qaffaf <aqaffaf@yahoo.com>
Date: Mon, 26 Feb 2024 14:13:58 +0300
Subject: [PATCH] use pgcrypto

---
 apps/auth/src/config/app.config.ts                  | 13 +++++++------
 .../controllers/user-auth.controller.ts             |  1 +
 apps/backend/src/config/app.config.ts               | 13 +++++++------
 libs/common/src/database/database.module.ts         |  2 ++
 .../src/modules/session/entities/session.entity.ts  |  2 ++
 .../modules/user-otp/entities/user-otp.entity.ts    |  2 ++
 .../common/src/modules/user/entities/user.entity.ts |  2 ++
 7 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/apps/auth/src/config/app.config.ts b/apps/auth/src/config/app.config.ts
index ef1ad58..0ea13da 100644
--- a/apps/auth/src/config/app.config.ts
+++ b/apps/auth/src/config/app.config.ts
@@ -1,8 +1,9 @@
 export default () => ({
-  DB_HOST: process.env.DB_HOST,
-  DB_PORT: process.env.DB_PORT,
-  DB_USER: process.env.DB_USER,
-  DB_PASSWORD: process.env.DB_PASSWORD,
-  DB_NAME: process.env.DB_NAME,
-  DB_SYNC: process.env.DB_SYNC,
+  DB_HOST: process.env.AZURE_POSTGRESQL_HOST,
+  DB_PORT: process.env.AZURE_POSTGRESQL_PORT,
+  DB_USER: process.env.AZURE_POSTGRESQL_USER,
+  DB_PASSWORD: process.env.AZURE_POSTGRESQL_PASSWORD,
+  DB_NAME: process.env.AZURE_POSTGRESQL_DATABASE,
+  DB_SYNC: process.env.AZURE_POSTGRESQL_SYNC,
+  DB_SSL: process.env.AZURE_POSTGRESQL_SSL,
 });
diff --git a/apps/auth/src/modules/authentication/controllers/user-auth.controller.ts b/apps/auth/src/modules/authentication/controllers/user-auth.controller.ts
index 21f9f66..085dd2a 100644
--- a/apps/auth/src/modules/authentication/controllers/user-auth.controller.ts
+++ b/apps/auth/src/modules/authentication/controllers/user-auth.controller.ts
@@ -31,6 +31,7 @@ export class UserAuthController {
       statusCode: HttpStatus.CREATED,
       data: {
         id: signupUser.uuid,
+        default: () => 'gen_random_uuid()', // this is a default value for the uuid column
       },
       message: 'User Registered Successfully',
     };
diff --git a/apps/backend/src/config/app.config.ts b/apps/backend/src/config/app.config.ts
index ef1ad58..0ea13da 100644
--- a/apps/backend/src/config/app.config.ts
+++ b/apps/backend/src/config/app.config.ts
@@ -1,8 +1,9 @@
 export default () => ({
-  DB_HOST: process.env.DB_HOST,
-  DB_PORT: process.env.DB_PORT,
-  DB_USER: process.env.DB_USER,
-  DB_PASSWORD: process.env.DB_PASSWORD,
-  DB_NAME: process.env.DB_NAME,
-  DB_SYNC: process.env.DB_SYNC,
+  DB_HOST: process.env.AZURE_POSTGRESQL_HOST,
+  DB_PORT: process.env.AZURE_POSTGRESQL_PORT,
+  DB_USER: process.env.AZURE_POSTGRESQL_USER,
+  DB_PASSWORD: process.env.AZURE_POSTGRESQL_PASSWORD,
+  DB_NAME: process.env.AZURE_POSTGRESQL_DATABASE,
+  DB_SYNC: process.env.AZURE_POSTGRESQL_SYNC,
+  DB_SSL: process.env.AZURE_POSTGRESQL_SSL,
 });
diff --git a/libs/common/src/database/database.module.ts b/libs/common/src/database/database.module.ts
index 0302f0f..a80d929 100644
--- a/libs/common/src/database/database.module.ts
+++ b/libs/common/src/database/database.module.ts
@@ -31,6 +31,8 @@ import { UserOtpEntity } from '../modules/user-otp/entities';
           maxUses: 7500, // close (and replace) a connection after it has been used 7500 times (see below for discussion)
         },
         continuationLocalStorage: true,
+        ssl: Boolean(JSON.parse(configService.get('DB_SSL'))),
+
       }),
     }),
   ],
diff --git a/libs/common/src/modules/session/entities/session.entity.ts b/libs/common/src/modules/session/entities/session.entity.ts
index e536763..a4518f2 100644
--- a/libs/common/src/modules/session/entities/session.entity.ts
+++ b/libs/common/src/modules/session/entities/session.entity.ts
@@ -5,6 +5,8 @@ import { SessionDto } from '../dtos/session.dto';
 @Entity({ name: 'userSession' })
 export class UserSessionEntity extends AbstractEntity<SessionDto> {
   @Column({
+    type: 'uuid', 
+    default: () => 'gen_random_uuid()',
     nullable: false,
   })
   public uuid: string;
diff --git a/libs/common/src/modules/user-otp/entities/user-otp.entity.ts b/libs/common/src/modules/user-otp/entities/user-otp.entity.ts
index 207ef8c..6bd1540 100644
--- a/libs/common/src/modules/user-otp/entities/user-otp.entity.ts
+++ b/libs/common/src/modules/user-otp/entities/user-otp.entity.ts
@@ -6,6 +6,8 @@ import { OtpType } from '@app/common/constants/otp-type.enum';
 @Entity({ name: 'user-otp' })
 export class UserOtpEntity extends AbstractEntity<UserOtpDto> {
   @Column({
+    type: 'uuid', 
+    default: () => 'gen_random_uuid()', 
     nullable: false,
   })
   public uuid: string;
diff --git a/libs/common/src/modules/user/entities/user.entity.ts b/libs/common/src/modules/user/entities/user.entity.ts
index 3fd6748..c168c11 100644
--- a/libs/common/src/modules/user/entities/user.entity.ts
+++ b/libs/common/src/modules/user/entities/user.entity.ts
@@ -5,6 +5,8 @@ import { AbstractEntity } from '../../abstract/entities/abstract.entity';
 @Entity({ name: 'user' })
 export class UserEntity extends AbstractEntity<UserDto> {
   @Column({
+    type: 'uuid', 
+    default: () => 'gen_random_uuid()', // Use gen_random_uuid() for default value
     nullable: false,
   })
   public uuid: string;