5 Commits

Author SHA1 Message Date
ad147eb930 release: promote 1.0.3 to production
All checks were successful
Tests / Backend - Tests skipped: 7, passed: 27
THE-TIP-TOP-MULTIBRANCH/pipeline/head This commit looks good
2026-08-20 23:55:16 +00:00
a09e9f17b5 fix: load OAuth secrets from server env file
All checks were successful
Tests / Backend - Tests skipped: 7, passed: 27
THE-TIP-TOP-MULTIBRANCH/pipeline/head This commit looks good
2026-08-20 23:44:36 +00:00
a40a62d600 fix: use backend API URL for Google OAuth
All checks were successful
Tests / Backend - Tests skipped: 7, passed: 27
THE-TIP-TOP-MULTIBRANCH/pipeline/head This commit looks good
2026-08-20 23:36:54 +00:00
12685c1b22 fix: resolve deployment compose conflicts
All checks were successful
Tests / Backend - Tests skipped: 7, passed: 27
THE-TIP-TOP-MULTIBRANCH/pipeline/head This commit looks good
2026-08-20 23:27:51 +00:00
3a0dd25ed2 ci: seed test database before backend tests
Some checks failed
Tests / Backend - Tests skipped: 7, passed: 27
THE-TIP-TOP-MULTIBRANCH/pipeline/head There was a failure building this commit
2026-08-20 23:15:38 +00:00
5 changed files with 9 additions and 55 deletions

1
Jenkinsfile vendored
View File

@@ -163,6 +163,7 @@ pipeline {
npm ci --prefer-offline --no-audit --no-fund && npm ci --prefer-offline --no-audit --no-fund &&
npx prisma generate && npx prisma generate &&
npx prisma migrate deploy && npx prisma migrate deploy &&
npx prisma db seed &&
npm test npm test
" "
''' '''

View File

@@ -36,25 +36,9 @@ services:
NODE_ENV: development NODE_ENV: development
DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db DATABASE_URL: postgresql://tiptop:tiptop_dev_password@postgres:5432/the_tip_top_db
JWT_SECRET: dev_secret_change_me JWT_SECRET: dev_secret_change_me
<<<<<<< HEAD
APP_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr APP_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr
API_PUBLIC_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api-dev.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://dev.dsp5-archi-o24a-4-5-g4.fr
APP_URL: http://192.168.1.23:5001
FRONTEND_URL: http://192.168.1.23:5173
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: > command: >
sh -c " sh -c "

View File

@@ -36,25 +36,9 @@ services:
NODE_ENV: preproduction NODE_ENV: preproduction
DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod DATABASE_URL: postgresql://tiptop_preprod:tiptop_preprod_password@postgres:5432/the_tip_top_preprod
JWT_SECRET: preprod_secret_change_me JWT_SECRET: preprod_secret_change_me
<<<<<<< HEAD
APP_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr APP_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr
API_PUBLIC_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api-preprod.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://preprod.dsp5-archi-o24a-4-5-g4.fr
APP_URL: http://192.168.1.23:5002
FRONTEND_URL: http://192.168.1.23:5174
MAIL_HOST: smtp.gmail.com
MAIL_PORT: 587
MAIL_USER: ""
MAIL_PASS: ""
MAIL_FROM: "The Tip Top Preprod <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: > command: >
sh -c " sh -c "

View File

@@ -36,26 +36,9 @@ services:
NODE_ENV: production NODE_ENV: production
DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod DATABASE_URL: postgresql://tiptop_prod:tiptop_prod_password@postgres:5432/the_tip_top_prod
JWT_SECRET: prod_secret_change_me JWT_SECRET: prod_secret_change_me
<<<<<<< HEAD
APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr APP_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr API_PUBLIC_URL: https://api.dsp5-archi-o24a-4-5-g4.fr
======= FRONTEND_URL: https://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: > command: >
sh -c " sh -c "

View File

@@ -17,8 +17,10 @@ export default function Connexion() {
// Navigation pleine page (et non fetch) : le flux OAuth passe par des // Navigation pleine page (et non fetch) : le flux OAuth passe par des
// redirections vers Google puis retour sur /auth/callback. // redirections vers Google puis retour sur /auth/callback.
const API_URL = import.meta.env.VITE_API_URL || ''
const handleGoogleLogin = () => { const handleGoogleLogin = () => {
window.location.href = '/api/auth/google' window.location.href = `${API_URL}/api/auth/google`
} }
const handleSubmit = async (e) => { const handleSubmit = async (e) => {