SHIBUI-2380

Fixing issue with RPO included twice
TIER · Oct 24, 2022 · 2e9dbb2 · 2e9dbb2
1 parent 57d2f0a
commit 2e9dbb2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy b/...nternet2/tier/shibboleth/admin/ui/controller/MetadataSourcesUiDefinitionController.groovy
@@ -58,7 +58,7 @@ class MetadataSourcesUiDefinitionController {
             return ResponseEntity.ok(parsedJson)
         }
         catch (IOException e) {
-            log.error("An error occurred while attempting to get json schema for metadata sources!", e)
+            log.error("An error occurred while attempting to get json schema [" + url + "] for metadata sources!", e)
             return ResponseEntity.status(INTERNAL_SERVER_ERROR).body([jsonParseError : e.getMessage(), sourceUiSchemaDefinitionFile: this.samlJsonSchemaLocation.url])
         }
     }

diff --git a/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java b/...in/java/edu/internet2/tier/shibboleth/admin/ui/controller/EntityDescriptorController.java
@@ -66,8 +66,7 @@ public EntityDescriptorController(EntityDescriptorVersionService versionService)
 
     @PostMapping("/EntityDescriptor")
     @Transactional
-    public ResponseEntity<?> create(@RequestBody EntityDescriptorRepresentation edRepresentation)
-                    throws ForbiddenException, ObjectIdExistsException, InvalidPatternMatchException {
+    public ResponseEntity<?> create(@RequestBody EntityDescriptorRepresentation edRepresentation) throws ForbiddenException, ObjectIdExistsException, InvalidPatternMatchException {
         EntityDescriptorRepresentation persistedEd = entityDescriptorService.createNew(edRepresentation);            
         return ResponseEntity.created(getResourceUriFor(persistedEd.getId())).body(persistedEd);
     }

diff --git a/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java b/...n/java/edu/internet2/tier/shibboleth/admin/ui/service/JPAEntityDescriptorServiceImpl.java
@@ -376,13 +376,13 @@ public EntityDescriptorRepresentation createRepresentationFromDescriptor(org.ope
                             case DURATION:
                             case SPRING_BEAN_ID:
                                 if (jpaAttribute.getAttributeValues().size() != 1) {
-                                    throw new RuntimeException("Multiple/No values detected where one is expected!");
+                                    throw new RuntimeException("Multiple/No values detected where one is expected for override: " + jpaAttribute.getName());
                                 }
                                 attributeValues = ModelRepresentationConversions.getValueFromXMLObject(jpaAttribute.getAttributeValues().get(0));
                                 break;
                             case INTEGER:
                                 if (jpaAttribute.getAttributeValues().size() != 1) {
-                                    throw new RuntimeException("Multiple/No values detected where one is expected!");
+                                    throw new RuntimeException("Multiple/No values detected where one is expected for override: " + jpaAttribute.getName());
                                 }
                                 attributeValues = ((XSInteger)jpaAttribute.getAttributeValues().get(0)).getValue();
                                 break;

diff --git a/backend/src/main/resources/application.yml b/backend/src/main/resources/application.yml
@@ -152,6 +152,7 @@ custom:
         - urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport
       attributeName: http://shibboleth.net/ns/profiles/defaultAuthenticationMethods
       attributeFriendlyName: defaultAuthenticationMethods
+      protocol: saml,oidc
     - name: forceAuthn
       displayName: label.force-authn
       displayType: boolean
@@ -201,13 +202,6 @@ custom:
       defaultValue: client_secret_basic, client_secret_post, client_secret_jwt, private_key_jwt
       attributeName: http://shibboleth.net/ns/profiles/tokenEndpointAuthMethods
       protocol: oidc
-    - name: defaultAuthenticationMethods
-      attributeFriendlyName: defaultAuthenticationMethods
-      displayName: label.defaultAuthenticationMethods
-      helpText: tooltip.defaultAuthenticationMethods
-      displayType: string
-      attributeName: http://shibboleth.net/ns/profiles/defaultAuthenticationMethods
-      protocol: oidc
     - name: postAuthenticationFlows
       attributeFriendlyName: postAuthenticationFlows
       displayName: label.postAuthenticationFlows