env vbles config

Arquisoft · Dec 7, 2024 · 18bbefb · 18bbefb
1 parent 581e611
commit 18bbefb
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 123 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -189,13 +189,23 @@ jobs:
       ]
     steps:
       - name: Deploy over SSH
+        env:
+          ORIGIN_URL: ${{ env.ORIGIN_URL }}
+          AUTH_SERVICE_URL: ${{ env.AUTH_SERVICE_URL }}
+          USER_SERVICE_URL: ${{ env.USER_SERVICE_URL }}
+          QUESTION_SERVICE_URL: ${{ env.QUESTION_SERVICE_URL }}
+          STAT_SERVICE_URL: ${{ env.STAT_SERVICE_URL }}
         uses: fifsky/ssh-action@master
         with:
           host: ${{ secrets.DEPLOY_HOST }}
           user: ${{ secrets.DEPLOY_USER }}
           key: ${{ secrets.DEPLOY_KEY }}
           command: |
             wget https://raw.githubusercontent.com/arquisoft/wiq_7/master/docker-compose.yml -O docker-compose.yml
-            wget https://raw.githubusercontent.com/arquisoft/wiq_7/master/.env -O .env
+            echo "ORIGIN_URL=${{ env.ORIGIN_URL }}" >> .env
+            echo "AUTH_SERVICE_URL=${{ env.AUTH_SERVICE_URL }}" >> .env
+            echo "USER_SERVICE_URL=${{ env.USER_SERVICE_URL }}" >> .env
+            echo "QUESTION_SERVICE_URL=${{ env.QUESTION_SERVICE_URL }}" >> .env
+            echo "STAT_SERVICE_URL=${{ env.STAT_SERVICE_URL }}" >> .env
             docker compose --profile prod down
             docker compose --profile prod up -d --pull always
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -25,7 +25,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_USER: mongodb://mongodb:27017/userdb
 
   userservice:
     container_name: userservice-${teamname:-defaultASW}
@@ -39,7 +39,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/userdb
+      MONGODB_USER: mongodb://mongodb:27017/userdb
 
   questionservice:
     container_name: questionservice-${teamname:-defaultASW}
@@ -57,7 +57,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/questiondb
+      MONGODB_QUESTION: mongodb://mongodb:27017/questiondb
 
   statservice:
     container_name: statservice-${teamname:-defaultASW}
@@ -75,7 +75,7 @@ services:
     networks:
       - mynetwork
     environment:
-      MONGODB_URI: mongodb://mongodb:27017/statdb
+      MONGODB_STAT: mongodb://mongodb:27017/statdb
 
   gatewayservice:
     container_name: gatewayservice-${teamname:-defaultASW}
@@ -97,6 +97,7 @@ services:
     networks:
       - mynetwork
     environment:
+      ORIGIN_URL: http://localhost:3000
       AUTH_SERVICE_URL: http://authservice:8002
       USER_SERVICE_URL: http://userservice:8001
       QUESTION_SERVICE_URL: http://questionservice:8003

diff --git a/gatewayservice/gateway-service.js b/gatewayservice/gateway-service.js
@@ -15,6 +15,7 @@ if (process.env.NODE_ENV === 'development') {
 const app = express();
 const port = 8000;
 
+const originUrl = process.env.ORIGIN_URL || 'http://localhost:3000';
 const authServiceUrl = process.env.AUTH_SERVICE_URL || 'http://localhost:8002';
 const userServiceUrl = process.env.USER_SERVICE_URL || 'http://localhost:8001';
 const questionServiceUrl =
@@ -23,7 +24,7 @@ const statServiceUrl = process.env.STAT_SERVICE_URL || 'http://localhost:8004';
 
 app.use(
   cors({
-    origin: 'http://localhost:3000',
+    origin: originUrl,
     credentials: true,
     allowedHeaders: ['Authorization', 'Content-Type'],
   })

diff --git a/questionservice/question-service.js b/questionservice/question-service.js
@@ -11,7 +11,7 @@ app.use(express.json());
 
 // Connect to MongoDB
 const mongoUri =
-  process.env.MONGODB_URI || 'mongodb://localhost:27017/questiondb';
+  process.env.MONGODB_QUESTION || 'mongodb://localhost:27017/questiondb';
 mongoose.connect(mongoUri);
 
 app.use('/', questionRouter);

diff --git a/questionservice/question-service.test.js b/questionservice/question-service.test.js
@@ -16,7 +16,7 @@ let app;
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
   const mongoUri = mongoServer.getUri();
-  process.env.MONGODB_URI = mongoUri;
+  process.env.MONGODB_QUESTION = mongoUri;
   app = (await import('./question-service.js')).default; // Import app dynamically to ensure MONGODB_URI is set
 });
 

diff --git a/statservice/package-lock.json b/statservice/package-lock.json
diff --git a/statservice/package.json b/statservice/package.json
@@ -22,8 +22,6 @@
   },
   "homepage": "https://github.com/Arquisoft/wiq_7#readme",
   "dependencies": {
-    "cookie-parser": "^1.4.7",
-    "cors": "^2.8.5",
     "express": "^4.18.2",
     "http-status-codes": "^2.2.0",
     "jsonwebtoken": "^9.0.2",

diff --git a/statservice/stat-service.js b/statservice/stat-service.js
@@ -1,24 +1,15 @@
 // question-service.js
 import express from 'express';
 import mongoose from 'mongoose';
-import cors from 'cors';
-import cookieParser from 'cookie-parser';
 import statRouter from './stat-router.js';
 
 const app = express();
 const port = 8004;
 
-app.use(
-  cors({
-    origin: 'http://localhost:8000', // Dirección del gateway.
-    credentials: true, // Permite enviar cookies.
-  })
-);
 app.use(express.json());
-app.use(cookieParser());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/statdb';
+const mongoUri = process.env.MONGODB_STAT || 'mongodb://localhost:27017/statdb';
 mongoose.connect(mongoUri);
 
 app.use('/', statRouter);

diff --git a/statservice/stat-service.test.js b/statservice/stat-service.test.js
@@ -16,7 +16,7 @@ let app;
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
   const mongoUri = mongoServer.getUri();
-  process.env.MONGODB_URI = mongoUri;
+  process.env.MONGODB_STAT = mongoUri;
   app = (await import('./stat-service.js')).default; // Import app dynamically to ensure MONGODB_URI is set
 });
 

diff --git a/users/authservice/auth-service.js b/users/authservice/auth-service.js
@@ -9,7 +9,7 @@ const port = 8002;
 app.use(express.json());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
+const mongoUri = process.env.MONGODB_USER || 'mongodb://localhost:27017/userdb';
 
 console.log('auth service');
 console.log(mongoUri);

diff --git a/users/authservice/auth-service.test.js b/users/authservice/auth-service.test.js
@@ -24,7 +24,7 @@ async function addUser(user) {
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
   const mongoUri = mongoServer.getUri();
-  process.env.MONGODB_URI = mongoUri;
+  process.env.MONGODB_USER = mongoUri;
   app = (await import('./auth-service.js')).default; // Import app dynamically to ensure MONGODB_URI is set
   // Load database with initial conditions
   await addUser(user);

diff --git a/users/userservice/package-lock.json b/users/userservice/package-lock.json
diff --git a/users/userservice/package.json b/users/userservice/package.json
@@ -24,10 +24,8 @@
   "dependencies": {
     "bcrypt": "^5.1.1",
     "body-parser": "^1.20.2",
-    "cors": "^2.8.5",
     "express": "^4.18.2",
-    "mongoose": "^8.0.4",
-    "cookie-parser": "^1.4.7"
+    "mongoose": "^8.0.4"
   },
   "devDependencies": {
     "jest": "^29.7.0",

diff --git a/users/userservice/user-service.js b/users/userservice/user-service.js
@@ -1,24 +1,15 @@
 // user-service.js
 import express from 'express';
 import mongoose from 'mongoose';
-import cors from 'cors';
-import cookieParser from 'cookie-parser';
 import userRouter from './user-router.js';
 
 const app = express();
 const port = 8001;
 
-app.use(
-  cors({
-    origin: 'http://localhost:8000', // Dirección del gateway.
-    credentials: true, // Permite enviar cookies.
-  })
-);
 app.use(express.json());
-app.use(cookieParser());
 
 // Connect to MongoDB
-const mongoUri = process.env.MONGODB_URI || 'mongodb://localhost:27017/userdb';
+const mongoUri = process.env.MONGODB_USER || 'mongodb://localhost:27017/userdb';
 mongoose.connect(mongoUri);
 
 // userRouter

diff --git a/users/userservice/user-service.test.js b/users/userservice/user-service.test.js
@@ -7,7 +7,7 @@ let app;
 beforeAll(async () => {
   mongoServer = await MongoMemoryServer.create();
   const mongoUri = mongoServer.getUri();
-  process.env.MONGODB_URI = mongoUri;
+  process.env.MONGODB_USER = mongoUri;
   app = (await import('./user-service.js')).default; // Import app dynamically to ensure MONGODB_URI is set
 });
 

diff --git a/webapp/e2e/test-environment-setup.js b/webapp/e2e/test-environment-setup.js
@@ -9,10 +9,12 @@ async function startServer() {
   console.log('Starting MongoDB memory server...');
   mongoserver = await MongoMemoryServer.create();
   const mongoUri = mongoserver.getUri();
-  process.env.MONGODB_URI = mongoUri;
+  process.env.MONGODB_USER = mongoUri;
 
-  userservice = (await import('../../users/userservice/user-service.js')).default;
-  authservice = (await import('../../users/authservice/auth-service.js')).default;
+  userservice = (await import('../../users/userservice/user-service.js'))
+    .default;
+  authservice = (await import('../../users/authservice/auth-service.js'))
+    .default;
   gatewayservice = (await import('../../gatewayservice/gateway-service.js'))
     .default;
 }