SHIBUI-1031: 1034

TIER · Dec 12, 2018 · 44e957a · 44e957a
1 parent e1c8907
commit 44e957a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy
@@ -39,14 +39,16 @@ class DevConfig {
             def users = [new User().with {
                 username = 'admin'
                 password = '{noop}adminpass'
-                name = 'Joe the admin'
+                firstName = 'Joe'
+                lastName = 'Doe'
                 emailAddress = 'joe@institution.edu'
                 roles.add(new Role(name: 'ROLE_ADMIN'))
                 it
             }, new User().with {
                 username = 'nonadmin'
                 password = '{noop}nonadminpass'
-                name = 'Peter non admin'
+                firstName = 'Peter'
+                lastName = 'Vandelay'
                 emailAddress = 'peter@institution.edu'
                 roles.add(new Role(name: 'ROLE_USER'))
                 it

diff --git a/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java b/...main/java/edu/internet2/tier/shibboleth/admin/ui/security/controller/UsersController.java
@@ -14,7 +14,7 @@
  * @author Dmitriy Kopylenko
  */
 @RestController
-@RequestMapping("/api/security/users")
+@RequestMapping("/api/admin/users")
 public class UsersController {
 
     private UserRepository userRepository;

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
@@ -34,7 +34,9 @@ public class User extends AbstractAuditable {
     @Column(nullable = false)
     private String password;
 
-    private String name;
+    private String firstName;
+
+    private String lastName;
 
     private String emailAddress;
 

diff --git a/...rnet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy b/...rnet2/tier/shibboleth/admin/ui/security/controller/UsersControllerIntegrationTests.groovy
@@ -16,7 +16,7 @@ class UsersControllerIntegrationTests extends Specification {
     @Autowired
     private TestRestTemplate restTemplate
 
-    static RESOURCE_URI = '/api/security/users'
+    static RESOURCE_URI = '/api/admin/users'
 
     def "GET users"() {
         when: 'GET request is made for ALL users in the system'