SHIBUI-2111

merge gone bad resolution
TIER · Sep 29, 2021 · af3484c · af3484c
1 parent 92f81e7
commit af3484c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...ain/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java b/...ain/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java
@@ -59,8 +59,8 @@ public class WebSecurityConfig {
 
     @Bean
     @Profile("!no-auth")
-    public AdminUserService adminUserService(UserRepository userRepository) {
-        return new AdminUserService(userRepository);
+    public AdminUserService adminUserService(UserService userService) {
+        return new AdminUserService(userService);
     }
 
     private HttpFirewall allowUrlEncodedSlashHttpFirewall() {
@@ -128,7 +128,7 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception {
                             .password(defaultPassword)
                             .roles("ADMIN");
                 }
-                auth.userDetailsService(adminUserService(userRepository)).passwordEncoder(passwordEncoder);
+                auth.userDetailsService(adminUserService(userService)).passwordEncoder(passwordEncoder);
             }
 
             @Override