From db2e8e04504cb323fe3c211a28f3ebed08dcd5d3 Mon Sep 17 00:00:00 2001 From: Jj! Date: Tue, 22 Jan 2019 12:05:56 -0600 Subject: [PATCH] [nojira] update bootstrap for email --- .../tier/shibboleth/admin/ui/service/UserBootstrap.groovy | 3 ++- backend/src/test/resources/conf/1044.csv | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrap.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrap.groovy index f9ab4ffb0..19b27dd1c 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrap.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/service/UserBootstrap.groovy @@ -32,7 +32,7 @@ class UserBootstrap { if (shibUIConfiguration.userBootstrapResource) { log.info("configuring users from ${shibUIConfiguration.userBootstrapResource.URI}") new CSVReader(new InputStreamReader(shibUIConfiguration.userBootstrapResource.inputStream)).each { it -> - def (username, password, firstName, lastName, roleName) = it + def (username, password, firstName, lastName, roleName, email) = it def role = roleRepository.findByName(roleName).orElse(new Role(name: roleName)) roleRepository.saveAndFlush(role) def user = userRepository.findByUsername(username).orElse(new User(username: username)).with { @@ -40,6 +40,7 @@ class UserBootstrap { it.firstName = firstName it.lastName = lastName it.roles.add(role) + it.emailAddress = email it } userRepository.saveAndFlush(user) diff --git a/backend/src/test/resources/conf/1044.csv b/backend/src/test/resources/conf/1044.csv index 666681a0b..d8dfbcd76 100644 --- a/backend/src/test/resources/conf/1044.csv +++ b/backend/src/test/resources/conf/1044.csv @@ -1,2 +1,2 @@ -"user1","password1","firstName1","lastName1","ROLE_ADMIN" -"user2","password2","firstName2","lastName2","ROLE_USER" \ No newline at end of file +"user1","password1","firstName1","lastName1","ROLE_ADMIN","user1@example.org" +"user2","password2","firstName2","lastName2","ROLE_USER","user2@example.org" \ No newline at end of file