Merge branch 'feature/shibui-2393' of bitbucket.org:unicon/shib-idp-u…

…i into feature/shibui-2393-ui
TIER · Nov 16, 2022 · 4899699 · 4899699
2 parents 34b45c0 + 9ee8e2d
commit 4899699
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/...java/edu/internet2/tier/shibboleth/admin/ui/controller/DynamicRegistrationController.java b/...java/edu/internet2/tier/shibboleth/admin/ui/controller/DynamicRegistrationController.java
@@ -66,6 +66,12 @@ public ResponseEntity<?> getDisabledMetadataSources() throws ForbiddenException
         return ResponseEntity.ok(dynamicRegistrationService.getDisabledDynamicRegistrations());
     }
 
+    @GetMapping(value = "/DynamicRegistration/{resourceId}", produces = "application/json")
+    @Transactional(readOnly = true)
+    public ResponseEntity<?> getOne(@PathVariable String resourceId) throws ForbiddenException {
+        return ResponseEntity.ok(dynamicRegistrationService.getOne(resourceId));
+    }
+
     @DeleteMapping(value = "/DynamicRegistration/{resourceId}")
     @Transactional
     public ResponseEntity<?> deleteOne(@PathVariable String resourceId) throws ForbiddenException, PersistentEntityNotFound {

diff --git a/.../main/java/edu/internet2/tier/shibboleth/admin/ui/service/DynamicRegistrationService.java b/.../main/java/edu/internet2/tier/shibboleth/admin/ui/service/DynamicRegistrationService.java
@@ -23,6 +23,8 @@ DynamicRegistrationRepresentation approveDynamicRegistration(String resourceId,
 
     List<DynamicRegistrationRepresentation> getDisabledDynamicRegistrations() throws ForbiddenException;
 
+    DynamicRegistrationRepresentation getOne(String resourceId) throws ForbiddenException;
+
     DynamicRegistrationRepresentation update(DynamicRegistrationRepresentation dynRegRepresentation) throws PersistentEntityNotFound, ForbiddenException;
 
     DynamicRegistrationRepresentation updateGroupForDynamicRegistration(String resourceId, String groupId) throws ForbiddenException, PersistentEntityNotFound;

diff --git a/...ava/edu/internet2/tier/shibboleth/admin/ui/service/JPADynamicRegistrationServiceImpl.java b/...ava/edu/internet2/tier/shibboleth/admin/ui/service/JPADynamicRegistrationServiceImpl.java
@@ -159,6 +159,15 @@ public List<DynamicRegistrationRepresentation> getDisabledDynamicRegistrations()
         return convertToRepresentations(temp);
     }
 
+    @Override
+    public DynamicRegistrationRepresentation getOne(String resourceId) throws ForbiddenException {
+        DynamicRegistrationInfo existingDri = repository.findByResourceId(resourceId);
+        if (!shibUiAuthorizationDelegate.hasPermission(userService.getCurrentUserAuthentication(), existingDri, PermissionType.viewOrEdit)) {
+            throw new ForbiddenException();
+        }
+        return new DynamicRegistrationRepresentation(existingDri);
+    }
+
     @Override
     public DynamicRegistrationRepresentation update(DynamicRegistrationRepresentation dynRegRepresentation)
                     throws PersistentEntityNotFound, ForbiddenException, ConcurrentModificationException {

diff --git a/...u/internet2/tier/shibboleth/admin/ui/controller/DynamicRegistrationControllerTests.groovy b/...u/internet2/tier/shibboleth/admin/ui/controller/DynamicRegistrationControllerTests.groovy
@@ -225,11 +225,11 @@ class DynamicRegistrationControllerTests extends AbstractBaseDataJpaTest {
         result1.andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON)).andExpect(jsonPath("\$").isEmpty())
 
         when:
-        def dynReg2 = new DynamicRegistrationInfo(resourceId: 'uuid-2', enabled: false, idOfOwner: "testingGroupBBB", applicationType: 'apptype',
+        def dynReg2 = new DynamicRegistrationInfo(resourceId: 'uuid-2', enabled: false, applicationType: 'apptype',
                 approved: true, contacts: 'contacts', jwks: 'jwks', logoUri: 'logouri', policyUri: 'policyuri',
                 redirectUris: 'redirecturis', responseTypes: 'responsetypes', scope: 'scope', subjectType: 'subjecttype',
                 tokenEndpointAuthMethod: 'token', tosUri: 'tosuri', grantType: GrantType.implicit)
-        repo.saveAndFlush(dynReg2)
+        dynamicRegistrationService.createNew(new DynamicRegistrationRepresentation(dynReg2))
         def result = mockMvc.perform(get('/api/DynamicRegistrations'))
 
         then:
@@ -251,6 +251,31 @@ class DynamicRegistrationControllerTests extends AbstractBaseDataJpaTest {
               .andExpect(jsonPath("\$.[0].tokenEndpointAuthMethod").value("token"))
               .andExpect(jsonPath("\$.[0].tosUri").value("tosuri"))
               .andExpect(jsonPath("\$.[0].grantType").value("implicit"))
+
+        try {
+            mockMvc.perform(get('/api/DynamicRegistration/uuid-1'))
+        } catch (Exception e) {
+            e instanceof ForbiddenException
+        }
+
+        def result2 = mockMvc.perform(get('/api/DynamicRegistration/uuid-2'))
+        result2.andDo(MockMvcResultHandlers.print())
+               .andExpect(status().isOk()).andExpect(content().contentType(APPLICATION_JSON))
+               .andExpect(jsonPath("\$.resourceId").value("uuid-2"))
+               .andExpect(jsonPath("\$.enabled").value(false))
+               .andExpect(jsonPath("\$.idOfOwner").value("testingGroupBBB"))
+               .andExpect(jsonPath("\$.applicationType").value("apptype"))
+               .andExpect(jsonPath("\$.contacts").value("contacts"))
+               .andExpect(jsonPath("\$.jwks").value("jwks"))
+               .andExpect(jsonPath("\$.logoUri").value("logouri"))
+               .andExpect(jsonPath("\$.policyUri").value("policyuri"))
+               .andExpect(jsonPath("\$.redirectUris").value("redirecturis"))
+               .andExpect(jsonPath("\$.responseTypes").value("responsetypes"))
+               .andExpect(jsonPath("\$.scope").value("scope"))
+               .andExpect(jsonPath("\$.subjectType").value("subjecttype"))
+               .andExpect(jsonPath("\$.tokenEndpointAuthMethod").value("token"))
+               .andExpect(jsonPath("\$.tosUri").value("tosuri"))
+               .andExpect(jsonPath("\$.grantType").value("implicit"))
     }
 
     @WithMockUser(value = "someUser", roles = ["USER"])