Replace getEmail with getUsername

GitOrigin-RevId: 85d3c77dd41ed9ebb95a5ee3d97eff9ff30f5499
CentraleSupelec · Dec 4, 2024 · 02af360 · 02af360
1 parent c7e7d2b
commit 02af360
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/back/CHANGELOG.md b/back/CHANGELOG.md
@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+## 2.30.1
+- Fix remaining getEmail returning null, replace with getUsername
+
 ## 2.30.0
 - Add email and enabbled fields in user CRUD
 - Add email in generated JWT

diff --git a/back/src/main/java/fr/centralesupelec/thuv/activity_logging/services/ActivityLogger.java b/back/src/main/java/fr/centralesupelec/thuv/activity_logging/services/ActivityLogger.java
@@ -38,7 +38,7 @@ public void log(LogAction action, LogModelName logModelName, String modelId, Use
         ActivityLogRecord record = new ActivityLogRecord()
                 .setAction(action)
                 .setUser(user)
-                .setUserEmail(user.getEmail())
+                .setUserEmail(user.getUsername())
                 .setModelName(logModelName)
                 .setModelId(modelId)
                 ;

diff --git a/back/src/main/java/fr/centralesupelec/thuv/permissions/UserController.java b/back/src/main/java/fr/centralesupelec/thuv/permissions/UserController.java
@@ -81,7 +81,7 @@ public List<UserDto> searchUser(
     public void createUser(
             @RequestBody @Valid UpdateUserDto updateUserDto
     ) {
-        if (userRepository.existsByEmail(updateUserDto.getEmail())) {
+        if (userRepository.existsByUsername(updateUserDto.getUsername())) {
             throw new UserAlreadyExistException();
         }
         User user = new User();

diff --git a/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java b/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java
@@ -23,5 +23,5 @@ Page<User> findDistinctByEmailContainingAndRolesNameIn(
             @NotBlank String email, Collection<String> rolesName, Pageable pageable
     );
     Page<User> findDistinctByRolesNameIn(Collection<String> rolesName, Pageable pageable);
-    boolean existsByEmail(String email);
+    boolean existsByUsername(String username);
 }
diff --git a/back/src/main/java/fr/centralesupelec/thuv/security/MyUserDetailsService.java b/back/src/main/java/fr/centralesupelec/thuv/security/MyUserDetailsService.java
@@ -37,7 +37,7 @@ public UserDetails loadUserByUsername(String s) throws UsernameNotFoundException
                 .orElseThrow(
                         () -> new UsernameNotFoundException("User " + s + " not found !")
                 );
-        return new MyUserDetails(user.getRoles(), user.getEmail(), user.getId());
+        return new MyUserDetails(user.getRoles(), user.getUsername(), user.getId());
     }
 
     public User findUser(String username, String email) throws UserUpsertException {

diff --git a/back/src/main/java/fr/centralesupelec/thuv/service/ContainerRequestCreatorService.java b/back/src/main/java/fr/centralesupelec/thuv/service/ContainerRequestCreatorService.java
@@ -112,7 +112,7 @@ public ContainerRequest createRequest(CourseSession courseSession, User user, bo
                 .putTags("courseId", String.valueOf(course.getId()))
                 .putTags("courseTitle", course.getTitle())
                 .putTags("userId", String.valueOf(user.getId()))
-                .putTags("email", String.valueOf(user.getEmail()));
+                .putTags("email", String.valueOf(user.getUsername()));
 
         Long deletionTime = containerUtilsService.computeDeletionTime(courseSession);
         if (deletionTime != null) {

diff --git a/back/src/main/java/fr/centralesupelec/thuv/web/admin/ContainerController.java b/back/src/main/java/fr/centralesupelec/thuv/web/admin/ContainerController.java
@@ -52,7 +52,7 @@ public void initAdminContainer(
                 .setForceRecreate(forceRecreate)
                 .setCourseID(String.valueOf(course.getId()))
                 .setCourseName(course.getTitle())
-                .setUserName(user.getEmail())
+                .setUserName(user.getUsername())
                 .setPort(
                         RequestPort.newBuilder()
                                 .setPortToMap(ADMIN_PORT)

diff --git a/back/src/main/java/fr/centralesupelec/thuv/web/student/ContainerController.java b/back/src/main/java/fr/centralesupelec/thuv/web/student/ContainerController.java
@@ -78,10 +78,10 @@ public ResponseEntity<?> saveData(
                 .setMetadata(
                         Metadata.newBuilder()
                                 .putTags("courseId", String.valueOf(course.getId()))
-                                .putTags("email", String.valueOf(user.getEmail()))
+                                .putTags("email", String.valueOf(user.getUsername()))
                                 .build()
                 )
-                .setUserEmail(user.getEmail())
+                .setUserEmail(user.getUsername())
                 .build();
         saveDataService.sendSaveData(saveDataRequest);
         return ResponseEntity.status(HttpStatus.OK).build();