Hotfix 3

docker-compose-deploy.yml

@@ -7,6 +7,6 @@ services:
   webapp:
     image: ghcr.io/arquisoft/lomap_en2b/webapp:latest
     ports:
-      - "3000:3000"
+      - "443:443"
     depends_on: 
       - restapi

docker-compose.yml

@@ -6,7 +6,7 @@ services:
   restapi:
     build: ./restapi
     ports:
-      - "8800:8800"
+      - "443:443"
   webapp:
     build: ./webapp
     ports:

restapi/index.ts

@@ -35,7 +35,7 @@ mongoose.connect("mongodb+srv://asw2b:[email protected]/?retryWrit
 );
 
 
-app.use(cors({origin:"https://172.162.240.176:3000"}))
+app.use(cors({origin:"https://172.162.240.176"}))
 
 
 app.use(cookieParser());

restapi/tests/api.test.ts

@@ -36,10 +36,7 @@ beforeAll(async () => {
     mongoose.connect(connectionString);
 });
 
-afterAll(async () => {
-    server.close() //close the server
-    mongoose.connection.close();
-})
+
 
 describe('user ', () => {
 
@@ -155,4 +152,9 @@ describe('user ', () => {
         const response:Response = await request(app).get("/solid/pepe/friends");
         expect(response.statusCode).toBe(500);
     });
-});
+});
+
+afterAll(async () => {
+    server.close() //close the server
+    mongoose.connection.close();
+})

webapp/src/axios.ts

@@ -1,5 +1,5 @@
 import axios from "axios";
 
 export const makeRequest = axios.create({
-  baseURL: "https://172.162.240.176:8800"
+  baseURL: "http://172.162.240.176:8800"
 });

webapp/src/pages/login/Login.tsx

@@ -28,7 +28,7 @@ const Login = () => {
                     InputProps={{
                         endAdornment: (
                             <LoginButton oidcIssuer={idp}
-                                         redirectUrl="https://172.162.240.176:3000/main/"
+                                         redirectUrl="https://172.162.240.176/main/"
                                          onError={console.error}>
                                 <Button variant="contained">
                                     Login