Api

 # compiled output
 # compiled output
 /dist
 /dist
 /node_modules
 /node_modules
-/libs
+/libs/*
 
 
 # Logs
 # Logs
 logs
 logs

 version: '3.9'
 version: '3.9'
 services:
 services:
-  mysql:
-    image: mysql:8.0
-    container_name: base-database
+  # mysql:
+  #   image: mysql:8.0
+  #   container_name: base-database
+  #   restart: always
+  #   environment:
+  #     MYSQL_ROOT_PASSWORD: '${DB_ROOT_PASSWORD}'
+  #     MYSQL_DATABASE: '${DB_NAME}'
+  #     MYSQL_USER: '${DB_USER}'
+  #     MYSQL_PASSWORD: '${DB_USER_PASSWORD}'
+  #   ports:
+  #     - '3306:3306'
+  #   env_file:
+  #     - .env
+  postgres:
+    image: postgres
     restart: always
     restart: always
+    container_name: base-pg-database
     environment:
     environment:
-      MYSQL_ROOT_PASSWORD: '${DB_ROOT_PASSWORD}'
-      MYSQL_DATABASE: '${DB_NAME}'
-      MYSQL_USER: '${DB_USER}'
-      MYSQL_PASSWORD: '${DB_USER_PASSWORD}'
+      POSTGRES_USER: root
+      POSTGRES_PASSWORD: toor
+    volumes:
+      - postgres:/var/lib/postgresql/data
     ports:
     ports:
-      - '3306:3306'
-    env_file:
-      - .env
+      - '5432:5432'

@@ -4,7 +4,8 @@
 # Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
 # Prisma supports the native connection string format for PostgreSQL, MySQL, SQLite, SQL Server, MongoDB and CockroachDB.
 # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
 # See the documentation for all the connection string options: https://pris.ly/d/connection-strings
 
 
-DATABASE_URL="mysql://root:toor@localhost:3306/base-db"
+#DATABASE_URL="mysql://root:toor@localhost:3306/base-db"
+DATABASE_URL=postgresql://develop:_nRi.Xw7AGSh@postgrebd.ditopay.io:5432/ditopay?schema=public
 
 
 #TESTING DATABASE . CHANGE TO YOUR OWN DATA
 #TESTING DATABASE . CHANGE TO YOUR OWN DATA
 DB_HOST=base-database
 DB_HOST=base-database
@@ -15,7 +16,8 @@ DB_USER_PASSWORD=basePassw
 DB_PORT=3306
 DB_PORT=3306
 DB_DRIVER=mysql
 DB_DRIVER=mysql
 PRIVATE_API_URL=http://localhost:3000
 PRIVATE_API_URL=http://localhost:3000
-API_KEY=80dc792592de35b9ac634a8a1f299cf7352e7230d1764b0a42e61b2f3422991d
+CLIENT_API_KEY=45aad74a22b04b0bedeb467aa28e2c6a90a595c68618b2b557081adec152c1f2
+PRIVATE_API_KEY=80dc792592de35b9ac634a8a1f299cf7352e7230d1764b0a42e61b2f3422991d
 TOKEN_EXPIRATION="30d"
 TOKEN_EXPIRATION="30d"
 TOKEN_SECRET=85712985fdd06085b3032b6d9dba16436f742e4dc650cd66e50bb20373c22f5c
 TOKEN_SECRET=85712985fdd06085b3032b6d9dba16436f742e4dc650cd66e50bb20373c22f5c
 CLIENT_SECRET=3d0f23390356bbd818b037863376bad3c7b80da765bb20d9db80d1275f2afd88
 CLIENT_SECRET=3d0f23390356bbd818b037863376bad3c7b80da765bb20d9db80d1275f2afd88

@@ -6,12 +6,14 @@ import { PrismaService } from 'src/config/prisma.service';
 import { AuthModule } from '../auth/auth.module';
 import { AuthModule } from '../auth/auth.module';
 import { DescryptMiddleware } from './middlewares/decrypt.middleware';
 import { DescryptMiddleware } from './middlewares/decrypt.middleware';
 import { PublicModule } from '@app/public';
 import { PublicModule } from '@app/public';
+import { PrivateModule } from '@app/private';
 import { ConfigModule } from '@nestjs/config';
 import { ConfigModule } from '@nestjs/config';
 import { ThrottlerModule } from '@nestjs/throttler';
 import { ThrottlerModule } from '@nestjs/throttler';
 
 
 @Module({
 @Module({
   imports: [
   imports: [
     PublicModule,
     PublicModule,
+    PrivateModule,
     UsersModule,
     UsersModule,
     AuthModule,
     AuthModule,
     ConfigModule.forRoot({
     ConfigModule.forRoot({

@@ -2,7 +2,7 @@ import { Controller, Request, Post, UseGuards } from '@nestjs/common';
 import { AuthService } from './auth.service';
 import { AuthService } from './auth.service';
 import { AuthGuard } from '@nestjs/passport';
 import { AuthGuard } from '@nestjs/passport';
 import { clientEncryptBody, privateEncryptBody } from 'src/helpers/encryptor.helper';
 import { clientEncryptBody, privateEncryptBody } from 'src/helpers/encryptor.helper';
-import { ApiKeyGuard } from './guards/api-key.guard';
+import { ApiKeyGuard } from './guards/public-api-key.guard';
 
 
 @Controller('auth')
 @Controller('auth')
 export class AuthController {
 export class AuthController {

 import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
 import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
 
 
 @Injectable()
 @Injectable()
-export class ApiKeyGuard implements CanActivate {
+export class PrivateApiKeyGuard implements CanActivate {
   async canActivate(context: ExecutionContext): Promise<boolean> {
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
     const request = context.switchToHttp().getRequest();
     const apiKey = request.headers['x-api-key'];
     const apiKey = request.headers['x-api-key'];
@@ -10,7 +10,7 @@ export class ApiKeyGuard implements CanActivate {
       throw new UnauthorizedException('No API key provided');
       throw new UnauthorizedException('No API key provided');
     }
     }
 
 
-    if (apiKey !== process.env.API_KEY) {
+    if (apiKey !== process.env.PRIVATE_API_KEY) {
       throw new UnauthorizedException('Invalid API key');
       throw new UnauthorizedException('Invalid API key');
     }
     }
     return true;
     return true;

+import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
+
+@Injectable()
+export class PublicApiKeyGuard implements CanActivate {
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+    const apiKey = request.headers['x-api-key'];
+
+    if (!apiKey) {
+      throw new UnauthorizedException('No API key provided');
+    }
+
+    if (apiKey !== process.env.CLIENT_API_KEY) {
+      throw new UnauthorizedException('Invalid API key');
+    }
+    return true;
+  }
+}

@@ -2,7 +2,7 @@ import { Controller, Get, Post, Body, Param, UseGuards } from '@nestjs/common';
 import { UsersService } from './users.service';
 import { UsersService } from './users.service';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { JwtAuthGuard } from '../auth/guards/jwt-auth.guard';
 import { privateEncryptBody } from 'src/helpers/encryptor.helper';
 import { privateEncryptBody } from 'src/helpers/encryptor.helper';
-import { ApiKeyGuard } from '../auth/guards/api-key.guard';
+import { PrivateApiKeyGuard } from '../auth/guards/private-api-key.guard';
 import { MixAuthGuard } from '../auth/guards/auth.guard';
 import { MixAuthGuard } from '../auth/guards/auth.guard';
 
 
 @Controller('users')
 @Controller('users')
@@ -15,13 +15,13 @@ export class UsersController {
     // return this.usersService.create({ data: createUserDto });
     // return this.usersService.create({ data: createUserDto });
   }
   }
 
 
-  @UseGuards(ApiKeyGuard, new MixAuthGuard('private'))
+  @UseGuards(PrivateApiKeyGuard, new MixAuthGuard('private'))
   @Get(':id')
   @Get(':id')
   async findOne(@Param('id') id: string) {
   async findOne(@Param('id') id: string) {
     return privateEncryptBody(await this.usersService.findOne(id));
     return privateEncryptBody(await this.usersService.findOne(id));
   }
   }
 
 
-  @UseGuards(ApiKeyGuard, JwtAuthGuard)
+  @UseGuards(PrivateApiKeyGuard, JwtAuthGuard)
   @Get()
   @Get()
   async findAll() {
   async findAll() {
     return privateEncryptBody(await this.usersService.findAll());
     return privateEncryptBody(await this.usersService.findAll());

@@ -20,8 +20,8 @@
     "paths": {
     "paths": {
       "@app/public": ["libs/public-api/src"],
       "@app/public": ["libs/public-api/src"],
       "@app/public/*": ["libs/public-api/src/*"],
       "@app/public/*": ["libs/public-api/src/*"],
-      "@app/private": ["libs/private/src"],
-      "@app/private/*": ["libs/private/src/*"]
+      "@app/private": ["libs/private-api/src"],
+      "@app/private/*": ["libs/private-api/src/*"]
     }
     }
   }
   }
 }
 }