소스 검색

version 1.3 de middleware dans index.js

DESKTOP-SMCIPAV\falko 5 달 전
부모
커밋
8fff7c69b0
3개의 변경된 파일28개의 추가작업 그리고 36개의 파일을 삭제
  1. 11 8
      express-server/index.js
  2. 16 27
      express-server/package-lock.json
  3. 1 1
      express-server/package.json

+ 11 - 8
express-server/index.js

@@ -10,6 +10,9 @@ const { TextEncoder, TextDecoder } = require('util');
 global.TextEncoder = TextEncoder;
 global.TextDecoder = TextDecoder;
 
+// Correction Mongoose
+mongoose.set('strictQuery', false);
+
 // Import des routes (conservez toutes vos routes existantes)
 const userRoutes = require('./routes/user');
 const employeeRoutes = require('./routes/employee');
@@ -49,14 +52,7 @@ app.use(session({
 }));
 app.use(passport.initialize());
 
-// Proxy vers Angular SSR (modifié pour exclure /api)
-app.use('/', createProxyMiddleware({
-  target: 'http://angular_ssr_preprod:4000',
-  changeOrigin: true,
-  pathFilter: (path) => !path.startsWith('/api')
-}));
-
-// Routes API (conservées inchangées)
+// Routes API AVANT le proxy (très important !)
 app.get('/api', (req, res) => {
   res.status(200).send('Api Works.');
 });
@@ -71,6 +67,13 @@ app.use('/api/tirage', tirageRoutes);
 app.use('/api/contact', contactRoutes);
 app.use('/api/restaurants', restaurantRoutes);
 
+// Proxy vers Angular SSR EN DERNIER (pour toutes les autres routes)
+app.use('/', createProxyMiddleware({
+  target: 'http://angular_ssr_preprod:4000',
+  changeOrigin: true,
+  // Supprimez pathFilter - les routes API sont déjà gérées au-dessus
+}));
+
 // Connexion MongoDB (conservée inchangée)
 require('./lib/db');
 

+ 16 - 27
express-server/package-lock.json

@@ -1872,6 +1872,11 @@
         "defined": "^1.0.0"
       }
     },
+    "domino": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz",
+      "integrity": "sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="
+    },
     "dotenv": {
       "version": "16.4.7",
       "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
@@ -2382,31 +2387,15 @@
       }
     },
     "http-proxy-middleware": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-3.0.5.tgz",
-      "integrity": "sha512-GLZZm1X38BPY4lkXA01jhwxvDoOkkXqjgVyUzVxiEK4iuRu03PZoYHhHRwxnfhQMDuaxi3vVri0YgSro/1oWqg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz",
+      "integrity": "sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==",
       "requires": {
-        "@types/http-proxy": "^1.17.15",
-        "debug": "^4.3.6",
+        "@types/http-proxy": "^1.17.5",
         "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.3",
-        "is-plain-object": "^5.0.0",
-        "micromatch": "^4.0.8"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "4.4.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-          "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
-          "requires": {
-            "ms": "^2.1.3"
-          }
-        },
-        "ms": {
-          "version": "2.1.3",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-          "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-        }
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
       }
     },
     "https-proxy-agent": {
@@ -2530,10 +2519,10 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
       "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
     },
-    "is-plain-object": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",
-      "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q=="
+    "is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
     },
     "isarray": {
       "version": "0.0.1",

+ 1 - 1
express-server/package.json

@@ -26,7 +26,7 @@
     "express-prom-bundle": "^6.1.0",
     "express-rate-limit": "^5.1.3",
     "express-session": "^1.17.3",
-    "http-proxy-middleware": "^3.0.5",
+    "http-proxy-middleware": "^1.3.1",
     "jsonwebtoken": "^9.0.0",
     "mailgun-js": "^0.6.7",
     "mkdirp": "^1.0.4",