From f51a739411000cb2b4556b055d972ea6ed02d1cb Mon Sep 17 00:00:00 2001 From: Pavel_Bortnik Date: Mon, 16 Sep 2024 10:09:41 +0300 Subject: [PATCH 1/2] EPMRPP-94552 || Add scim related user disable check --- build.gradle | 2 +- .../reportportal/auth/basic/DatabaseUserDetailsService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2f1b966b..44325b7d 100644 --- 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:f277576' 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 index 3a0d858c..40706591 100644 --- 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())) From 33320b756d0d5b311de91d388ea1f433ac35dfed Mon Sep 17 00:00:00 2001 From: Pavel_Bortnik Date: Mon, 16 Sep 2024 15:59:59 +0300 Subject: [PATCH 2/2] EPMRPP-94552 || Update dao version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 44325b7d..9c46f0d5 100644 --- 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:f277576' + api 'com.github.reportportal:commons-dao:cce9625' api 'com.github.reportportal:commons:50a1192' }