merge: integrate Google OAuth and latest application fixes

deploy/prod/docker-compose.yml

@@ -36,8 +36,26 @@ services:
       NODE_ENV: production
       DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod
       JWT_SECRET: prod_secret_change_me
+<<<<<<< HEAD
       APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
       API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
+=======
+      APP_URL: http://192.168.1.23:5003
+      FRONTEND_URL: http://192.168.1.23:5175
+
+      MAIL_HOST: smtp.gmail.com
+      MAIL_PORT: 587
+      MAIL_USER: ""
+      MAIL_PASS: ""
+      MAIL_FROM: "The Tip Top <no-reply@tiptop.local>"
+>>>>>>> github/Emmanuel
+
+      # Injectés par le pipeline, jamais commités. Vides, les routes de
+      # connexion externe répondent 503 sans bloquer le démarrage.
+      GOOGLE_CLIENT_ID: "${GOOGLE_CLIENT_ID:-}"
+      GOOGLE_CLIENT_SECRET: "${GOOGLE_CLIENT_SECRET:-}"
+      FACEBOOK_APP_ID: "${FACEBOOK_APP_ID:-}"
+      FACEBOOK_APP_SECRET: "${FACEBOOK_APP_SECRET:-}"
 
     command: >
       sh -c "