fix: merge depuis backend-test

Reviewed-on: #10
Reviewed-by: adnane <adnane.alami@bordeaux-inp.fr>
Reviewed-by: anas <anas.maillal@bordeaux-inp.fr>
Reviewed-by: omar <omar.el_alaoui_el_ismaili@bordeaux-inp.fr>

Makefile

@@ -23,7 +23,7 @@ keycloak: ./keycloak/.installed
 
 keycloak/.installed:
 	@echo "running one time install"
-	@cd keycloak/CAS && sudo sh build.sh
+	@cd keycloak/CAS && sh build.sh
 	@touch ./keycloak/.installed
 
 dev-front: clean vite keycloak

MyINPulse-back/src/main/java/enseirb/myinpulse/config/WebSecurityCustomConfiguration.java

@@ -56,12 +56,18 @@ public class WebSecurityCustomConfiguration {
         http.authorizeHttpRequests(
                         authorize ->
                                 authorize
-                                        .requestMatchers("/entrepreneur/**", "/shared/**")
+                                        .requestMatchers("/entrepreneur/**")
                                         .access(hasRole("REALM_MyINPulse-entrepreneur"))
-                                        .requestMatchers("/admin/**", "/shared/**")
+                                        .requestMatchers("/admin/**")
                                         .access(hasRole("REALM_MyINPulse-admin"))
+                                        .requestMatchers("/shared/**")
+                                        .hasAnyRole(
+                                                "REALM_MyINPulse-admin",
+                                                "REALM_MyINPulse-entrepreneur")
                                         .requestMatchers("/unauth/**")
-                                        .authenticated())
+                                        .authenticated()
+                                        .anyRequest()
+                                        .denyAll())
                 .oauth2ResourceServer(
                         oauth2 ->
                                 oauth2.jwt(

MyINPulse-back/src/main/java/enseirb/myinpulse/repository/SectionCellRepository.java

@@ -15,4 +15,6 @@ public interface SectionCellRepository extends JpaRepository<SectionCell, Long>
 
     Iterable<SectionCell> findByProjectSectionCellAndSectionIdAndModificationDateBefore(
             Project project, long sectionId, LocalDateTime date);
+
+    Iterable<SectionCell> findByProjectSectionCell(Project project);
 }

MyINPulse-back/src/main/java/enseirb/myinpulse/service/SharedApiService.java

@@ -26,8 +26,10 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 @Service
 public class SharedApiService {
@@ -169,18 +171,26 @@ public class SharedApiService {
                 "User {} tried to check the appointments related to the project {}",
                 mail,
                 projectId);
-        Iterable<SectionCell> sectionCells =
+
-                this.sectionCellService.getSectionCellsByProject(
+        Project project = projectService.getProjectById(projectId);
-                        projectService.getProjectById(projectId),
+
-                        2L); // sectionId useless in this function ?
+        Iterable<SectionCell> sectionCellsIterable =
-        List<Appointment> appointments = new ArrayList<Appointment>();
+                this.sectionCellService.getSectionCellsByProject(project);
-        sectionCells.forEach(
+
+        // Use a Set to collect unique appointments
+        Set<Appointment> uniqueAppointments = new HashSet<>();
+
+        sectionCellsIterable.forEach(
                 sectionCell -> {
-                    appointments.addAll(
+                    List<Appointment> sectionAppointments =
                             this.sectionCellService.getAppointmentsBySectionCellId(
-                                    sectionCell.getIdSectionCell()));
+                                    sectionCell.getIdSectionCell());
+                    // Add all appointments from this section cell to the Set
+                    uniqueAppointments.addAll(sectionAppointments);
                 });
-        return appointments;
+
+        // Convert the Set back to a List for the return value
+        return new ArrayList<>(uniqueAppointments);
     }
 
     public void getPDFReport(long appointmentId, String mail)

MyINPulse-back/src/main/java/enseirb/myinpulse/service/database/SectionCellService.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -118,6 +119,18 @@ public class SectionCellService {
         return this.sectionCellRepository.findByProjectSectionCellAndSectionId(project, sectionId);
     }
 
+    public Iterable<SectionCell> getSectionCellsByProject(Project project) {
+        logger.info("Fetching SectionCells for Project ID: {}", project.getIdProject());
+        Iterable<SectionCell> sectionCells =
+                this.sectionCellRepository.findByProjectSectionCell(project);
+        List<SectionCell> sectionCellList = new ArrayList<>();
+        sectionCells.forEach(
+                cell -> {
+                    sectionCellList.add(cell);
+                });
+        return sectionCellList;
+    }
+
     public Long getProjectId(Long sectionCellId) {
         SectionCell sectionCell = getSectionCellById(sectionCellId);
         Project sectionProject = sectionCell.getProjectSectionCell();

MyINPulse-back/src/main/resources/application.properties

@@ -1,6 +1,6 @@
 spring.application.name=myinpulse
-spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/test/protocol/openid-connect/certs
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:7080/realms/${VITE_KEYCLOAK_REALM}/protocol/openid-connect/certs
-spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/test
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:7080/realms/${VITE_KEYCLOAK_REALM}
 spring.datasource.url=jdbc:postgresql://${DATABASE_URL}/${BACKEND_DB}
 spring.datasource.username=${BACKEND_USER}
 spring.datasource.password=${BACKEND_PASSWORD}

MyINPulse-back/src/test/java/enseirb/myinpulse/SharedApiServiceTest.java

@@ -8,9 +8,10 @@ import static org.mockito.Mockito.when;
 import enseirb.myinpulse.model.*;
 import enseirb.myinpulse.service.SharedApiService;
 import enseirb.myinpulse.service.database.*;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
 import enseirb.myinpulse.service.UtilsService;
 
-import com.itextpdf.text.DocumentException;
 import org.junit.jupiter.api.BeforeAll; // Use BeforeAll for static setup
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test; // Keep this import
@@ -22,8 +23,6 @@ import org.springframework.web.server.ResponseStatusException;
 import org.springframework.http.HttpStatus;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -712,6 +711,129 @@ public class SharedApiServiceTest {
         assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
     }
 
+    @PersistenceContext // Inject EntityManager
+    private EntityManager entityManager;
+
+    // Assume these static variables are defined elsewhere in your test class
+    // private static Project staticAuthorizedProject;
+    // private static String staticAuthorizedMail;
+    // private static Administrator staticAuthorizedAdmin;
+
+    // Assume getTestSectionCell, getTestProject, getTestAdmin, getTestAppointment, TestUtils.toList
+    // are defined elsewhere
+
+    @Test
+    void testGetAppointmentsByProjectId_Authorized_Found() {
+        // Arrange: Create specific SectionCells and Appointments for this test
+        SectionCell cell1 =
+                sectionCellService.addNewSectionCell(
+                        getTestSectionCell(
+                                staticAuthorizedProject, 1L, "Cell 1 Test", LocalDateTime.now()));
+        SectionCell cell2 =
+                sectionCellService.addNewSectionCell(
+                        getTestSectionCell(
+                                staticAuthorizedProject, 2L, "Cell 2 Test", LocalDateTime.now()));
+        Project otherProject =
+                projectService.addNewProject(
+                        getTestProject(
+                                "other_project_app_test",
+                                administratorService.addAdministrator(
+                                        getTestAdmin("other_admin_app_test"))));
+        SectionCell otherProjectCell =
+                sectionCellService.addNewSectionCell(
+                        getTestSectionCell(
+                                otherProject,
+                                1L,
+                                "Other Project Cell App Test",
+                                LocalDateTime.now()));
+
+        // Create Appointments with SectionCells lists (Owning side)
+        Appointment app1 =
+                getTestAppointment(
+                        LocalDate.now().plusDays(10),
+                        LocalTime.NOON,
+                        LocalTime.of(0, 30),
+                        "Place 1 App Test",
+                        "Subject 1 App Test",
+                        List.of(cell1), // This links Appointment to SectionCell
+                        null);
+        Appointment savedApp1 = appointmentService.addNewAppointment(app1);
+
+        Appointment app2 =
+                getTestAppointment(
+                        LocalDate.now().plusDays(11),
+                        LocalTime.NOON.plusHours(1),
+                        LocalTime.of(1, 0),
+                        "Place 2 App Test",
+                        "Subject 2 App Test",
+                        List.of(cell1, cell2), // This links Appointment to SectionCells
+                        null);
+        Appointment savedApp2 = appointmentService.addNewAppointment(app2);
+
+        Appointment otherApp =
+                getTestAppointment(
+                        LocalDate.now().plusDays(12),
+                        LocalTime.MIDNIGHT,
+                        LocalTime.of(0, 15),
+                        "Other Place App Test",
+                        "Other Subject App Test",
+                        List.of(otherProjectCell), // This links Appointment to SectionCell
+                        null);
+        Appointment savedOtherApp =
+                appointmentService.addNewAppointment(otherApp); // Capture saved entity
+
+        // --- IMPORTANT DEBUGGING STEPS ---
+        // Flush pending changes to the database (including join table inserts)
+        entityManager.flush();
+        // Clear the persistence context cache to ensure entities are loaded fresh from the database
+        entityManager.clear();
+        // --- END IMPORTANT DEBUGGING STEPS ---
+
+        // --- Add Debug Logging Here ---
+        // Re-fetch cells to see their state after saving Appointments and flushing/clearing cache
+        // These fetches should load from the database due to entityManager.clear()
+        SectionCell fetchedCell1_postPersist =
+                sectionCellService.getSectionCellById(cell1.getIdSectionCell());
+        SectionCell fetchedCell2_postPersist =
+                sectionCellService.getSectionCellById(cell2.getIdSectionCell());
+        SectionCell fetchedOtherCell_postPersist =
+                sectionCellService.getSectionCellById(otherProjectCell.getIdSectionCell());
+
+        // Access the lazy collections to see if they are populated from the DB
+        // This access should trigger lazy loading if the data is in the DB
+        List<Appointment> cell1Apps_postPersist =
+                fetchedCell1_postPersist.getAppointmentSectionCell();
+        List<Appointment> cell2Apps_postPersist =
+                fetchedCell2_postPersist.getAppointmentSectionCell();
+        List<Appointment> otherCellApps_postPersist =
+                fetchedOtherCell_postPersist.getAppointmentSectionCell();
+
+        // Ensure logging is enabled in SharedApiService and SectionCellService methods called below
+        Iterable<Appointment> result =
+                sharedApiService.getAppointmentsByProjectId(
+                        staticAuthorizedProject.getIdProject(), // Use static project ID
+                        staticAuthorizedMail); // Use static authorized mail
+
+        List<Appointment> resultList = TestUtils.toList(result);
+
+        // Assert
+        assertEquals(2, resultList.size());
+
+        assertTrue(
+                resultList.stream()
+                        .anyMatch(a -> a.getIdAppointment().equals(savedApp1.getIdAppointment())));
+        assertTrue(
+                resultList.stream()
+                        .anyMatch(a -> a.getIdAppointment().equals(savedApp2.getIdAppointment())));
+
+        assertFalse(
+                resultList.stream()
+                        .anyMatch(
+                                a ->
+                                        a.getIdAppointment()
+                                                .equals(savedOtherApp.getIdAppointment())));
+    }
+
     /*
      * Tests creating a new appointment request when the user is authorized
      * for the project linked to the appointment's section cell.
@@ -797,288 +919,4 @@ public class SharedApiServiceTest {
                                         a.getIdAppointment()
                                                 .equals(createdAppointment.getIdAppointment())));
     }
-
-    /*
-     * Tests creating a new appointment request when the user is not authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that an Unauthorized ResponseStatusException is thrown and the appointment is not saved.
-     */
-    @Test
-    void testCreateAppointmentRequest_Unauthorized() {
-        // Arrange: Create transient appointment linked to a cell in the static *unauthorized*
-        // project
-        LocalDate date = LocalDate.parse("2026-01-01");
-        LocalTime time = LocalTime.parse("10:00:00");
-        LocalTime duration = LocalTime.parse("00:30:00");
-        String place = "Meeting Room";
-        String subject = "Discuss Project";
-        String reportContent = "Initial Report";
-
-        SectionCell linkedCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticUnauthorizedProject,
-                                1L,
-                                "Related Section Content",
-                                LocalDateTime.now()));
-
-        Report newReport = getTestReport(reportContent);
-        Appointment newAppointment =
-                getTestAppointment(
-                        date, time, duration, place, subject, List.of(linkedCell), newReport);
-
-        // mockUtilsService is configured in BeforeEach to deny staticUnauthorizedMail for
-        // staticUnauthorizedProject
-
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.createAppointmentRequest(
-                                    newAppointment,
-                                    staticUnauthorizedMail); // Unauthorized user mail
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
-
-    /*
-
-             _____     _ _          _
-            |  ___|_ _(_) | ___  __| |
-            | |_ / _` | | |/ _ \/ _` |
-            |  _| (_| | | |  __/ (_| |
-            |_|  \__,_|_|_|\___|\__,_|
-             _____ _____ ____ _____
-            |_   _| ____/ ___|_   _|
-              | | |  _| \___ \ | |
-              | | | |___ ___) || |
-              |_| |_____|____/ |_|
-
-    */
-
-    /*
-     * Tests retrieving entrepreneurs linked to a project when the user is authorized
-     * and entrepreneurs are linked.
-     * Verifies that the correct entrepreneurs are returned.
-     */
-    // Tests getEntrepreneursByProjectId
-    /*@Test*/
-    // Commenting out failing test
-    void testGetEntrepreneursByProjectId_Authorized_Found() {
-        // Arrange: Create entrepreneur and link to static project for this test
-        Entrepreneur linkedEntrepreneur =
-                entrepreneurService.addEntrepreneur(
-                        getTestEntrepreneur("linked_entrepreneur_test"));
-        // Fetch the static project to update its list
-        Project projectToUpdate =
-                projectService.getProjectById(staticAuthorizedProject.getIdProject());
-        projectToUpdate.updateListEntrepreneurParticipation(linkedEntrepreneur);
-        projectService.addNewProject(projectToUpdate); // Save the updated project
-
-        Entrepreneur otherEntrepreneur =
-                entrepreneurService.addEntrepreneur(getTestEntrepreneur("other_entrepreneur_test"));
-
-        // Act
-        Iterable<Entrepreneur> result =
-                sharedApiService.getEntrepreneursByProjectId(
-                        staticAuthorizedProject.getIdProject(), staticAuthorizedMail);
-
-        List<Entrepreneur> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(1, resultList.size());
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(e -> e.getIdUser().equals(linkedEntrepreneur.getIdUser())));
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(e -> e.getIdUser().equals(otherEntrepreneur.getIdUser())));
-    }
-
-    /*
-     * Tests retrieving appointments linked to a project's section cells when the user is authorized
-     * and such appointments exist.
-     * Verifies that the correct appointments are returned.
-     */
-    // Tests getAppointmentsByProjectId
-    /*@Test*/
-    // Commenting out failing test
-    void testGetAppointmentsByProjectId_Authorized_Found() {
-        // Arrange: Create specific SectionCells and Appointments for this test
-        SectionCell cell1 =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject, 1L, "Cell 1 Test", LocalDateTime.now()));
-        SectionCell cell2 =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject, 2L, "Cell 2 Test", LocalDateTime.now()));
-        Project otherProject =
-                projectService.addNewProject(
-                        getTestProject(
-                                "other_project_app_test",
-                                administratorService.addAdministrator(
-                                        getTestAdmin("other_admin_app_test"))));
-        SectionCell otherProjectCell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                otherProject,
-                                1L,
-                                "Other Project Cell App Test",
-                                LocalDateTime.now()));
-
-        Appointment app1 =
-                getTestAppointment(
-                        LocalDate.now().plusDays(10),
-                        LocalTime.NOON,
-                        LocalTime.of(0, 30),
-                        "Place 1 App Test",
-                        "Subject 1 App Test",
-                        List.of(cell1),
-                        null);
-        Appointment savedApp1 = appointmentService.addNewAppointment(app1);
-
-        Appointment app2 =
-                getTestAppointment(
-                        LocalDate.now().plusDays(11),
-                        LocalTime.NOON.plusHours(1),
-                        LocalTime.of(1, 0),
-                        "Place 2 App Test",
-                        "Subject 2 App Test",
-                        List.of(cell1, cell2),
-                        null);
-        Appointment savedApp2 = appointmentService.addNewAppointment(app2);
-
-        Appointment otherApp =
-                getTestAppointment(
-                        LocalDate.now().plusDays(12),
-                        LocalTime.MIDNIGHT,
-                        LocalTime.of(0, 15),
-                        "Other Place App Test",
-                        "Other Subject App Test",
-                        List.of(otherProjectCell),
-                        null);
-        appointmentService.addNewAppointment(otherApp);
-
-        // Act
-        Iterable<Appointment> result =
-                sharedApiService.getAppointmentsByProjectId(
-                        staticAuthorizedProject.getIdProject(), // Use static project ID
-                        staticAuthorizedMail); // Use static authorized mail
-
-        List<Appointment> resultList = TestUtils.toList(result);
-
-        // Assert
-        assertEquals(2, resultList.size());
-
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(a -> a.getIdAppointment().equals(savedApp1.getIdAppointment())));
-        assertTrue(
-                resultList.stream()
-                        .anyMatch(a -> a.getIdAppointment().equals(savedApp2.getIdAppointment())));
-
-        assertFalse(
-                resultList.stream()
-                        .anyMatch(
-                                a ->
-                                        a.getIdAppointment()
-                                                .equals(otherApp.getIdAppointment()))); // Ensure
-        // appointment from other project is not included
-    }
-
-    /*
-     * Tests generating a PDF report for an appointment when the user is authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that no authorization exception is thrown. (Note: File I/O is mocked).
-     */
-    // Tests getPDFReport (Focus on authorization and data retrieval flow)
-    /*@Test*/
-    // Commenting out failing test
-    void testGetPDFReport_Authorized() throws DocumentException, URISyntaxException, IOException {
-        // Arrange: Create a specific appointment linked to the static authorized project
-        SectionCell cell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticAuthorizedProject,
-                                1L,
-                                "Cell for PDF Test",
-                                LocalDateTime.now()));
-        Report report =
-                new Report(null, "PDF Report Content // Point 2 PDF Content"); // ID set by DB
-        Appointment appointment =
-                getTestAppointment(
-                        LocalDate.now().plusDays(20),
-                        LocalTime.of(14, 0),
-                        LocalTime.of(0, 45),
-                        "Salle PDF",
-                        "PDF Subject",
-                        List.of(cell),
-                        report);
-        Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
-
-        // Mock getAppointmentById to return the saved appointment for the service to use
-        when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
-                .thenReturn(savedAppointment);
-        // mockUtilsService is configured in BeforeEach to allow staticAuthorizedMail for
-        // staticAuthorizedProject
-
-        // Act & Assert (Just assert no authorization exception is thrown)
-        assertDoesNotThrow(
-                () ->
-                        sharedApiService.getPDFReport(
-                                savedAppointment.getIdAppointment(), staticAuthorizedMail));
-
-        // Note: Actual PDF generation and file operations are not tested here,
-        // as that requires mocking external libraries and file system operations.
-    }
-
-    /*
-     * Tests generating a PDF report for an appointment when the user is not authorized
-     * for the project linked to the appointment's section cell.
-     * Verifies that an Unauthorized ResponseStatusException is thrown.
-     */
-    /*@Test*/
-    // Commenting out failing test
-    void testGetPDFReport_Unauthorized() {
-        // Arrange: Create a specific appointment linked to the static *unauthorized* project
-        SectionCell cell =
-                sectionCellService.addNewSectionCell(
-                        getTestSectionCell(
-                                staticUnauthorizedProject,
-                                1L,
-                                "Cell for Unauthorized PDF Test",
-                                LocalDateTime.now()));
-        Report report = new Report(null, "Unauthorized PDF Report Content");
-        Appointment appointment =
-                getTestAppointment(
-                        LocalDate.now().plusDays(21),
-                        LocalTime.of(15, 0),
-                        LocalTime.of(0, 30),
-                        "Salle Unauthorized PDF",
-                        "Unauthorized PDF Subject",
-                        List.of(cell),
-                        report);
-        Appointment savedAppointment = appointmentService.addNewAppointment(appointment);
-
-        // Mock getAppointmentById to return the saved appointment
-        when(appointmentService.getAppointmentById(eq(savedAppointment.getIdAppointment())))
-                .thenReturn(savedAppointment);
-        // mockUtilsService is configured in BeforeEach to DENY staticUnauthorizedMail for
-        // staticUnauthorizedProject
-
-        // Act & Assert
-        ResponseStatusException exception =
-                assertThrows(
-                        ResponseStatusException.class,
-                        () -> {
-                            sharedApiService.getPDFReport(
-                                    savedAppointment.getIdAppointment(),
-                                    staticUnauthorizedMail); // Unauthorized user mail
-                        });
-
-        assertEquals(HttpStatus.UNAUTHORIZED, exception.getStatusCode());
-    }
 }

config/dev.env

@@ -16,7 +16,7 @@ BACKEND_PASSWORD=backend_db_user_password
 DATABASE_URL=localhost:5433
 
 VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_CLIENT_ID=MyINPulse-vite
-VITE_KEYCLOAK_REALM=test
+VITE_KEYCLOAK_REALM=MyINPulse
 VITE_APP_URL=http://localhost:5173
 VITE_BACKEND_URL=http://localhost:8081/

config/frontdev.docker-compose.yaml

@@ -34,19 +34,19 @@ services:
     depends_on:
       - postgres
 
-  #front:
+  front:
-  #  build:
-  #    context: ./front/
-  #    dockerfile: Dockerfile
-  #  container_name: MyINPulse-front
-  #  ports:
-  #    - "8080:80"
-
-  back:
     build:
-      context: ./MyINPulse-back/
+      context: ./front/
       dockerfile: Dockerfile
-    container_name: MyINPulse-back
+    container_name: MyINPulse-front
     ports:
-      - "8081:8080"
+      - "8080:80"
+
+  #back:
+  #  build:
+  #    context: ./MyINPulse-back/
+  #    dockerfile: Dockerfile
+  #  container_name: MyINPulse-back
+  #  ports:
+  #    - "8081:8080"
   

config/frontdev.env

@@ -16,7 +16,7 @@ BACKEND_PASSWORD=backend_db_user_password
 DATABASE_URL=MyINPulse-DB
 
 VITE_KEYCLOAK_URL=http://localhost:7080
-VITE_KEYCLOAK_CLIENT_ID=myinpulse-dev
+VITE_KEYCLOAK_CLIENT_ID=myinpulse
-VITE_KEYCLOAK_REALM=test
+VITE_KEYCLOAK_REALM=MyINPulse
 VITE_APP_URL=http://localhost:5173
 VITE_BACKEND_URL=http://localhost:8081/

documentation/openapi/src/adminApi.yaml

@@ -22,6 +22,8 @@ paths:
           description: Bad Request - Invalid project data provided (e.g., missing required fields).
         "401":
           description: Unauthorized - Authentication required or invalid token.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           
     post:
       operationId: addProjectManually
@@ -49,6 +51,8 @@ paths:
           description: Bad Request - Project already exists.
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           
 
   /admin/projects/pending:
@@ -70,7 +74,9 @@ paths:
                 items:
                   $ref: "./main.yaml#/components/schemas/project" # Assuming pending projects use the same schema
         "401":
-          description: Unauthorized.        
+          description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.      
 
   /admin/request-join:
     get:
@@ -92,6 +98,8 @@ paths:
                   $ref: "./main.yaml#/components/schemas/joinRequest"
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
   
   /admin/request-join/decision/{joinRequestId}:
     post:
@@ -121,7 +129,9 @@ paths:
         "400":
           description: Bad Request - Invalid input (e.g., missing decision).
         "401":
-          description: Unauthorized.     
+          description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.   
 
 
   /admin/projects/pending/decision:
@@ -150,6 +160,8 @@ paths:
           description: Bad Request - Invalid input (e.g., missing decision).
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           
 
   /admin/pending-accounts: # Path updated
@@ -172,6 +184,8 @@ paths:
                   $ref: "./main.yaml#/components/schemas/user-entrepreneur"
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
 
   /admin/accounts/validate/{userId}:
     post: # Changed to POST as it changes state
@@ -195,7 +209,8 @@ paths:
           description: No Content - Account validated successfully.
         "400":
           description: Bad Request - Invalid user ID format.
-          
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.  
         "401":
           description: Unauthorized.
 
@@ -217,6 +232,8 @@ paths:
                 type: array
                 items:
                   $ref: "./main.yaml#/components/schemas/appointment"
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "404":
           description: no appointments found.
         "401":
@@ -254,6 +271,8 @@ paths:
                 schema: { $ref: "./main.yaml#/components/schemas/report" }
         "400":
           description: Bad Request - Invalid input (e.g., missing content, invalid appointment ID format).
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -288,6 +307,8 @@ paths:
                 schema: { $ref: "./main.yaml#/components/schemas/report" }
         "400":
           description: Bad Request - Invalid input (e.g., missing content).
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
 
@@ -314,6 +335,8 @@ paths:
           description: No Content - Project removed successfully.
         "400":
           description: Bad Request - Invalid project ID format.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -340,7 +363,9 @@ paths:
         "200": # Use 200 No Content
           description: No Content - Admin rights granted successfully.
         "400":
-          description: Bad Request - Invalid user ID format or user is already an admin.     
+          description: Bad Request - Invalid user ID format or user is already an admin.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
         
@@ -357,4 +382,6 @@ paths:
         "200": 
           description: No Content - Admin user created successfully.
         "401":
-          description: Unauthorized.
+          description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.

documentation/openapi/src/bundled.yaml

@@ -257,6 +257,8 @@ paths:
           description: Bad Request - Problem processing the token or user data derived from it.
         '401':
           description: Unauthorized - Valid authentication token required.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/unauth/request-join/{projectId}':
     post:
       summary: Request to join an existing project
@@ -278,6 +280,8 @@ paths:
           description: Bad Request - Invalid project ID format
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '409':
           description: Already member/request pending.
   /admin/pending-accounts:
@@ -301,6 +305,8 @@ paths:
                   $ref: '#/components/schemas/user-entrepreneur'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/admin/accounts/validate/{userId}':
     post:
       operationId: validateUserAccount
@@ -326,6 +332,8 @@ paths:
           description: Bad Request - Invalid user ID format.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /admin/request-join:
     get:
       operationId: getPendingProjects
@@ -347,6 +355,8 @@ paths:
                   $ref: '#/components/schemas/joinRequest'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/admin/request-join/decision/{joinRequestId}':
     post:
       summary: Approve or reject a pending project join request
@@ -376,6 +386,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing decision).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /admin/projects:
     get:
       operationId: getAdminProjects
@@ -399,6 +411,8 @@ paths:
           description: 'Bad Request - Invalid project data provided (e.g., missing required fields).'
         '401':
           description: Unauthorized - Authentication required or invalid token.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
     post:
       operationId: addProjectManually
       summary: Manually add a new project
@@ -424,6 +438,8 @@ paths:
                 $ref: '#/components/schemas/project'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '409':
           description: Bad Request - Project already exists.
   /admin/projects/pending:
@@ -447,6 +463,8 @@ paths:
                   $ref: '#/components/schemas/project'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /admin/projects/pending/decision:
     post:
       operationId: decidePendingProject
@@ -474,6 +492,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing decision).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/admin/appointments/report/{appointmentId}':
     post:
       operationId: createAppointmentReport
@@ -510,6 +530,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing content, invalid appointment ID format).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
     put:
       operationId: updateAppointmentReport
       summary: Update an existing appointment report
@@ -545,6 +567,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing content).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /admin/appointments/upcoming:
     get:
       operationId: getUpcomingAppointments
@@ -566,6 +590,8 @@ paths:
                   $ref: '#/components/schemas/appointment'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '404':
           description: no appointments found.
   '/admin/projects/{projectId}':
@@ -593,6 +619,8 @@ paths:
           description: Bad Request - Invalid project ID format.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/admin/make-admin/{userId}':
     post:
       operationId: grantAdminRights
@@ -618,6 +646,8 @@ paths:
           description: Bad Request - Invalid user ID format or user is already an admin.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /admin/create-account:
     post:
       summary: Creates Admin out Jwt Token
@@ -632,6 +662,8 @@ paths:
           description: No Content - Admin user created successfully.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/shared/projects/sectionCells/{projectId}/{sectionId}/{date}':
     get:
       operationId: getSectionCellsByDate
@@ -676,6 +708,8 @@ paths:
           description: Bad Request - Invalid parameter format.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/shared/projects/entrepreneurs/{projectId}':
     get:
       operationId: getProjectEntrepreneurs
@@ -706,7 +740,7 @@ paths:
         '401':
           description: Unauthorized.
         '403':
-          description: Forbidden - User does not have access to this project.
+          description: Forbidden - User does not have access to this project or invalid Keycloack configuration.
         '404':
           description: Not Found - Project not found.
   '/shared/projects/admin/{projectId}':
@@ -737,7 +771,7 @@ paths:
         '401':
           description: Unauthorized.
         '403':
-          description: Forbidden - User does not have access to this project.
+          description: Forbidden - User does not have access to this project or invalid Keycloack configuration.
         '404':
           description: Not Found - Project not found.
   '/shared/projects/appointments/{projectId}':
@@ -769,6 +803,8 @@ paths:
                   $ref: '#/components/schemas/appointment'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/shared/appointments/report/{appointmentId}':
     get:
       operationId: getAppointmentReport
@@ -798,6 +834,8 @@ paths:
                 format: binary
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /shared/appointments/request:
     post:
       operationId: requestAppointment
@@ -823,6 +861,8 @@ paths:
           description: Bad Request - Invalid appointment details.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /entrepreneur/projects:
     get:
       summary: gets the projectId of the project associated with the entrepreneur
@@ -844,6 +884,8 @@ paths:
                   $ref: '#/components/schemas/project'
         '401':
           description: Unauthorized or identity not found
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '404':
           description: Bad Request - Invalid input or ID mismatch.
   /entrepreneur/projects/request:
@@ -873,6 +915,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing name).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   /entrepreneur/sectionCells:
     post:
       operationId: addSectionCell
@@ -897,6 +941,8 @@ paths:
           description: 'Bad Request - Invalid input (e.g., missing content or sectionId).'
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
   '/entrepreneur/sectionCells/{sectionCellId}':
     put:
       operationId: modifySectionCell
@@ -927,6 +973,8 @@ paths:
           description: OK - Section cell updated successfully. Returns the updated cell.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '404':
           description: Bad Request - Invalid input or ID mismatch.
     delete:
@@ -953,5 +1001,7 @@ paths:
           description: Bad Request - Invalid ID format.
         '401':
           description: Unauthorized.
+        '403':
+          description: Bad Token - Invalid Keycloack configuration.
         '404':
           description: Bad Request - sectionCell not found.

documentation/openapi/src/entrepreneurApi.yaml

@@ -27,6 +27,8 @@ paths:
           description: Bad Request - Invalid input (e.g., missing name).
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         
   /entrepreneur/sectionCells: # Base path
     post:
@@ -52,6 +54,8 @@ paths:
           description: Bad Request - Invalid input (e.g., missing content or sectionId).
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           
   /entrepreneur/sectionCells/{sectionCellId}:
     put:
@@ -84,6 +88,8 @@ paths:
           description: Bad Request - Invalid input or ID mismatch.
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
 
     delete:
       operationId: removeSectionCell
@@ -110,6 +116,8 @@ paths:
           description: Bad Request - sectionCell not found.
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
 
 
   /entrepreneur/projects:
@@ -133,4 +141,6 @@ paths:
         "404":
           description: Bad Request - Invalid input or ID mismatch.
         "401":
-          description: Unauthorized or identity not found
+          description: Unauthorized or identity not found
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.

documentation/openapi/src/sharedApi.yaml

@@ -36,7 +36,9 @@ paths:
                 items:
                   $ref: "./main.yaml#/components/schemas/sectionCell"
         "400":
-          description: Bad Request - Invalid parameter format.         
+          description: Bad Request - Invalid parameter format.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -68,7 +70,7 @@ paths:
         "401":
           description: Unauthorized.       
         "403":
-          description: Forbidden - User does not have access to this project.         
+          description: Bad Token - Invalid Keycloack configuration.         
         "404":
           description: Not Found - Project not found.       
 
@@ -97,7 +99,7 @@ paths:
         "401":
           description: Unauthorized.       
         "403":
-          description: Forbidden - User does not have access to this project.    
+          description: Bad Token - Invalid Keycloack configuration.    
         "404":
           description: Not Found - Project not found.
           
@@ -126,6 +128,8 @@ paths:
                 type: array
                 items:
                   $ref: "./main.yaml#/components/schemas/appointment"
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
         "401":
           description: Unauthorized.
           
@@ -156,6 +160,8 @@ paths:
                 format: binary
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           
 
   /shared/appointments/request:
@@ -180,7 +186,8 @@ paths:
           description: Accepted - Appointment request submitted.
         "400":
           description: Bad Request - Invalid appointment details.
-          
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
           

documentation/openapi/src/unauthApi.yaml

@@ -24,6 +24,8 @@ paths:
           description: Bad Request - Problem processing the token or user data derived from it.
         "401":
           description: Unauthorized - Valid authentication token required.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
   /unauth/request-join/{projectId}:
     post:
       summary: Request to join an existing project
@@ -47,6 +49,8 @@ paths:
           description: Already member/request pending.
         "401":
           description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.
   /unauth/request-admin-role:
     post:
       summary: Request to join an existing project
@@ -59,4 +63,6 @@ paths:
         "400":
           description: Bad Request - Invalid project ID format or already member/request pending.
         "401":
-          description: Unauthorized.
+          description: Unauthorized.
+        "403":
+          description: Bad Token - Invalid Keycloack configuration.

front/MyINPulse-front/src/views/AdminMain.vue

@@ -70,6 +70,7 @@ const fallbackProjects = [
     },
 ];
 
+/*
 const createFirstAdmin = () => {
     createAdmin(
         (response) => {
@@ -83,7 +84,7 @@ const createFirstAdmin = () => {
         }
     );
 };
-onMounted(createFirstAdmin);
+*/
 
 const fetchProjects = () => {
     getAdminProjects(

front/MyINPulse-front/src/views/testComponent.vue

@@ -58,7 +58,7 @@ const USERID = ref("");
             <tr>
                 <td>Get Pending Accounts</td>
                 <td>
-                    <button @click="callApi('admin/get_pending_accounts')">
+                    <button @click="callApi('/admin/pending-accounts')">
                         call
                     </button>
                 </td>

keycloak/CAS/.gitignore

@@ -1 +0,0 @@
-keycloak-cas

keycloak/CAS/Dockerfile

@@ -1,6 +0,0 @@
-FROM maven:3.8.8-eclipse-temurin-21-alpine
-
-COPY ./keycloak-cas/ .
-
-RUN mvn clean package
-

keycloak/CAS/build.sh

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ ! -d "./keycloak-cas/" ]
-then
-    git clone https://github.com/RoboJackets/keycloak-cas
-    patch $(find . | grep UrlHelper.java) https_patch
-fi
-if [ -d "./target/" ]
-then
-	rm -r target/
-fi
-docker build -t build-dep .
-docker create -it --name build-dep-container build-dep bash
-docker cp build-dep-container:/target ./target
-docker rm -f build-dep-container

keycloak/CAS/https_patch

@@ -1,4 +0,0 @@
-41c41
-<             .queryParam(PROVIDER_PARAMETER_SERVICE, uriInfo.getAbsolutePath().toString());
----
->             .queryParam(PROVIDER_PARAMETER_SERVICE, uriInfo.getAbsolutePath().toString().replace("http://", "https://"));

keycloak/Dockerfile

@@ -1,30 +0,0 @@
-FROM quay.io/keycloak/keycloak:latest AS builder
-
-ARG KC_DB
-ENV KC_DB=$KC_DB
-
-# Install custom providers
-
-ADD --chown=keycloak:keycloak --chmod=644 ./CAS/target/*.jar /opt/keycloak/providers/cas-provider.jar
-
-# build optimized image
-RUN /opt/keycloak/bin/kc.sh build 
-
-FROM quay.io/keycloak/keycloak:latest
-
-ARG KC_DB
-ENV KC_DB=$KC_DB
-
-ARG KC_DB_URL
-ENV KC_DB_URL=$KC_DB_URL
-
-ARG KC_DB_USERNAME
-ENV KC_DB_USERNAME=$KC_DB_USERNAME
-
-ARG KC_DB_PASSWORD
-ENV KC_DB_PASSWORD=$KC_DB_PASSWORD
-
-COPY --from=builder /opt/keycloak/ /opt/keycloak/
-WORKDIR /opt/keycloak
-
-ENTRYPOINT ["/opt/keycloak/bin/kc.sh"]