From 1762462f0656a3cc7ff8695ae71762af694d2be0 Mon Sep 17 00:00:00 2001 From: Hylston Barbosa Date: Tue, 1 Aug 2023 17:13:22 -0300 Subject: [PATCH] re-adding @Primary annotation in UserDetailsServiceImpl --- .../com/box/l10n/mojito/security/UserDetailsServiceImpl.java | 2 ++ .../java/com/box/l10n/mojito/security/WebSecurityConfig.java | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/main/java/com/box/l10n/mojito/security/UserDetailsServiceImpl.java b/webapp/src/main/java/com/box/l10n/mojito/security/UserDetailsServiceImpl.java index 9c6e51eee8..ccdccab334 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/security/UserDetailsServiceImpl.java +++ b/webapp/src/main/java/com/box/l10n/mojito/security/UserDetailsServiceImpl.java @@ -6,12 +6,14 @@ import com.box.l10n.mojito.service.security.user.UserRepository; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Primary; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; import org.springframework.stereotype.Service; /** @author wyau */ +@Primary @Service public class UserDetailsServiceImpl implements UserDetailsService { diff --git a/webapp/src/main/java/com/box/l10n/mojito/security/WebSecurityConfig.java b/webapp/src/main/java/com/box/l10n/mojito/security/WebSecurityConfig.java index 24dada29cb..cdb67270be 100644 --- a/webapp/src/main/java/com/box/l10n/mojito/security/WebSecurityConfig.java +++ b/webapp/src/main/java/com/box/l10n/mojito/security/WebSecurityConfig.java @@ -248,5 +248,4 @@ String[] getHeathcheckPatterns() { } return patterns.toArray(new String[patterns.size()]); } - }