From 656bab1cf720bcc551e302e83094bde527e12994 Mon Sep 17 00:00:00 2001
From: Dmitriy Kopylenko <dima767@gmail.com>
Date: Tue, 11 Dec 2018 17:48:54 -0500
Subject: [PATCH] SHIBUI-1031: 1034

---
 .../admin/ui/configuration/DevConfig.groovy     | 17 ++++++++++++++---
 .../admin/ui/security/model/User.java           |  4 ++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
index e9e530d64..78c250823 100644
--- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
+++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
@@ -34,16 +34,27 @@ class DevConfig {
 
     @Transactional
     @PostConstruct
-    void createDevAdminUsers() {
+    void createDevUsers() {
         if (adminUserRepository.count() == 0) {
-            def user = new User().with {
+            def users = [new User().with {
                 username = 'admin'
                 password = '{noop}adminpass'
+                name = 'Joe the admin'
+                emailAddress = 'joe@institution.edu'
                 roles.add(new Role(name: 'ROLE_ADMIN'))
                 it
+            }, new User().with {
+                username = 'nonadmin'
+                password = '{noop}nonadminpass'
+                name = 'Peter non admin'
+                emailAddress = 'peter@institution.edu'
+                roles.add(new Role(name: 'ROLE_USER'))
+                it
+            }]
+            users.each {
+                adminUserRepository.save(it)
             }
 
-            adminUserRepository.save(user)
         }
     }
 
diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
index fa403aa86..55ecd40b8 100644
--- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
+++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/model/User.java
@@ -34,9 +34,9 @@ public class User extends AbstractAuditable {
     @Column(nullable = false)
     private String password;
 
-    private String firstName;
+    private String name;
 
-    private String lastName;
+    private String emailAddress;
 
     //Ignore properties annotation here is to prevent stack overflow recursive error during JSON serialization
     @JsonIgnoreProperties("users")