Add username

GitOrigin-RevId: 202eb92d99fac782c2df0468b4cd7e4f9c92a2cb
CentraleSupelec · Dec 4, 2024 · 0966ef1 · 0966ef1
1 parent 83e9bdb
commit 0966ef1
Show file tree

Hide file tree

Showing 19 changed files with 782 additions and 57 deletions.
diff --git a/back/.gitlab-ci.yml b/back/.gitlab-ci.yml
@@ -1,28 +1,42 @@
 variables:
   MAVEN_OPTS: "-Dmaven.repo.local=.m2"
 
-image: openjdk:17
+image: eclipse-temurin:17
 
-build_job:
-  stage: build
+lint:
   tags:
     - docker
   script:
-    - ./mvnw clean compile -DskipTests
-  artifacts:
-    expire_in: 1 hour
-    paths:
-      - target/
-      - .m2/
+    - ./mvnw checkstyle:check
+  except:
+    - tags
+    - master
 
-lint:
-  stage: test
+test:
+  variables:
+    SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/mydocker
+    SPRING_DATASOURCE_USERNAME: mydocker
+    SPRING_DATASOURCE_PASSWORD: mydocker
+  services:
+    - name: postgres:13
+      alias: postgres
+      entrypoint:
+      - /bin/sh
+      command:
+      - -c
+      - echo "CREATE EXTENSION citext;" > /docker-entrypoint-initdb.d/citext.sql && exec docker-entrypoint.sh postgres
+      variables:
+        POSTGRES_DB: mydocker
+        POSTGRES_USER: mydocker
+        POSTGRES_PASSWORD: mydocker
   tags:
     - docker
-  dependencies:
-    - build_job
+  before_script:
+    - openssl genrsa -traditional -out src/main/resources/private_key.pem 4096
+    - openssl rsa -traditional -pubout -in src/main/resources/private_key.pem -out src/main/resources/public_key.pem
   script:
-    - ./mvnw checkstyle:check
+    - ./mvnw generate-sources
+    - ./mvnw test || { [ "$DEBUG" = "true" ] && sleep 3600; }
   except:
     - tags
     - master
@@ -31,8 +45,6 @@ lint:
   stage: deploy
   tags:
     - docker
-  dependencies:
-    - build_job
   script:
     - "[[ -z \"${CI_COMMIT_TAG}\" ]] && export VERSION=\"${CI_COMMIT_SHA}-SNAPSHOT\" || export VERSION=\"${CI_COMMIT_TAG}\""
     - "echo \"Setting version to: ${VERSION}\""
@@ -69,8 +81,3 @@ deploy_github:
     - gh release --repo CentraleSupelec/mydocker upload back-${CI_COMMIT_TAG} artifacts.zip
   tags:
     - docker
-
-stages:
-  - build
-  - test
-  - deploy
diff --git a/back/docker-compose.yml b/back/docker-compose.yml
@@ -8,14 +8,16 @@ services:
     environment:
       POSTGRES_USER: thuv
       POSTGRES_PASSWORD: password
+      TEST_DB: thuvtest
     volumes:
-      - $PWD/docker/citext.sql:/docker-entrypoint-initdb.d/citext.sql
+      - $PWD/docker/setup.sh:/docker-entrypoint-initdb.d/setup.sh
       - db-data:/var/lib/postgresql/data
 
   cas:
     image: apereo/cas:7.0.1
     environment:
       CAS_SERVICE_REGISTRY_CORE_INIT_FROM_JSON: "true"
+      CAS_LOGOUT_FOLLOW_SERVICE_REDIRECTS: "true"
       SERVER_SSL_ENABLED: "false"
     volumes:
       - $PWD/docker/cas-service-1.json:/tmp/cas/cas-service-1.json

diff --git a/back/docker/citext.sql b/back/docker/citext.sql
diff --git a/back/docker/setup.sh b/back/docker/setup.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+set -e
+
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" -c "CREATE EXTENSION IF NOT EXISTS citext;"
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" <<-EOSQL
+	CREATE USER $TEST_DB;
+	CREATE DATABASE $TEST_DB;
+	GRANT ALL PRIVILEGES ON DATABASE $TEST_DB TO $TEST_DB;
+EOSQL
+psql -v ON_ERROR_STOP=1 --username "$POSTGRES_USER" --dbname "$TEST_DB" -c "CREATE EXTENSION IF NOT EXISTS citext;"
diff --git a/back/src/main/java/fr/centralesupelec/thuv/exception/UserUpsertException.java b/back/src/main/java/fr/centralesupelec/thuv/exception/UserUpsertException.java
@@ -0,0 +1,7 @@
+package fr.centralesupelec.thuv.exception;
+
+public class UserUpsertException extends RuntimeException {
+    public UserUpsertException(String message) {
+        super(message);
+    }
+}
diff --git a/back/src/main/java/fr/centralesupelec/thuv/lti/LtiController.java b/back/src/main/java/fr/centralesupelec/thuv/lti/LtiController.java
@@ -141,6 +141,7 @@ public ResponseEntity<String> launch(
         DecodedJWT jwt = this.ltiService.getValidatedJWT(idToken, state, origin, session);
 
         User user = myUserDetailsService.upsertUser(
+                null,
                 jwt.getClaim("email").asString(),
                 jwt.getClaim("given_name").asString(),
                 jwt.getClaim("family_name").asString()

diff --git a/back/src/main/java/fr/centralesupelec/thuv/model/User.java b/back/src/main/java/fr/centralesupelec/thuv/model/User.java
@@ -5,12 +5,13 @@
 import lombok.EqualsAndHashCode;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
+import lombok.ToString;
 
 import java.util.*;
 
 @Entity
 @Table(name = "users", indexes = {
-        @Index(columnList = "email", unique = true)
+        @Index(columnList = "username", unique = true)
 })
 @Data
 @EqualsAndHashCode(of = {"id"})
@@ -23,19 +24,26 @@ public class User {
     @Column(columnDefinition = "CITEXT")
     private String email;
 
+    @NotBlank
+    @Column(columnDefinition = "CITEXT")
+    private String username;
+
     @NotBlank
     private String name;
 
     @NotBlank
     private String lastname;
 
+    private Boolean enabled = true;
+
     public Set<UserCourse> getUserCourses() {
         return userCourses;
     }
 
     /*
      * Relationships
      */
+    @ToString.Exclude
     @OneToMany(
         cascade = { CascadeType.PERSIST, CascadeType.REMOVE, CascadeType.MERGE },
         fetch = FetchType.LAZY,
@@ -56,6 +64,7 @@ public Set<UserCourse> getUserCourses() {
     )
     private Collection<Role> roles = new ArrayList<>();
 
+    @ToString.Exclude
     @OneToMany(
         fetch = FetchType.LAZY,
         mappedBy = "creator",
@@ -97,6 +106,7 @@ public void removeUserCourse(UserCourse userCourse) {
         userCourse.setUser(null);
     }
 
+    @ToString.Exclude
     @OneToMany(mappedBy = "user", fetch = FetchType.LAZY)
     private List<ActivityLogRecord> logs = new ArrayList<>();
 

diff --git a/back/src/main/java/fr/centralesupelec/thuv/permissions/dtos/UpdateUserDto.java b/back/src/main/java/fr/centralesupelec/thuv/permissions/dtos/UpdateUserDto.java
@@ -15,4 +15,5 @@ public class UpdateUserDto {
     private String lastname;
     @Pattern(regexp = "ROLE_TEACHER|ROLE_ADMIN")
     private String role;
+    private Boolean enabled;
 }
diff --git a/back/src/main/java/fr/centralesupelec/thuv/permissions/dtos/UserDto.java b/back/src/main/java/fr/centralesupelec/thuv/permissions/dtos/UserDto.java
@@ -6,7 +6,9 @@
 public class UserDto {
     private Long id;
     private String email;
+    private String username;
     private String name;
     private String lastname;
     private String role;
+    private Boolean enabled;
 }
diff --git a/back/src/main/java/fr/centralesupelec/thuv/permissions/mappers/UserMapper.java b/back/src/main/java/fr/centralesupelec/thuv/permissions/mappers/UserMapper.java
@@ -26,6 +26,12 @@ public UserDto convertToDto(User user) {
                 .setEmail(
                         user.getEmail()
                 )
+                .setUsername(
+                        user.getUsername()
+                )
+                .setEnabled(
+                        user.getEnabled()
+                )
                 .setRole(
                         user.getRoles().stream().findAny().orElseGet(Role::new).getName()
                 );
@@ -36,12 +42,18 @@ public void applyChange(User user, UpdateUserDto updateUserDto) {
         .setEmail(
                 updateUserDto.getEmail()
         )
+        .setUsername(
+                user.getUsername()
+        )
         .setLastname(
                 updateUserDto.getLastname()
         )
         .setName(
                 updateUserDto.getName()
         );
+        if (updateUserDto.getEnabled() != null) {
+            user.setEnabled(updateUserDto.getEnabled());
+        }
         user.getRoles().clear();
         user.getRoles().add(
             roleRepository.getByName(

diff --git a/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java b/back/src/main/java/fr/centralesupelec/thuv/repository/UserRepository.java
@@ -15,8 +15,9 @@
 @Repository
 @Transactional(readOnly = true)
 public interface UserRepository extends JpaRepository<User, Long> {
-    Optional<User> findByEmail(String email);
-    List<User> findByEmailIn(Collection<String> emails);
+    Optional<User> findByUsername(String email);
+    Optional<User> findByEnabledTrueAndUsername(String email);
+    List<User> findByEnabledTrueAndEmail(String email);
     List<User> findDistinctByEmailContainingAndRolesNameIsNot(@NotBlank String email, String rolesName);
     Page<User> findDistinctByEmailContainingAndRolesNameIn(
             @NotBlank String email, Collection<String> rolesName, Pageable pageable