Change configurations

Author: joelgarciajr84

.vscode/launch.json

@@ -4,9 +4,23 @@
     {
       "type": "node",
       "request": "attach",
-      "name": "DB MARVEL_API",
+      "name": "Debug MARVEL_API",
       "remoteRoot": "/usr/src/app/",
-      "localRoot": "${workspaceFolder}/marvel/",
+      "localRoot": "${workspaceFolder}/src/packages/marvel/",
+      "protocol": "inspector",
+      "port": 9230,
+      "restart": true,
+      "address": "localhost",
+      "sourceMaps": true,
+      "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
+      "skipFiles": ["<node_internals>/**"]
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Debug AUTH_API",
+      "remoteRoot": "/usr/src/app/",
+      "localRoot": "${workspaceFolder}/scr/packages/auth/",
       "protocol": "inspector",
       "port": 9230,
       "restart": true,

Dockerfile.AuthAPI

@@ -4,7 +4,7 @@ WORKDIR /usr/src/app
 
 ENV NODE_ENV=local
 
-COPY /src/packages/auth/package*.json ./
+COPY ./src/packages/auth/package*.json ./
 
 RUN npm install
 

docker-compose.yml

@@ -4,7 +4,7 @@ services:
   cockpit:
     container_name: cockpit
     build:
-      context: ./src/packages/cockpit
+      context: ./
     volumes:
       - ./src/packages/cockpit:/etc/nginx/
     ports:
@@ -17,7 +17,7 @@ services:
       context: ./
       dockerfile: ./Dockerfile.AuthAPI
     volumes:
-      - ./auth/:/usr/src/app/
+      - ./src/packages/auth/:/usr/src/app/
     networks:
       - monorepo_network
     ports:
@@ -30,7 +30,7 @@ services:
       context: ./
       dockerfile: ./Dockerfile.Marvel
     volumes:
-      - ./marvel/:/usr/src/app/
+      - ./src/packages/marvel/:/usr/src/app/
     networks:
       - monorepo_network
     ports:

src/packages/cockpit/nginx.conf

@@ -13,7 +13,7 @@ http {
         '' close;
     }
 
-    map $host $dev_base_host {
+    map $host $hml_base_url {
         default devenvironment.example.url.com;
     }
 
@@ -37,13 +37,24 @@ http {
         proxy_pass_request_headers on;
 
 
-        location /api/auth/ {
-            proxy_pass http://auth_api:3000$uri$is_args$args;
-            error_page 502 = @fallback_api_auth;
+        location ~ ^/api/auth(/?.*)$ {
+            proxy_pass http://auth_api:3000/auth$1?args;
+            error_page 502 = @fallback_auth_api;
         }
-        location @fallback_api_auth {
-            proxy_set_header Host $dev_base_host;
-            proxy_pass https://$dev_base_host/api/auth$uri$is_args$args;
+
+        location @fallback_auth_api {
+            proxy_set_header Host $hml_base_url;
+            proxy_pass https://$hml_base_url/api/auth$1?args;
+        }
+
+         location ~ ^/api/marvel(/?.*)$ {
+            proxy_pass http://marvel_api:3001/marvel$1?args;
+            error_page 502 = @fallback_marvel_api;
+        }
+        
+        location @fallback_marvel_api {
+            proxy_set_header Host $hml_base_url;
+            proxy_pass https://$hml_base_url/api/marvel$1?args;
         }
 
     }

src/packages/marvel/src/auth.guard.ts

@@ -1,7 +1,8 @@
 import { Injectable, CanActivate, ExecutionContext, HttpStatus, Logger, HttpException } from '@nestjs/common';
 import { lastValueFrom } from 'rxjs';
 import { HttpService } from '@nestjs/axios'
-
+import * as dotenv from 'dotenv';
+dotenv.config();
 
 @Injectable()
 export class AuthGuard implements CanActivate {
@@ -25,7 +26,7 @@ export class AuthGuard implements CanActivate {
     private async validateToken(token: string): Promise<boolean> {
 
         try {
-            const endpoint = `${process.env.TOKEN_VERIFY_SVC}/${token}`
+            const endpoint = `${process.env.TOKEN_VERIFY_SVC}/verify/${token}`
             const getTokenValidationRequest = this.httpService.get(endpoint)
 
             const result = await lastValueFrom(getTokenValidationRequest);