From af3484c28897c61ea457371df066f148870bcc49 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 29 Sep 2021 12:53:09 -0700
Subject: [PATCH] SHIBUI-2111

merge gone bad resolution
---
 .../admin/ui/configuration/auto/WebSecurityConfig.java      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java
index 8617bfa3b..8584ff303 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/configuration/auto/WebSecurityConfig.java
+++ b/backend/src/main/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