From 0b8bee12d2c30cfde6ef9411374e1d99a08f24a8 Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 5 Mar 2019 15:52:46 -0600 Subject: [PATCH] [NOISSUE] move scope --- .../admin/ui/configuration/auto/WebSecurityConfig.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 3858ad10e..5d64ab623 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 @@ -81,17 +81,17 @@ protected void configure(AuthenticationManagerBuilder auth) throws Exception { PasswordEncoder passwordEncoder = PasswordEncoderFactories.createDelegatingPasswordEncoder(); if (defaultPassword != null && !"".equals(defaultPassword)) { // TODO: yeah, this isn't good, but we gotta initialize this user for now - Role adminRole = roleRepository.findByName("ROLE_ADMIN").orElseGet(() -> { - Role r = new Role(); - r.setName("ROLE_ADMIN"); - return roleRepository.saveAndFlush(r); - }); User adminUser = userRepository.findByUsername("root").orElseGet(() ->{ User u = new User(); u.setUsername("root"); u.setPassword(defaultPassword); u.setFirstName("admin"); u.setLastName("user"); + Role adminRole = roleRepository.findByName("ROLE_ADMIN").orElseGet(() -> { + Role r = new Role(); + r.setName("ROLE_ADMIN"); + return roleRepository.saveAndFlush(r); + }); u.setRoles(Collections.singleton(adminRole)); u.setEmailAddress("admin@localhost"); return userRepository.saveAndFlush(u);