Merge branch 'master' into Max/Backend/TeacherAdding

backend/src/main/java/ovh/herisson/Clyde/EndPoints/ApplicationsController.java

@@ -0,0 +1,62 @@
+package ovh.herisson.Clyde.EndPoints;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Tables.Applications;
+import ovh.herisson.Clyde.Tables.Role;
+
+import java.util.ArrayList;
+
+@RestController
+public class ApplicationsController {
+
+    AuthenticatorService authServ;
+
+    public ApplicationsController(AuthenticatorService authServ){
+    this.authServ = authServ;
+    }
+
+
+    /** return a list of authorized applications.
+     *  depends on the token
+     */
+    @GetMapping("/apps")
+    public ResponseEntity<Iterable<Applications>> getAuthorizedApps(@RequestHeader("Authorization") String token){
+
+        return new ResponseEntity<>(getAuthorizedApplications(token), HttpStatus.OK);
+    }
+
+    @GetMapping("/apps/{identifier}")
+    public ResponseEntity<Boolean> getAppAuthorization(@PathVariable Applications identifier, @RequestHeader("Authorization") String token){
+
+        if (getAuthorizedApplications(token).contains(identifier)){
+            return new ResponseEntity<>(true, HttpStatus.OK);
+        }
+        return new ResponseEntity<>(false, HttpStatus.OK);
+    }
+
+    public ArrayList<Applications> getAuthorizedApplications(String token){
+        Role posterRole = authServ.getUserFromToken(token).getRole();
+        ArrayList<Applications> authorizedApps = new ArrayList<>();
+
+        authorizedApps.add(Applications.Login);
+        authorizedApps.add(Applications.Profile);
+
+        if (posterRole == Role.Teacher || posterRole == Role.Student || posterRole == Role.Admin){
+            authorizedApps.add(Applications.Msg);
+            authorizedApps.add(Applications.Forum);
+            authorizedApps.add(Applications.Rdv);
+        }
+
+        if (posterRole == Role.Teacher || posterRole == Role.Secretary || posterRole == Role.Admin) authorizedApps.add(Applications.ManageCourses);
+
+        if (posterRole == Role.InscriptionService || posterRole == Role.Admin) authorizedApps.add(Applications.Inscription);
+
+        return authorizedApps;
+    }
+}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/CurriculumController.java

@@ -0,0 +1,46 @@
+package ovh.herisson.Clyde.EndPoints;
+
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import ovh.herisson.Clyde.Services.AuthenticatorService;
+import ovh.herisson.Clyde.Services.CurriculumCourseService;
+import ovh.herisson.Clyde.Services.CurriculumService;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.CurriculumCourse;
+import ovh.herisson.Clyde.Tables.Role;
+import ovh.herisson.Clyde.Tables.User;
+
+import java.util.Map;
+
+@RestController
+public class CurriculumController {
+
+
+    private final CurriculumService curriculumServ;
+    private final AuthenticatorService authServ;
+
+    private final CurriculumCourseService curriculumCourseServ;
+
+    public CurriculumController(CurriculumService curriculumServ, AuthenticatorService authServ, CurriculumCourseService curriculumCourseServ){
+        this.curriculumServ = curriculumServ;
+        this.authServ = authServ;
+        this.curriculumCourseServ = curriculumCourseServ;
+    }
+
+    @GetMapping("/curriculum/{id}")
+    public ResponseEntity<Curriculum> findById(@PathVariable long id){
+        return new ResponseEntity<>(curriculumServ.findById(id), HttpStatus.OK);
+    }
+
+    @GetMapping("/curriculums")
+    public ResponseEntity<Iterable<Map<String, Object>>> findAllindDepth(){
+        return new ResponseEntity<>(curriculumCourseServ.getAllDepthCurriculum(),HttpStatus.OK);
+    }
+
+    @GetMapping("/curriculum")
+    public ResponseEntity<Iterable<CurriculumCourse>> findAll(){
+        return new ResponseEntity<>(curriculumCourseServ.findAll(),HttpStatus.OK);
+    }
+}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/CursusController.java

@@ -1,71 +0,0 @@
-package ovh.herisson.Clyde.EndPoints;
-
-
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import ovh.herisson.Clyde.Responses.UnauthorizedResponse;
-import ovh.herisson.Clyde.Services.AuthenticatorService;
-import ovh.herisson.Clyde.Services.CursusCourseService;
-import ovh.herisson.Clyde.Services.CursusService;
-import ovh.herisson.Clyde.Tables.Cursus;
-import ovh.herisson.Clyde.Tables.CursusCourse;
-import ovh.herisson.Clyde.Tables.Role;
-import ovh.herisson.Clyde.Tables.User;
-
-import java.util.Map;
-
-@RestController
-public class CursusController {
-
-
-    private final CursusService cursusServ;
-    private final AuthenticatorService authServ;
-
-    private final CursusCourseService cursusCourseServ;
-
-    public CursusController(CursusService cursusServ, AuthenticatorService authServ, CursusCourseService cursusCourseServ){
-        this.cursusServ = cursusServ;
-        this.authServ = authServ;
-        this.cursusCourseServ = cursusCourseServ;
-    }
-
-    @GetMapping("/cursus/{id}")
-    public ResponseEntity<Cursus> findById(@PathVariable long id){
-        return new ResponseEntity<>(cursusServ.findById(id), HttpStatus.OK);
-    }
-
-    @GetMapping("/curriculums")
-    public ResponseEntity<Iterable<Map<String, Object>>> findAllindDepth(){
-        return new ResponseEntity<>(cursusCourseServ.getAllDepthCursus(),HttpStatus.OK);
-    }
-
-    @GetMapping("/curriculum")
-    public ResponseEntity<Iterable<CursusCourse>> findAll(){
-        return new ResponseEntity<>(cursusCourseServ.findAll(),HttpStatus.OK);
-    }
-
-    /**@PostMapping("/cursus")
-    public ResponseEntity<String> postCursus(@RequestHeader("Authorization") String token,@RequestBody Cursus cursus){
-
-        if (!isSecretaryOrAdmin(token)){
-            return new UnauthorizedResponse<>("you're not allowed to post a cursus");
-        }
-
-        cursusServ.save(cursus);
-
-        return new ResponseEntity<>("created !",HttpStatus.CREATED);
-    }**/
-
-
-
-    private boolean isSecretaryOrAdmin(String authorization){
-        if (authorization ==null)
-            return false;
-
-        User poster = authServ.getUserFromToken(authorization);
-        if (poster == null) return false;
-
-        return poster.getRole() == Role.Secretary && poster.getRole() == Role.Admin;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/InscriptionController.java

@@ -32,7 +32,7 @@ public class InscriptionController {
     @GetMapping("/requests/register")
     public ResponseEntity<Iterable<Map<String,Object>>> getAllRequests(@RequestHeader("Authorization") String token){
 
-        if (!isSecretaryOrAdmin(token)){return new UnauthorizedResponse<>(null);}
+        if (authServ.isNotSecretaryOrAdmin(token)){return new UnauthorizedResponse<>(null);}
 
         Iterable<InscriptionRequest> inscriptionRequests = inscriptionServ.getAll();
         ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
@@ -64,12 +64,12 @@ public class InscriptionController {
                                                                  @RequestHeader("Authorize") String token,
                                                                  @RequestBody RequestState requestState)
     {
-        if (!isSecretaryOrAdmin(token)) return new UnauthorizedResponse<>(null);
+        if (authServ.isNotSecretaryOrAdmin(token)) return new UnauthorizedResponse<>(null);
         inscriptionServ.modifyState(id, requestState);
         return null;
     }
 
-    private Map<String,Object> requestWithoutPassword(InscriptionRequest inscriptionRequest) {
+    private Map<String, Object> requestWithoutPassword(InscriptionRequest inscriptionRequest) {
         Map<String, Object> toReturn = new HashMap<>();
 
         toReturn.put("id", inscriptionRequest.getId());
@@ -78,20 +78,9 @@ public class InscriptionController {
         toReturn.put("address", inscriptionRequest.getAddress());
         toReturn.put("birthDate", inscriptionRequest.getBirthDate());
         toReturn.put("country", inscriptionRequest.getCountry());
-        toReturn.put("cursus", inscriptionRequest.getCursus());
+        toReturn.put("curriculum", inscriptionRequest.getCurriculum());
         toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
         toReturn.put("state", inscriptionRequest.getState());
         return toReturn;
     }
-
+}
-
-    private boolean isSecretaryOrAdmin(String authorization){
-        if (authorization ==null)
-            return false;
-
-        User poster = authServ.getUserFromToken(authorization);
-        if (poster == null) return false;
-
-        return poster.getRole() == Role.Secretary && poster.getRole() == Role.Admin;
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java

@@ -49,4 +49,4 @@ public class LoginController {
         authServ.register(inscriptionRequest);
         return new ResponseEntity<>("Is OK", HttpStatus.OK);
     }
-}
+}

backend/src/main/java/ovh/herisson/Clyde/EndPoints/MockController.java

@@ -20,18 +20,18 @@ public class MockController {
     public final UserRepository userRepo;
     public final TokenRepository tokenRepo;
     public final TokenService tokenService;
-    public final CursusCourseService cursusCourseService;
+    public final CurriculumCourseService CurriculumCourseService;
-    public final CursusService cursusService;
+    public final CurriculumService curriculumService;
     public final CourseService courseService;
     ArrayList<User> mockUsers;
 
 
-    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CursusCourseService cursusCourseService, CursusService cursusService, CourseService courseService){
+    public MockController(UserRepository userRepo, TokenRepository tokenRepo, TokenService tokenService, CurriculumCourseService CurriculumCourseService, CurriculumService curriculumService, CourseService courseService){
         this.tokenRepo = tokenRepo;
         this.userRepo = userRepo;
         this.tokenService = tokenService;
-        this.cursusCourseService = cursusCourseService;
+        this.CurriculumCourseService = CurriculumCourseService;
-        this.cursusService = cursusService;
+        this.curriculumService = curriculumService;
         this.courseService = courseService;
     }
 
@@ -51,20 +51,21 @@ public class MockController {
         User joe = new User("Mama","Joe","student@student.com","roundabout","DaWarudo",new Date(0), null,Role.Student,passwordEncoder.encode("student"));
         User meh = new User("Inspiration","lackOf","secretary@secretary.com","a Box","the street",new Date(0), null,Role.Secretary,passwordEncoder.encode("secretary"));
         User joke = new User("CthemBalls","Lemme","teacher@teacher.com","lab","faculty",new Date(0), null,Role.Teacher,passwordEncoder.encode("teacher"));
-        mockUsers = new ArrayList<User>(Arrays.asList(herobrine,joe,meh,joke));
+        User lena = new User("Louille","Lena","inscriptionService@InscriptionService.com","no","yes",new Date(0), null,Role.Teacher,passwordEncoder.encode("inscriptionService"));
+        mockUsers = new ArrayList<>(Arrays.asList(herobrine,joe,meh,joke));
 
         userRepo.saveAll(mockUsers);
 
 
         // Course / Curriculum part
 
-        Cursus infoBab1 = new Cursus(1,"info");
+        Curriculum infoBab1 = new Curriculum(1,"info");
-        Cursus chemistryBab1 = new Cursus(1,"chemistry");
+        Curriculum chemistryBab1 = new Curriculum(1,"chemistry");
-        Cursus psychologyBab1 = new Cursus(1,"psychology");
+        Curriculum psychologyBab1 = new Curriculum(1,"psychology");
 
-        cursusService.save(infoBab1);
+        curriculumService.save(infoBab1);
-        cursusService.save(chemistryBab1);
+        curriculumService.save(chemistryBab1);
-        cursusService.save(psychologyBab1);
+        curriculumService.save(psychologyBab1);
 
 
         Course progra1 = new Course(5,"Programmation et algorithimque 1","TODO DELETE");
@@ -78,15 +79,15 @@ public class MockController {
         courseService.save(commun);
 
 
-        cursusCourseService.save(new CursusCourse(infoBab1,progra1));
+        CurriculumCourseService.save(new CurriculumCourse(infoBab1,progra1));
-        cursusCourseService.save(new CursusCourse(infoBab1,commun));
+        CurriculumCourseService.save(new CurriculumCourse(infoBab1,commun));
 
-        cursusCourseService.save(new CursusCourse(psychologyBab1,psycho1));
+        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,psycho1));
-        cursusCourseService.save(new CursusCourse(psychologyBab1,commun));
+        CurriculumCourseService.save(new CurriculumCourse(psychologyBab1,commun));
 
 
-        cursusCourseService.save(new CursusCourse(chemistryBab1,commun));
+        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,commun));
-        cursusCourseService.save(new CursusCourse(chemistryBab1,chemistry1));
+        CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
 
 
 

backend/src/main/java/ovh/herisson/Clyde/EndPoints/UserController.java

@@ -40,7 +40,7 @@ public class UserController {
     @PostMapping("/user")
     public ResponseEntity<String> postUser(@RequestBody User user,@RequestHeader("Authorization") String authorization){
 
-        if (!isSecretaryOrAdmin(authorization))
+        if (authServ.isNotSecretaryOrAdmin(authorization))
             return new UnauthorizedResponse<>(null);
 
         userService.save(user);
@@ -50,7 +50,7 @@ public class UserController {
     @GetMapping("/users")
     public ResponseEntity<Iterable<HashMap<String,Object>>> getAllUsers(@RequestHeader("Authorization") String authorization){
 
-        if (!isSecretaryOrAdmin(authorization))
+        if (authServ.isNotSecretaryOrAdmin(authorization))
             return new UnauthorizedResponse<>(null);
 
         Iterable<User> users = userService.getAll();
@@ -97,7 +97,6 @@ public class UserController {
          */
     private HashMap<String,Object> userWithoutPassword(User user){
         HashMap<String,Object> toReturn = new HashMap<>();
-
         toReturn.put("regNo",user.getRegNo());
         toReturn.put("firstName",user.getFirstName());
         toReturn.put("lastName",user.getLastName());
@@ -105,20 +104,7 @@ public class UserController {
         toReturn.put("country",user.getCountry());
         toReturn.put("address",user.getAddress());
         toReturn.put("role",user.getRole());
-
         return toReturn;
     }
-
-    private boolean isSecretaryOrAdmin(String authorization){
-        System.out.println(authorization);
-        if (authorization ==null)
-            return false;
-
-        User poster = authServ.getUserFromToken(authorization);
-        if (poster == null) return false;
-        System.out.println(poster.getRole());
-
-        return poster.getRole() == Role.Secretary || poster.getRole() == Role.Admin;
-    }
 }
 

backend/src/main/java/ovh/herisson/Clyde/Repositories/CurriculumCourseRepository.java

@@ -0,0 +1,17 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Course;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.CurriculumCourse;
+
+public interface CurriculumCourseRepository extends CrudRepository<CurriculumCourse,Long> {
+
+    @Query("select distinct cc.course from CurriculumCourse cc where cc.curriculum = ?1")
+    Iterable<Course> findCoursesByCurriculum(Curriculum curriculum);
+
+
+    @Query("select distinct cc.curriculum from  CurriculumCourse cc")
+    Iterable<Curriculum> findDistinctCurriculums();
+}

backend/src/main/java/ovh/herisson/Clyde/Repositories/CurriculumRepository.java

@@ -0,0 +1,8 @@
+package ovh.herisson.Clyde.Repositories;
+
+import org.springframework.data.repository.CrudRepository;
+import ovh.herisson.Clyde.Tables.Curriculum;
+
+public interface CurriculumRepository extends CrudRepository<Curriculum,Long> {
+    Curriculum findById(long id);
+}

backend/src/main/java/ovh/herisson/Clyde/Repositories/CursusCourseRepository.java

@@ -1,20 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.jpa.repository.Query;
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Cursus;
-import ovh.herisson.Clyde.Tables.CursusCourse;
-
-public interface CursusCourseRepository extends CrudRepository<CursusCourse,Long> {
-
-
-    //todo faire custom query pour trouver tous les cours d'un cursus par un cursusId
-
-    @Query("select distinct cc.course from CursusCourse cc where cc.cursus = ?1")
-    Iterable<Course> findCoursesByCursus(Cursus cursus);
-
-
-    @Query("select distinct cc.cursus from  CursusCourse cc")
-    Iterable<Cursus> findDistinctCursuses();
-}

backend/src/main/java/ovh/herisson/Clyde/Repositories/CursusRepository.java

@@ -1,8 +0,0 @@
-package ovh.herisson.Clyde.Repositories;
-
-import org.springframework.data.repository.CrudRepository;
-import ovh.herisson.Clyde.Tables.Cursus;
-
-public interface CursusRepository extends CrudRepository<Cursus,Long> {
-    Cursus findById(long id);
-}

backend/src/main/java/ovh/herisson/Clyde/Services/AuthenticatorService.java

@@ -1,9 +1,8 @@
 package ovh.herisson.Clyde.Services;
 
 import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.EndPoints.LoginController;
-import ovh.herisson.Clyde.Repositories.InscriptionRepository;
 import ovh.herisson.Clyde.Tables.InscriptionRequest;
+import ovh.herisson.Clyde.Tables.Role;
 import ovh.herisson.Clyde.Tables.Token;
 import ovh.herisson.Clyde.Tables.User;
 
@@ -39,4 +38,17 @@ public class AuthenticatorService {
     public void register(InscriptionRequest inscriptionRequest) {
         inscriptionService.save(inscriptionRequest);
     }
+
+
+    public boolean isNotSecretaryOrAdmin(String authorization){
+        if (authorization ==null)
+            return true;
+
+        User poster = getUserFromToken(authorization);
+        if (poster == null) return true;
+
+        return poster.getRole() != Role.Secretary || poster.getRole() != Role.Admin;
+    }
+
 }
+

backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumCourseService.java

@@ -0,0 +1,68 @@
+package ovh.herisson.Clyde.Services;
+
+import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.CourseRepository;
+import ovh.herisson.Clyde.Repositories.CurriculumCourseRepository;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
+import ovh.herisson.Clyde.Tables.Course;
+import ovh.herisson.Clyde.Tables.Curriculum;
+import ovh.herisson.Clyde.Tables.CurriculumCourse;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+@Service
+public class CurriculumCourseService {
+
+    private final CurriculumCourseRepository curriculumCourseRepo;
+
+    private final CourseRepository courseRepo;
+
+    private final CurriculumRepository curriculumRepo;
+
+    public CurriculumCourseService(CurriculumCourseRepository curriculumCourseRepository, CourseRepository courseRepo, CurriculumRepository curriculumRepo) {
+        this.curriculumCourseRepo = curriculumCourseRepository;
+        this.courseRepo = courseRepo;
+        this.curriculumRepo = curriculumRepo;
+    }
+
+    public void save(CurriculumCourse curriculumCourse){
+        curriculumCourseRepo.save(curriculumCourse);
+    }
+
+    public Iterable<CurriculumCourse> findAll(){
+        return curriculumCourseRepo.findAll();
+    }
+
+
+    public Map<String, Object> getDepthCurriculum(Curriculum curriculum){
+
+        HashMap<String ,Object> toReturn = new HashMap<>();
+        ArrayList<Course> courses = new ArrayList<>();
+        for (Course c: curriculumCourseRepo.findCoursesByCurriculum(curriculum)){
+            courses.add(c);
+        }
+        toReturn.put("courses",courses);
+        toReturn.put("curriculumId", curriculum.getCurriculumId());
+        toReturn.put("year", curriculum.getYear());
+        toReturn.put("option", curriculum.getOption());
+
+
+        return  toReturn;
+    }
+
+    public Iterable<Map<String, Object>> getAllDepthCurriculum(){
+
+        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
+
+        for (Curriculum curriculum : curriculumCourseRepo.findDistinctCurriculums()){
+            toReturn.add(getDepthCurriculum(curriculum));
+        }
+        return toReturn;
+    }
+
+
+
+
+}

backend/src/main/java/ovh/herisson/Clyde/Services/CurriculumService.java

@@ -0,0 +1,32 @@
+package ovh.herisson.Clyde.Services;
+
+import org.springframework.stereotype.Service;
+import ovh.herisson.Clyde.Repositories.CourseRepository;
+import ovh.herisson.Clyde.Repositories.CurriculumRepository;
+import ovh.herisson.Clyde.Tables.Curriculum;
+
+@Service
+public class CurriculumService {
+
+    private final CurriculumRepository curriculumRepo;
+
+    private final CourseRepository courseRepo;
+
+    public CurriculumService(CurriculumRepository curriculumRepo, CourseRepository courseRepo){
+        this.curriculumRepo = curriculumRepo;
+        this.courseRepo = courseRepo;
+    }
+
+
+    public void save(Curriculum curriculum){
+        curriculumRepo.save(curriculum);
+    }
+
+    public Curriculum findById(long id){
+        return curriculumRepo.findById(id);
+    }
+
+    public Iterable<Curriculum> findAll(){
+        return curriculumRepo.findAll();
+    }
+}

backend/src/main/java/ovh/herisson/Clyde/Services/CursusCourseService.java

@@ -1,68 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.CursusCourseRepository;
-import ovh.herisson.Clyde.Repositories.CursusRepository;
-import ovh.herisson.Clyde.Tables.Course;
-import ovh.herisson.Clyde.Tables.Cursus;
-import ovh.herisson.Clyde.Tables.CursusCourse;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class CursusCourseService {
-
-    private final CursusCourseRepository cursusCourseRepo;
-
-    private final CourseRepository courseRepo;
-
-    private final CursusRepository cursusRepo;
-
-    public CursusCourseService(CursusCourseRepository cursusCourseRepo, CourseRepository courseRepo, CursusRepository cursusRepo) {
-        this.cursusCourseRepo = cursusCourseRepo;
-        this.courseRepo = courseRepo;
-        this.cursusRepo = cursusRepo;
-    }
-
-    public void save(CursusCourse cursusCourse){
-        cursusCourseRepo.save(cursusCourse);
-    }
-
-    public Iterable<CursusCourse> findAll(){
-        return cursusCourseRepo.findAll();
-    }
-
-
-    public Map<String, Object> getDepthCursus(Cursus cursus){
-
-        HashMap<String ,Object> toReturn = new HashMap<>();
-        ArrayList<Course> courses = new ArrayList<>();
-        for (Course c: cursusCourseRepo.findCoursesByCursus(cursus)){
-            courses.add(c);
-        }
-        toReturn.put("courses",courses);
-        toReturn.put("cursusId",cursus.getCursusId());
-        toReturn.put("year",cursus.getYear());
-        toReturn.put("option",cursus.getOption());
-
-
-        return  toReturn;
-    }
-
-    public Iterable<Map<String, Object>> getAllDepthCursus(){
-
-        ArrayList<Map<String,Object>> toReturn = new ArrayList<>();
-
-        for (Cursus cursus : cursusCourseRepo.findDistinctCursuses()){
-            toReturn.add(getDepthCursus(cursus));
-        }
-        return toReturn;
-    }
-
-
-
-
-}

backend/src/main/java/ovh/herisson/Clyde/Services/CursusService.java

@@ -1,36 +0,0 @@
-package ovh.herisson.Clyde.Services;
-
-import org.springframework.stereotype.Service;
-import ovh.herisson.Clyde.Repositories.CourseRepository;
-import ovh.herisson.Clyde.Repositories.CursusRepository;
-import ovh.herisson.Clyde.Tables.Cursus;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class CursusService {
-
-
-    private final CursusRepository cursusRepo;
-
-    private final CourseRepository courseRepo;
-
-    public CursusService(CursusRepository cursusRepo, CourseRepository courseRepo){
-        this.cursusRepo = cursusRepo;
-        this.courseRepo = courseRepo;
-    }
-
-
-    public void save(Cursus cursus){
-        cursusRepo.save(cursus);
-    }
-
-    public Cursus findById(long id){
-        return cursusRepo.findById(id);
-    }
-
-    public Iterable<Cursus> findAll(){
-        return cursusRepo.findAll();
-    }
-}

backend/src/main/java/ovh/herisson/Clyde/Services/InscriptionService.java

@@ -31,4 +31,4 @@ public class InscriptionService {
         inscriptionRequest.setState(requestState);
         save(inscriptionRequest);
     }
-}
+}

backend/src/main/java/ovh/herisson/Clyde/Services/StorageService.java

@@ -4,10 +4,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import ovh.herisson.Clyde.Repositories.FileRepository;
 import ovh.herisson.Clyde.Tables.*;
-
 import java.io.File;
 import java.io.IOException;
-
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

backend/src/main/java/ovh/herisson/Clyde/Services/TokenService.java

@@ -5,16 +5,15 @@ import org.springframework.stereotype.Service;
 import ovh.herisson.Clyde.Repositories.TokenRepository;
 import ovh.herisson.Clyde.Tables.Token;
 import ovh.herisson.Clyde.Tables.User;
-
 import java.io.UnsupportedEncodingException;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.Calendar;
-import java.util.Date;
 
 @Service
 public class TokenService {
-    TokenRepository tokenRepo;
+    private final TokenRepository tokenRepo;
 
     public TokenService(TokenRepository tokenRepo){
         this.tokenRepo = tokenRepo;
@@ -30,13 +29,10 @@ public class TokenService {
         new SecureRandom().nextBytes(bytes);
         for (int i = 0; i < bytes.length; i++) {
             bytes[i] = (byte) (((bytes[i]+256)%256  %95+ 32));
-            while ((char)bytes[i] == ';'){
-                bytes[i] = new SecureRandom().generateSeed(1)[0];
-            }
         }
         // will never end up in the catch because of the way that SecureRandom.nextBytes is implemented
         try {
-            return new String(bytes,"ISO_8859_1");
+            return new String(Base64.getEncoder().encode(bytes),"ISO_8859_1");
         } catch (UnsupportedEncodingException e) {
             throw new RuntimeException(e);
         }

backend/src/main/java/ovh/herisson/Clyde/Tables/Applications.java

@@ -0,0 +1,21 @@
+package ovh.herisson.Clyde.Tables;
+
+public enum Applications {
+    // without any token
+    Login,
+
+    // with any token
+    Profile,
+
+
+    // Students and higher authorization
+    Msg,
+    Forum,
+    Rdv,
+
+    // teachers and Secretary authorization
+    ManageCourses,
+
+    // InscriptionService authorization
+    Inscription
+}

backend/src/main/java/ovh/herisson/Clyde/Tables/Curriculum.java

@@ -6,21 +6,21 @@ import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
 @Entity
-public class Cursus {
+public class Curriculum {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-    private int cursusId;
+    private int curriculumId;
     private int year;
     private String option;
-    public Cursus(int year, String option){
+    public Curriculum(int year, String option){
         this.year = year;
         this.option = option;
     }
 
-    public Cursus() {}
+    public Curriculum() {}
 
-    public int getCursusId(){
+    public int getCurriculumId(){
-        return this.cursusId;
+        return this.curriculumId;
     }
 
     public int getYear(){

backend/src/main/java/ovh/herisson/Clyde/Tables/CurriculumCourse.java

@@ -3,25 +3,25 @@ package ovh.herisson.Clyde.Tables;
 import jakarta.persistence.*;
 
 @Entity
-public class CursusCourse {
+public class CurriculumCourse {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
     @ManyToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "Cursus")
+    @JoinColumn(name = "Curriculum")
-    private Cursus cursus;
+    private Curriculum curriculum;
 
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "Course")
     private Course course;
 
-    public CursusCourse(Cursus cursus, Course course){
+    public CurriculumCourse(Curriculum curriculum, Course course){
-        this.cursus = cursus;
+        this.curriculum = curriculum;
         this.course = course;
     }
 
-    public CursusCourse() {}
+    public CurriculumCourse() {}
 
     public int getId() {
         return id;
@@ -35,11 +35,11 @@ public class CursusCourse {
         this.course = course;
     }
 
-    public Cursus getCursus() {
+    public Curriculum getCurriculum() {
-        return cursus;
+        return curriculum;
     }
 
-    public void setCursus(Cursus cursus) {
+    public void setCurriculum(Curriculum curriculum) {
-        this.cursus = cursus;
+        this.curriculum = curriculum;
     }
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/InscriptionRequest.java

@@ -18,8 +18,8 @@ public class InscriptionRequest {
     private Date birthDate;
 
     @ManyToOne
-    @JoinColumn(name="Cursus")
+    @JoinColumn(name="Curriculum")
-    private Cursus cursus;
+    private Curriculum curriculum;
     private RequestState state;
     private String profilePicture;
 
@@ -89,12 +89,12 @@ public class InscriptionRequest {
         this.birthDate = birthDate;
     }
 
-    public Cursus getCursus() {
+    public Curriculum getCurriculum() {
-        return cursus;
+        return curriculum;
     }
 
-    public void setCursus(Cursus cursus) {
+    public void setCurriculum(Curriculum curriculum) {
-        this.cursus = cursus;
+        this.curriculum = curriculum;
     }
 
     public RequestState getState() {

backend/src/main/java/ovh/herisson/Clyde/Tables/ReinscriptionRequest.java

@@ -13,26 +13,26 @@ public class ReinscriptionRequest {
     private User user;
 
     @ManyToOne
-    @JoinColumn(name = "Cursus")
+    @JoinColumn(name = "Curriculum")
-    private Cursus newCursus;
+    private Curriculum newCurriculum;
     private RequestState state;
 
-    //Permet de différencier les demandes de changement et une réinscription dans le même cursus
+    //Permet de différencier les demandes de changement et une réinscription dans le même Curriculum
     //Pour la réinscription on va le mettre a 0
     private boolean type = false;
 
     public ReinscriptionRequest(){}
 
-    public ReinscriptionRequest(User user, Cursus newCursus, RequestState state, boolean type){
+    public ReinscriptionRequest(User user, Curriculum newCurriculum, RequestState state, boolean type){
         this.user = user;
-        this.newCursus = newCursus;
+        this.newCurriculum = newCurriculum;
         this.state = state;
         this.type = type;
     }
 
-    public ReinscriptionRequest(User user, Cursus newCursus, RequestState state){
+    public ReinscriptionRequest(User user, Curriculum newCurriculum, RequestState state){
         this.user = user;
-        this.newCursus = newCursus;
+        this.newCurriculum = newCurriculum;
         this.state = state;
     }
 
@@ -48,12 +48,12 @@ public class ReinscriptionRequest {
         this.user = user;
     }
 
-    public Cursus getNewCursus() {
+    public Curriculum getNewCurriculum() {
-        return newCursus;
+        return newCurriculum;
     }
 
-    public void setNewCursus(Cursus newCursus) {
+    public void setNewCurriculum(Curriculum newCurriculum) {
-        this.newCursus = newCursus;
+        this.newCurriculum = newCurriculum;
     }
 
     public RequestState getState() {

backend/src/main/java/ovh/herisson/Clyde/Tables/RequestState.java

@@ -3,5 +3,5 @@ package ovh.herisson.Clyde.Tables;
 public enum RequestState {
     Accepted,
     Refused,
-    Pending;
+    Pending
 }

backend/src/main/java/ovh/herisson/Clyde/Tables/Role.java

@@ -5,5 +5,5 @@ public enum Role {
     Student,
     Admin,
     InscriptionService,
-    Secretary;
+    Secretary
-}
+}

backend/src/main/java/ovh/herisson/Clyde/Tables/UserCurriculum.java

@@ -3,26 +3,26 @@ package ovh.herisson.Clyde.Tables;
 import jakarta.persistence.*;
 
 @Entity
-public class UserCursus {
+public class UserCurriculum {
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private int id;
 
-    //Un étudiant peut avoir plusieurs cursus
+    //Un étudiant peut avoir plusieurs curriculums
     @ManyToOne(fetch = FetchType.EAGER)
     @JoinColumn(name = "Users")
     private User user;
 
     @OneToOne(fetch = FetchType.EAGER)
-    @JoinColumn(name = "Cursus")
+    @JoinColumn(name = "Curriculum")
-    private Cursus cursus;
+    private Curriculum curriculum;
 
-    public UserCursus(User user, Cursus cursus){
+    public UserCurriculum(User user, Curriculum curriculum){
         this.user = user;
-        this.cursus = cursus;
+        this.curriculum = curriculum;
     }
 
-    public UserCursus() {}
+    public UserCurriculum() {}
 
     public int getId() {
         return id;
@@ -36,11 +36,11 @@ public class UserCursus {
         this.user = user;
     }
 
-    public Cursus getCursus() {
+    public Curriculum getCurriculum() {
-        return cursus;
+        return curriculum;
     }
 
-    public void setCursus(Cursus cursus) {
+    public void setCurriculum(Curriculum curriculum) {
-        this.cursus = cursus;
+        this.curriculum = curriculum;
     }
 }

frontend/src/App.vue

@@ -2,6 +2,7 @@
   import { toast } from 'vue3-toastify';
   import { ref, computed } from 'vue'
   import i18n, { setLang } from './i18n.js'
+  import { isLogged } from '@/rest/Users.js'
 
 
   // Liste des apps
@@ -19,6 +20,7 @@
   const currentPath = ref(window.location.hash)
 
   window.addEventListener('hashchange', () => {
+	Logged.value = isLogged();
     currentPath.value = window.location.hash
   })
 
@@ -31,7 +33,9 @@
   const settings=ref(i18n("app.settings"))
   const login=ref(i18n("app.login"))
   const active=ref(false)
-  
+
+  const Logged = ref(isLogged());
+
 </script>
 
 <template>
@@ -45,11 +49,11 @@
             </a></li>
         <li title=home>
             <a class="icon" href="#home">
-                <div class=" fa-solid fa-house" style="margin-top: 7px; margin-bottom: 3px;"></div>
+				<div class=" fa-solid fa-house" style="margin-top: 7px; margin-bottom: 3px;"></div>
             </a></li>
         <li style="float: right;" title=login>
             <a class="icon" href="#/login">
-                <div class="fa-solid fa-user"  style="margin-top: 7px; margin-bottom: 3px;"></div>
+                <div class="fa-solid fa-user" :style="Logged ? 'color: orange' : 'haha'" style="margin-top: 7px; margin-bottom: 3px; "></div>
             </a></li>
         <li style="float: right;" title=notifications>
             <a class="icon" href="#Notifications">

frontend/src/Apps/Login.vue

@@ -1,7 +1,7 @@
 <script setup>
   import { ref } from 'vue'
   import i18n from '@/i18n.js'
-  import { login , register } from '@/rest/Users.js'
+  import { login , register, disconnect } from '@/rest/Users.js'
   import { uploadProfilePicture } from '@/rest/uploads.js'
 
   const loginPage= ref(true)
@@ -16,10 +16,13 @@
   const email=ref("")
   const address=ref("")
   const country=ref("")
-  const cursus=ref("")
+  const curriculum=ref("")
  
   const imageSaved = ref(false)
   const ppData = ref(false)
+
+  disconnect()
+
 </script>
 
 
@@ -49,7 +52,7 @@
         </div>
 
         <div v-else>
-          <form @submit.prevent="register(firstname, surname, birthday, password, mail, address, country, cursus)" class="form">
+          <form @submit.prevent="register(firstname, surname, birthday, password, mail, address, country, curriculum)" class="form">
             <h1 style="color:rgb(239,60,168); font-family: sans-serif; text-align:center;">
               {{i18n("login.guest.welcome")}}
             </h1>
@@ -103,7 +106,7 @@
               </form>
               <div class="inputBox">
                 <p>{{i18n("curriculum").toUpperCase()}}</p> 
-                  <select v-model="cursus">
+                  <select v-model="curriculum">
                     <option value="Chemistry">Chemistry</option>
                     <option value="Psycho">Psychology</option>
                     <option value="IT">IT</option>

frontend/src/Apps/ManageCourses.vue

@@ -1,7 +1,7 @@
 <script setup>
   import i18n from "@/i18n.js"
   import {ref} from 'vue'
-const cursus=[
+const curriculum=[
   {
   "id": 12,
   "name": "Math pour l'info",
@@ -51,8 +51,8 @@ const cursus=[
   let toAdd = Object.assign({}, pattern);
 
   function addToCourse (){
-  if (cursus.length>0){
+  if (curriculum.length>0){
-    toAdd.id=(cursus[cursus.length-1].id)-1;}
+    toAdd.id=(curriculum[curriculum.length-1].id)-1;}
     else{
     toAdd.id=0;
     }
@@ -63,7 +63,7 @@ const cursus=[
       }
     }
       if (!isnull){
-      cursus.push(toAdd);
+      curriculum.push(toAdd);
       }
       toAdd= Object.assign({},pattern);
     } 
@@ -76,7 +76,7 @@ const cursus=[
   console.log("ok");
   console.log(toRemove);
   let rem=-1;
-  for(const [key, value] of Object.entries(cursus)){
+  for(const [key, value] of Object.entries(curriculum)){
     console.log(key);
     console.log(value)
     if(value.name === toRemove){
@@ -86,8 +86,8 @@ const cursus=[
     }
     console.log(rem)
   if (rem > -1){
-    cursus.splice(rem, 1);}
+    curriculum.splice(rem, 1);}
-  console.log(cursus);
+  console.log(curriculum);
   }
 
 </script>
@@ -130,7 +130,7 @@ const cursus=[
         <div style="margin-bottom:20px;">
           {{i18n("courses.toDelete")}} :
          <select style="max-width:200px;" class="teacher" v-model="toRemove">
-          <option v-for="item in cursus">{{item.name}}</option>
+          <option v-for="item in curriculum">{{item.name}}</option>
           
         </select>
         </div>
@@ -147,7 +147,7 @@ const cursus=[
       </form>
     </div>
 
-    <div v-if="!createMod && !deleteMod" v-for="item in cursus" :key="item.name">
+    <div v-if="!createMod && !deleteMod" v-for="item in curriculum" :key="item.name">
       <div style ="padding:15px 15px 15px 15px;">
       <button  v-if="editElementID !== item.name"  @click="editElementID = item.name">
         {{i18n("courses.modify")}}

frontend/src/Apps/Profil.vue

@@ -12,7 +12,7 @@
   role:"student",
   address: "Radiator Springs",
   email:"ClydeGhost@gmail.com",
-  cursus:[
+  curriculum:[
   {
   "id": 12,
   "name": "Math pour l'info",
@@ -132,7 +132,7 @@ const toModify = Object.assign({}, user);
             {{i18n("profile.course.list")}}
           </div>
         <div  class="listElement "
-          v-for="item in user.cursus">
+          v-for="item in user.curriculum">
           <div class=" containerElement">
             <div class="name"> {{item.name}} </div>
             <div class="teacher">{{item.teacher}}</div> 

frontend/src/Apps/Request.vue

@@ -8,7 +8,7 @@
   address: String,
   country: String,
   birthDate: String,
-  cursus:String,
+  curriculum:String,
   degree:String,});
 </script>
 

frontend/src/rest/ServiceInscription.js

@@ -24,7 +24,7 @@ export async function createRegister(){
  * - country
  * - birthdate
  * - email
- * - cursus
+ * - curriculum
  * - degree
  */
 export async function getRegisters(id){

frontend/src/rest/Users.js

@@ -1,9 +1,18 @@
 import { restGet, restPost } from './restConsumer.js'
+import { getCookie, setCookie } from '@/utils.js'
 
 export async function login(user, pass, exp){
 	return restPost("/login", {identifier: user, password: pass, expirationDate: exp});
 }
 
+export function isLogged(){
+	return getCookie("session_token") != "" 
+}
+
+export function disconnect(){ 
+	setCookie("session_token", ";expires= Thu, 01 Jan 1970 00:00:01 GMT")
+}
+
 /**
  * Register a user (tokenless)
  * 
@@ -14,10 +23,10 @@ export async function login(user, pass, exp){
  * @param mail
  * @param address
  * @param country
- * @param cursus
+ * @param curriculum 
  * @param imageId	id of the image in database returned when uploaded
  */
-export async function register(firstname, lastname, birthDate, password, email, address, country, cursus, imageId){
+export async function register(firstname, lastname, birthDate, password, email, address, country, curriculum, imageId){
 	return restPost("/register", {
 		firstname: firstname,
 		lastname: lastname,
@@ -26,7 +35,7 @@ export async function register(firstname, lastname, birthDate, password, email,
 		email: email,
 		address: address,
 		country: country,
-		cursus: cursus
+		curriculum: curriculum
 	});
 }
 

frontend/src/rest/apps.js

@@ -0,0 +1,9 @@
+import { restGet } from './restConsumer.js' 
+
+export async function appList(){
+	return restGet("/apps")
+}
+
+export async function checkPage(page){
+	return restGet("/apps/" + page)
+}

frontend/src/rest/curriculum.js

@@ -0,0 +1,41 @@
+/**
+ * curriculum API
+ */
+
+import { restGet, restPostn, restDelete, restPatch } from './restConsumer.js'
+
+/**
+ * Create a new curriculum (bundle of courses)
+ * @param courses	list of courses
+ */
+export async function createcurriculum(courses){
+	return restPost("/curriculum", {courses: courses} );
+}
+
+/**
+ * Delete the specified curriculum
+ */
+export async function deletecurriculum(id){
+	return restDelete("/curriculum/" + id);
+}
+
+/**
+ * Get informations on a particular curriculum
+ *
+ * @param id	identification of the curriculum
+ *
+ * @return list of courses 
+ */
+export async function getcurriculum(id){
+	return restGet("/curriculum/" + id);
+}
+
+/**
+ * Modify the courses of a curriculum
+ *
+ * @param id		the id of the curriculum
+ * @param courses	list of new courses 
+ */
+export async function altercurriculum(id, courses){
+	return restPatch("/curriculum/" + id, courses);
+}

frontend/src/rest/cursus.js

@@ -1,41 +0,0 @@
-/**
- * cursus API
- */
-
-import { restGet, restPostn, restDelete, restPatch } from './restConsumer.js'
-
-/**
- * Create a new cursus (bundle of courses)
- * @param courses	list of courses
- */
-export async function createCursus(courses){
-	return restPost("/cursus", {courses: courses} );
-}
-
-/**
- * Delete the specified cursus
- */
-export async function deleteCursus(id){
-	return restDelete("/cursus/" + id);
-}
-
-/**
- * Get informations on a particular cursus
- *
- * @param id	identification of the cursus
- *
- * @return list of courses 
- */
-export async function getCursus(id){
-	return restGet("/cursus/" + id);
-}
-
-/**
- * Modify the courses of a cursus
- *
- * @param id		the id of the cursus
- * @param courses	list of new courses 
- */
-export async function alterCursus(id, courses){
-	return restPatch("/cursus/" + id, courses);
-}