SHIBUI-1062 Fixed merge conflict

TIER · Jan 30, 2019 · 9479df3 · 9479df3
2 parents 8a62ede + b9e3942
commit 9479df3
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 29 deletions.
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
@@ -59,8 +59,9 @@ public List<User> getAll() {
 
     @Transactional(readOnly = true)
     @GetMapping("/current")
-    public Principal getCurrentUser(Principal principal) {
-        return principal;
+    public User getCurrentUser(Principal principal) {
+        // TODO: fix this
+        return userService.getCurrentUser();
     }
 
     @PreAuthorize("hasRole('ADMIN')")

diff --git a/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java b/...nd/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/service/UserService.java
@@ -51,7 +51,7 @@ public User getCurrentUser() {
         //TODO: Consider returning an Optional here
         User user = null;
         if (SecurityContextHolder.getContext() != null && SecurityContextHolder.getContext().getAuthentication() != null) {
-            String principal = (String) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+            String principal = SecurityContextHolder.getContext().getAuthentication().getName();
             if (StringUtils.isNotBlank(principal)) {
                 Optional<User> persistedUser = userRepository.findByUsername(principal);
                 if (persistedUser.isPresent()) {

diff --git a/.../edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy b/.../edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorControllerTests.groovy
@@ -95,7 +95,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def emptyRecordsFromRepository = [].stream()
         def expectedEmptyListResponseBody = '[]'
@@ -118,7 +118,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptor = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1', serviceEnabled: true,
@@ -168,7 +168,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptorOne = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1',
@@ -242,7 +242,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def entityDescriptorOne = new EntityDescriptor(resourceId: 'uuid-1', entityID: 'eid1', serviceProviderName: 'sp1',
@@ -293,7 +293,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def expectedEntityId = 'https://shib'
@@ -376,7 +376,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedEntityId = 'https://shib'
         def expectedSpName = 'sp1'
@@ -453,7 +453,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def providedResourceId = 'uuid-1'
 
@@ -470,7 +470,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -521,7 +521,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -573,7 +573,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -599,7 +599,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -634,7 +634,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -670,7 +670,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def expectedCreationDate = '2017-10-23T11:11:11'
         def providedResourceId = 'uuid-1'
@@ -700,7 +700,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def postedBody = '''<?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://test.scaldingspoon.org/test1">
@@ -820,7 +820,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def postedMetadataUrl = "http://test.scaldingspoon.org/test1"
         def restXml = '''<?xml version="1.0" encoding="UTF-8"?>
@@ -903,7 +903,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         def updatedEntityDescriptor = generator.buildEntityDescriptor()
@@ -934,7 +934,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USER'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         entityDescriptor.serviceEnabled = false
@@ -964,7 +964,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'someUser'
         def role = 'ROLE_USERN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         entityDescriptor.createdBy = 'someoneElse'
@@ -990,7 +990,7 @@ class EntityDescriptorControllerTests extends Specification {
         given:
         def username = 'admin'
         def role = 'ROLE_ADMIN'
-        authentication.getPrincipal() >> username
+        authentication.getName() >> username
         userRepository.findByUsername(username) >> TestHelpers.generateOptionalUser(username, role)
         def entityDescriptor = generator.buildEntityDescriptor()
         def updatedEntityDescriptor = generator.buildEntityDescriptor()

diff --git a/ui/src/app/admin/component/user-management.component.html b/ui/src/app/admin/component/user-management.component.html
@@ -27,12 +27,14 @@
                         <td>{{ user.firstName }} {{ user.lastName }}</td>
                         <td>{{ user.emailAddress }}</td>
                         <td>
-                            <select [name]="user.username" [ngModel]="user.role" class="form-control" (change)="setUserRole(user, $event.target.value)">
+                            <select [name]="user.username" [ngModel]="user.role" class="form-control"
+                                [disabled]="currentUser.username === user.username"
+                                (change)="setUserRole(user, $event.target.value)">
                                 <option *ngFor="let role of roles$ | async" [value]="role">{{ role }}</option>
                             </select>
                         </td>
                         <td>
-                            <button class="btn btn-link" (click)="deleteUser(user.username)">
+                            <button class="btn btn-link" (click)="deleteUser(user.username)" *ngIf="!(currentUser.username === user.username)">
                                 <span class="sr-only" translate="label.delete-user">
                                     Delete User
                                 </span>

diff --git a/ui/src/app/admin/component/user-management.component.ts b/ui/src/app/admin/component/user-management.component.ts
@@ -1,6 +1,6 @@
 import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { Observable, of } from 'rxjs';
+import { Observable, Subscription } from 'rxjs';
 
 import * as fromRoot from '../../app.reducer';
 import * as fromCore from '../../core/reducer';
@@ -21,6 +21,8 @@ import { map } from 'rxjs/operators';
 export class UserManagementComponent implements OnInit {
 
     users$: Observable<Admin[]>;
+    currentUser: Admin;
+    userSub: Subscription;
     roles$: Observable<string[]>;
 
     hasUsers$: Observable<boolean>;
@@ -35,6 +37,10 @@ export class UserManagementComponent implements OnInit {
     ngOnInit(): void {
         this.users$ = this.store.select(fromAdmin.getAllConfiguredUsers);
         this.hasUsers$ = this.users$.pipe(map(userList => userList.length > 0));
+        this.users$ = this.store.select(fromAdmin.getAllAdmins);
+        let user$ = this.store.select(fromCore.getUser);
+
+        this.userSub = user$.subscribe(u => this.currentUser = u);
     }
 
     setUserRole(user: Admin, change: string): void {

diff --git a/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json b/ui/src/assets/schema/provider/filebacked-http-reloading.schema.json
@@ -53,14 +53,14 @@
                     "description": "tooltip.refresh-delay-factor",
                     "type": "string",
                     "widget": {
-                        "id": "number",
-                        "step": 0.01
+                        "id": "string",
+                        "help": "message.real-number"
                     },
                     "placeholder": "label.real-number",
                     "minimum": 0,
                     "maximum": 1,
-                    "default": null,
-                    "pattern": "^([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)$"
+                    "default": "",
+                    "pattern": "^(?:([0]*(\\.[0-9]+)?|[0]*\\.[0-9]*[1-9][0-9]*)|)$"
                 }
             }
         }