Refactor code structure for improved readability and maintainability

docker-compose.yml

@@ -35,122 +35,6 @@ services:
           memory: 256M
     shm_size: 128mb
 
-  # PostgreSQL - Base de datos Keycloak
-  postgres-keycloak:
-    image: postgres:18-alpine
-    container_name: anexo76-postgres-keycloak
-    environment:
-      POSTGRES_DB: keycloak
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: ${POSTGRES_KEYCLOAK_PASSWORD:-postgres}
-      POSTGRES_INITDB_ARGS: "--encoding=UTF8"
-    ports:
-      - "5433:5432"
-    volumes:
-      - postgres_keycloak_data:/var/lib/postgresql/data
-      - ./scripts/postgres-keycloak-entrypoint.sh:/docker-entrypoint-initdb.d/init-keycloak.sh:ro
-    networks:
-      - auth-net
-      - backend-net
-    restart: unless-stopped
-    healthcheck:
-      test: [ "CMD-SHELL", "pg_isready -U postgres -d keycloak || exit 1" ]
-      interval: 5s
-      timeout: 3s
-      retries: 10
-      start_period: 20s
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    deploy:
-      resources:
-        limits:
-          memory: 512M
-        reservations:
-          memory: 256M
-    shm_size: 128mb
-
-  # Keycloak - Servidor de autenticación
-  keycloak:
-    image: quay.io/keycloak/keycloak:26.4
-    container_name: anexo76-keycloak
-    environment:
-      KEYCLOAK_ADMIN: ${KEYCLOAK_ADMIN:-admin}
-      KEYCLOAK_ADMIN_PASSWORD: ${KEYCLOAK_ADMIN_PASSWORD:-admin}
-      KC_DB: postgres
-      KC_DB_URL_HOST: postgres-keycloak
-      KC_DB_URL_PORT: "5432"
-      KC_DB_URL_DATABASE: keycloak
-      KC_DB_URL: jdbc:postgresql://postgres-keycloak:5432/keycloak
-      KC_DB_USERNAME: postgres
-      KC_DB_PASSWORD: ${POSTGRES_KEYCLOAK_PASSWORD:-postgres}
-      KC_DB_SCHEMA: public
-      KC_HOSTNAME: localhost
-      KC_HTTP_ENABLED: "true"
-      KC_HOSTNAME_STRICT: "false"
-      KC_HOSTNAME_STRICT_HTTPS: "false"
-      KC_PROXY_HEADERS: "xforwarded"
-      KC_HEALTH_ENABLED: "true"
-      KC_METRICS_ENABLED: "true"
-      KC_HOSTNAME_PATH: /kcauth
-      KC_LOG_LEVEL: INFO
-      JAVA_OPTS_APPEND: "-Xms256m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true"
-    command:
-      - start-dev
-      - --http-relative-path=/kcauth
-      - --db=postgres
-      - --db-url-host=postgres-keycloak
-      - --db-url-port=5432
-      - --db-url-database=keycloak
-      - --db-username=postgres
-      - --db-password=${POSTGRES_KEYCLOAK_PASSWORD:-postgres}
-      - --http-enabled=true
-      - --hostname-strict=false
-      - --proxy-headers=xforwarded
-    ports:
-      - "8080:8080"
-      - "9000:9000"
-    depends_on:
-      postgres-keycloak:
-        condition: service_healthy
-    volumes:
-      - keycloak_data:/opt/keycloak/data
-    networks:
-      - auth-net
-      - backend-net
-    restart: unless-stopped
-    healthcheck:
-      test:
-        [
-          "CMD-SHELL",
-          "exec 3<>/dev/tcp/127.0.0.1/9000; echo -e 'GET /kcauth/health/ready HTTP/1.1\r
-
-            Host: localhost\r
-
-            Connection: close\r
-
-            \r
-
-            ' >&3; grep -q 'HTTP/1.1 200' <&3 || exit 1"
-        ]
-      interval: 10s
-      timeout: 5s
-      retries: 30
-      start_period: 90s
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "10m"
-        max-file: "3"
-    deploy:
-      resources:
-        limits:
-          memory: 768M
-        reservations:
-          memory: 512M
-
   # Backend - FastAPI
   backend:
     build:
@@ -170,10 +54,8 @@ services:
       - CORE_DB_NAME=${CORE_DB_NAME:-anexo76_core}
       - CORE_DB_USER=${CORE_DB_USER:-postgres}
       - CORE_DB_PASSWORD=${POSTGRES_APP_PASSWORD:-postgres}
-      - KEYCLOAK_SERVER_URL=${KEYCLOAK_SERVER_URL:-http://keycloak:8080/kcauth}
-      - KEYCLOAK_REALM=${KEYCLOAK_REALM:-master}
-      - KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID:-anexo76-backend}
-      - KEYCLOAK_CLIENT_SECRET=${KEYCLOAK_CLIENT_SECRET:-dev-secret}
+      # Keycloak — apunta al Keycloak del Hub (ya no tiene Keycloak propio)
+
       - CORS_ORIGINS=${CORS_ORIGINS:-http://localhost:5173,http://localhost:3000}
       - SITAR_API_URL=${SITAR_API_URL}
       - SITAR_API_USER=${SITAR_API_USER}
@@ -182,13 +64,13 @@ services:
       - CENTRAL_SERVER_URL=${CENTRAL_SERVER_URL:-""}
       - SYNC_SECRET_TOKEN=${SYNC_SECRET_TOKEN:-change-this-sync-token-in-production}
       - SPOKE_URLS=${SPOKE_URLS:-""}
+      # Hub — URL interna para validación de licencias
+      - HUB_URL=${HUB_URL:-http://host.docker.internal:8001}
     ports:
       - "8000:8000"
     depends_on:
       postgres-a76:
         condition: service_healthy
-      keycloak:
-        condition: service_healthy
     volumes:
       - ./backend:/app
       - backend_cache:/app/__pycache__
@@ -231,14 +113,12 @@ services:
       - NODE_ENV=${NODE_ENV:-development}
       - VITE_API_URL=${VITE_API_URL:-http://localhost:8000/api/}
       - INTERNAL_API_URL=${INTERNAL_API_URL:-http://backend:8000/api/}
-      - VITE_KEYCLOAK_URL=${VITE_KEYCLOAK_URL:-http://localhost:8080/kcauth}
-      - VITE_KEYCLOAK_REALM=${VITE_KEYCLOAK_REALM:-master}
-      - VITE_KEYCLOAK_CLIENT_ID=${VITE_KEYCLOAK_CLIENT_ID:-anexo76-frontend}
-      - KEYCLOAK_URL=${KEYCLOAK_URL:-http://keycloak:8080/kcauth}
-      - KEYCLOAK_REALM=${KEYCLOAK_REALM:-master}
-      - KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID:-anexo76-backend}
-      - KEYCLOAK_CLIENT_SECRET=${KEYCLOAK_CLIENT_SECRET:-zRU5NuvUFtBSOuh7Kdc372AItoWGLgz9}
-      - VITE_HUB_MODE=${VITE_HUB_MODE:-true}
+      # Hub — URL pública para el browser y URL interna para server-side
+      - VITE_HUB_URL=${VITE_HUB_URL:-http://localhost:8001}
+      - INTERNAL_HUB_URL=${INTERNAL_HUB_URL:-http://host.docker.internal:8001}
+      # CORS / CSRF — trusted origins para svelte.config.js
+      - CORS_ORIGINS=${CORS_ORIGINS:-http://localhost:5173,http://localhost:3001}
+      - TRUSTED_ORIGINS=${TRUSTED_ORIGINS:-}
     ports:
       - "5173:5173"
     depends_on:
@@ -251,7 +131,6 @@ services:
       - ./scripts/frontend-entrypoint.sh:/frontend-entrypoint.sh:ro
     networks:
       - frontend-net
-      - auth-net
     restart: unless-stopped
     command: [ "pnpm", "run", "dev", "--", "--host", "0.0.0.0" ]
     healthcheck:
@@ -266,7 +145,7 @@ services:
         max-size: "10m"
         max-file: "3"
 
-  # celery
+  # Celery Worker
   celery_worker:
     build: ./backend
     container_name: worker
@@ -285,10 +164,6 @@ services:
       - CORE_DB_NAME=${CORE_DB_NAME:-anexo76_core}
       - CORE_DB_USER=${CORE_DB_USER:-postgres}
       - CORE_DB_PASSWORD=${POSTGRES_APP_PASSWORD:-postgres}
-      - KEYCLOAK_SERVER_URL=${KEYCLOAK_SERVER_URL:-http://keycloak:8080/kcauth}
-      - KEYCLOAK_REALM=${KEYCLOAK_REALM:-master}
-      - KEYCLOAK_CLIENT_ID=${KEYCLOAK_CLIENT_ID:-anexo76-backend}
-      - KEYCLOAK_CLIENT_SECRET=${KEYCLOAK_CLIENT_SECRET:-dev-secret}
       - VALKEY_URL=redis://valkey:6379/0
       - SITAR_API_URL=${SITAR_API_URL}
       - SITAR_API_USER=${SITAR_API_USER}
@@ -303,6 +178,7 @@ services:
     networks:
       - backend-net
 
+  # Celery Beat
   celery_beat:
     build: ./backend
     container_name: celery_beat
@@ -339,10 +215,6 @@ services:
 volumes:
   postgres_app_data:
     driver: local
-  postgres_keycloak_data:
-    driver: local
-  keycloak_data:
-    driver: local
   frontend_node_modules:
     driver: local
   backend_cache:
@@ -356,13 +228,8 @@ networks:
     ipam:
       config:
         - subnet: 172.20.0.0/16
-  auth-net:
-    driver: bridge
-    ipam:
-      config:
-        - subnet: 172.21.0.0/16
   frontend-net:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.22.0.0/16
+        - subnet: 172.22.0.0/16