Merge pull request #337 from reportportal/EPMRPP-89095

EPMRPP-94552 || Add scim related user disable check
reportportal · Sep 16, 2024 · e5d8b7d · e5d8b7d
2 parents 667b868 + 33320b7
commit e5d8b7d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -43,7 +43,7 @@ dependencies {
         api 'com.epam.reportportal:commons-dao'
         api 'com.epam.reportportal:commons'
     } else {
-        api 'com.github.reportportal:commons-dao:4f0bff6'
+        api 'com.github.reportportal:commons-dao:cce9625'
         api 'com.github.reportportal:commons:50a1192'
     }
 

diff --git a/src/main/java/com/epam/reportportal/auth/basic/DatabaseUserDetailsService.java b/src/main/java/com/epam/reportportal/auth/basic/DatabaseUserDetailsService.java
@@ -50,6 +50,7 @@ public UserDetails loadUserByUsername(String username) throws UsernameNotFoundEx
         .orElseThrow(() -> new UsernameNotFoundException("User not found"));
 
     UserDetails userDetails = org.springframework.security.core.userdetails.User.builder()
+        .disabled(!user.isEnabled())
         .username(user.getUsername())
         .password(user.getPassword() == null ? "" : user.getPassword())
         .authorities(AuthUtils.AS_AUTHORITIES.apply(user.getUserRole()))