FRRe-DS · NotAntuaniton · Nov 29, 2025 · Nov 30, 2025 · Nov 30, 2025
diff --git a/DOCUMENTACION.md b/DOCUMENTACION.md
diff --git a/api-gateway/nginx.conf b/api-gateway/nginx.conf
@@ -24,9 +24,9 @@ http {
     # ⚠️  GRUPO 1 - COMPRAS
     # ⚠️  NO MODIFICAR ESTE BLOQUE
     # ============================================
-    # upstream compras-backend {
-    #     server compras-backend:5000;
-    # }
+    upstream compras-backend {
+        server compras-backend:8000;
+    }
 
     # ============================================
     # ⚠️  GRUPO 2 - STOCK (NOSOTROS)
@@ -40,9 +40,23 @@ http {
     # ⚠️  GRUPO 3 - LOGÍSTICA
     # ⚠️  NO MODIFICAR ESTE BLOQUE
     # ============================================
-    # upstream logistica-backend {
-    #     server logistica-backend:6000;
-    # }
+    upstream logistica-backend {
+        server logistica-backend:3010;
+    }
+
+    # ============================================
+    # KEYCLOAK - Servidor de Autenticación
+    # ============================================
+    upstream keycloak-server {
+        server keycloak:8080;
+    }
+
+    # ============================================
+    # FRONTEND - Next.js
+    # ============================================
+    upstream frontend-server {
+        server stock-frontend:3000;
+    }
 
     server {
         listen 80;
@@ -57,29 +71,20 @@ http {
 
         # ============================================
         # ⚠️  GRUPO 1 - COMPRAS
-        # ⚠️  Descomentarán cuando integren
+        # ⚠️  Ahora habilitado para integración
         # ============================================
-        # location /compras/ {
-        #     if ($cors_method = 1) {
-        #         add_header 'Access-Control-Allow-Origin' '*' always;
-        #         add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-        #         add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
-        #         add_header 'Access-Control-Max-Age' 1728000;
-        #         add_header 'Content-Type' 'text/plain; charset=utf-8';
-        #         add_header 'Content-Length' 0;
-        #         return 204;
-        #     }
-        #     
-        #     proxy_pass http://compras-backend/;
-        #     proxy_set_header Host $host;
-        #     proxy_set_header X-Real-IP $remote_addr;
-        #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #     proxy_set_header X-Forwarded-Proto $scheme;
-        #     
-        #     add_header 'Access-Control-Allow-Origin' '*' always;
-        #     add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-        #     add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
-        # }
+        location /compras/ {
+            proxy_pass http://compras-backend/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Prefix /compras;
+            proxy_set_header X-Script-Name /compras;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
 
         # ============================================
         # ⚠️  GRUPO 2 - STOCK (NOSOTROS)
@@ -94,57 +99,51 @@ http {
         }
 
         location /stock/ {
-            if ($cors_method = 1) {
-                add_header 'Access-Control-Allow-Origin' '*' always;
-                add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-                add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
-                add_header 'Access-Control-Max-Age' 1728000;
-                add_header 'Content-Type' 'text/plain; charset=utf-8';
-                add_header 'Content-Length' 0;
-                return 204;
-            }
-
             proxy_pass http://stock-backend/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
             proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             proxy_set_header X-Forwarded-Proto $scheme;
-
-            add_header 'Access-Control-Allow-Origin' '*' always;
-            add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-            add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
         }
 
         # ============================================
         # ⚠️  GRUPO 3 - LOGÍSTICA
-        # ⚠️  Descomentarán cuando integren
+        # ⚠️  Ahora habilitado para integración
         # ============================================
-        # location /logistica/ {
-        #     if ($cors_method = 1) {
-        #         add_header 'Access-Control-Allow-Origin' '*' always;
-        #         add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-        #         add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
-        #         add_header 'Access-Control-Max-Age' 1728000;
-        #         add_header 'Content-Type' 'text/plain; charset=utf-8';
-        #         add_header 'Content-Length' 0;
-        #         return 204;
-        #     }
-        #     
-        #     proxy_pass http://logistica-backend/;
-        #     proxy_set_header Host $host;
-        #     proxy_set_header X-Real-IP $remote_addr;
-        #     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-        #     proxy_set_header X-Forwarded-Proto $scheme;
-        #     
-        #     add_header 'Access-Control-Allow-Origin' '*' always;
-        #     add_header 'Access-Control-Allow-Methods' 'GET, POST, PUT, DELETE, PATCH, OPTIONS' always;
-        #     add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type, X-Requested-With' always;
-        # }
-
-        # Default location
+        location /logistica/ {
+            proxy_pass http://logistica-backend/;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+        }
+
+        # ============================================
+        # KEYCLOAK - Servidor de Autenticación
+        # ============================================
+        location ~ ^/(auth|realms|resources|js|css|fonts|img)/ {
+            proxy_pass http://keycloak-server;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_set_header X-Forwarded-Host $host;
+            proxy_set_header X-Forwarded-Port $server_port;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
+        }
+
+        # Default location - Servir frontend
         location / {
-            return 200 '{"status":"API Gateway Running","endpoints":["/stock/","/compras/","/logistica/"]}';
-            add_header Content-Type application/json;
+            proxy_pass http://frontend-server;
+            proxy_set_header Host $host;
+            proxy_set_header X-Real-IP $remote_addr;
+            proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+            proxy_set_header X-Forwarded-Proto $scheme;
+            proxy_http_version 1.1;
+            proxy_set_header Upgrade $http_upgrade;
+            proxy_set_header Connection "upgrade";
         }
     }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   keycloak-db:
     image: postgres:15
@@ -38,6 +36,9 @@ services:
     networks:
       - ds-network
 
+  # ============================================
+  # GRUPO 2 - STOCK (NOSOTROS)
+  # ============================================
   backend:
     build:
       context: ./mi-app-backend
@@ -53,9 +54,94 @@ services:
       - KEYCLOAK_URL=http://keycloak:8080
       - KEYCLOAK_REALM=ds-2025-realm
       - KEYCLOAK_CLIENT_ID=grupo-02
-      - KEYCLOAK_CLIENT_SECRET=grupo-02-secret
+      - KEYCLOAK_CLIENT_SECRET=58536bf8-8501-41c9-b411-786b6d654c25
+    depends_on:
+      - keycloak
+    networks:
+      - ds-network
+
+  # ============================================
+  # GRUPO 1/4 - COMPRAS (GRUPO 04)
+  # ============================================
+  compras-backend:
+    image: ghcr.io/frre-ds/backend-compras-g04:latest
+    container_name: compras-backend
+    ports:
+      - "5000:8000"
+    environment:
+      # Configuración del sitio
+      - SITE_URL=http://localhost
+      - APP_PATH_PREFIX=/compras
+      - BASE_API_URL=http://api-gateway/compras/api/
+      # URLs de integración (a través del API Gateway)
+      - PRODUCTOS_API_BASE_URL=http://api-gateway/stock
+      - STOCK_API_BASE_URL=http://api-gateway/stock
+      - LOGISTICA_API_BASE_URL=http://api-gateway/logistica
+      # Configuración de Keycloak
+      - KEYCLOAK_BASE_URL=http://keycloak:8080
+      - KEYCLOAK_PUBLIC_BASE_URL=http://localhost:8081
+      - KEYCLOAK_REALM=ds-2025-realm
+      - KEYCLOAK_CLIENT_ID=grupo-04
+      - KEYCLOAK_CLIENT_SECRET=6be1bec1-9472-499f-ab37-883d78f57829
     depends_on:
       - keycloak
+      - backend
+    networks:
+      - ds-network
+
+  # ============================================
+  # GRUPO 3 - LOGÍSTICA (GRUPO 03)
+  # ============================================
+  logistica-mysql:
+    image: mysql:8.0
+    container_name: logistica-mysql
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: root123
+      MYSQL_DATABASE: shipping_db
+      MYSQL_USER: shipping_user
+      MYSQL_PASSWORD: shipping_pass
+    ports:
+      - "3306:3306"
+    volumes:
+      - logistica_mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "-u", "shipping_user", "-pshipping_pass"]
+      interval: 3s
+      timeout: 5s
+      retries: 20
+      start_period: 10s
+    networks:
+      - ds-network
+
+  logistica-backend:
+    image: ghcr.io/frre-ds/2025-grupo-03-backend-logistica:376779cae5a75e077b5a2a324bcedbd10bf93da1
+    container_name: logistica-backend
+    restart: always
+    ports:
+      - "6000:3010"
+    environment:
+      # Configuración de MySQL
+      - DB_HOST=logistica-mysql
+      - DB_PORT=3306
+      - DB_USERNAME=shipping_user
+      - DB_PASSWORD=shipping_pass
+      - DB_DATABASE=shipping_db
+      # Configuración de Keycloak
+      - KEYCLOAK_URL=http://keycloak:8080
+      - KEYCLOAK_REALM=ds-2025-realm
+      - KEYCLOAK_CLIENT_ID=grupo-03
+      - KEYCLOAK_CLIENT_SECRET=21cd6616-6571-4ee7-be29-0f781f77c74e
+      # URLs de integración
+      - STOCK_API_URL=http://stock-backend:4000
+      - COMPRAS_API_URL=http://compras-backend:5000
+    depends_on:
+      logistica-mysql:
+        condition: service_healthy
+      keycloak:
+        condition: service_started
+      backend:
+        condition: service_started
     networks:
       - ds-network
 
@@ -64,15 +150,15 @@ services:
       context: ./frontend
       dockerfile: Dockerfile
       args:
-        - NEXT_PUBLIC_API_URL=http://localhost
+        - NEXT_PUBLIC_API_URL=http://localhost/api/v1
         - NEXT_PUBLIC_KEYCLOAK_URL=http://localhost:8081
         - NEXT_PUBLIC_KEYCLOAK_REALM=ds-2025-realm
         - NEXT_PUBLIC_KEYCLOAK_CLIENT_ID=grupo-02
     container_name: stock-frontend
     ports:
       - "3000:3000"
     environment:
-      - NEXT_PUBLIC_API_URL=http://localhost
+      - NEXT_PUBLIC_API_URL=http://localhost/api/v1
       - NEXT_PUBLIC_KEYCLOAK_URL=http://localhost:8081
       - NEXT_PUBLIC_KEYCLOAK_REALM=ds-2025-realm
       - NEXT_PUBLIC_KEYCLOAK_CLIENT_ID=grupo-02
@@ -99,3 +185,4 @@ networks:
 
 volumes:
   keycloak_data:
+  logistica_mysql_data:
diff --git a/frontend/src/app/layout.tsx b/frontend/src/app/layout.tsx
@@ -11,7 +11,17 @@ function LayoutContent({ children }: { children: React.ReactNode }) {
 
   const isLoginPage = pathname === "/";
 
-  if (loading) return null;
+  // Mostrar loader mientras carga
+  if (loading) {
+    return (
+      <div className="min-h-screen flex items-center justify-center">
+        <div className="text-center">
+          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-[#686DFF] mx-auto mb-4"></div>
+          <p className="text-gray-600">Cargando...</p>
+        </div>
+      </div>
+    );
+  }
 
   // ⭐ PROTECCIÓN DE RUTAS: si NO estoy logueado, no entro a nada excepto "/"
   if (!authenticated && !isLoginPage) {

diff --git a/frontend/src/app/page.tsx b/frontend/src/app/page.tsx
@@ -17,10 +17,11 @@ export default function Page() {
   const [error, setError] = useState('')
 
   useEffect(() => {
-    if (authenticated) {
+    // Solo redirigir si ya terminó de cargar Y está autenticado
+    if (!loading && authenticated) {
       router.push('/dashboard')
     }
-  }, [authenticated, router])
+  }, [authenticated, loading, router])
 
   const handleLogin = async (e: React.FormEvent) => {
     e.preventDefault()
@@ -81,17 +82,7 @@ export default function Page() {
     }
   }
 
-  if (loading) {
-    return (
-      <div className="min-h-screen flex items-center justify-center">
-        <div className="text-center">
-          <div className="animate-spin rounded-full h-12 w-12 border-b-2 border-[#686DFF] mx-auto mb-4"></div>
-          <p className="text-gray-600">Cargando...</p>
-        </div>
-      </div>
-    )
-  }
-
+  // Mostrar la pantalla de login inmediatamente, sin esperar a Keycloak
   return (
     <div className="min-h-screen flex">
       {/* Lado Izquierdo - Logo y Branding */}

diff --git a/frontend/src/componentes/KeycloakProvider.tsx b/frontend/src/componentes/KeycloakProvider.tsx
@@ -51,7 +51,7 @@ export const KeycloakProvider = ({ children }: { children: ReactNode }) => {
       keycloakHasBeenInitialized = true;
 
       keycloak.init({
-          onLoad: "check-sso",
+          onLoad: "check-sso", // Verifica SSO sin forzar login
           checkLoginIframe: false,
 
           // Tokens solo si NO venimos de un logout

diff --git a/keycloak-client-update.json b/keycloak-client-update.json
@@ -0,0 +1,11 @@
+{
+  "webOrigins": ["*"],
+  "redirectUris": [
+    "http://localhost/*",
+    "http://localhost:3000/*",
+    "http://localhost/",
+    "http://localhost:3000/"
+  ],
+  "rootUrl": "http://localhost",
+  "baseUrl": "http://localhost"
+}