From 7b4175ba2b3b5a394d606281bccb649d71011513 Mon Sep 17 00:00:00 2001
From: chasegawa <chasegawa@unicon.net>
Date: Wed, 10 Aug 2022 17:09:39 -0700
Subject: [PATCH] SHIBUI-2267

Updated files so that new override is part of the default set


Former-commit-id: ca9f665c66bd3f988cde3262780a483b5b4f4ee2
---
 .../resources/entity-attributes-filters-ui-schema.json    | 5 +++++
 .../CustomPropertiesConfigurationTests.groovy             | 8 ++++----
 .../src/test/resources/entity-descriptor-json-schema.json | 3 +++
 .../assets/schema/filter/entity-attributes.schema.json    | 7 ++++++-
 ui/public/assets/schema/source/metadata-source.json       | 8 +++++++-
 5 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/resources/entity-attributes-filters-ui-schema.json b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
index 1db03af99..66d6018df 100644
--- a/backend/src/main/resources/entity-attributes-filters-ui-schema.json
+++ b/backend/src/main/resources/entity-attributes-filters-ui-schema.json
@@ -90,6 +90,11 @@
                     "description": "tooltip.force-authn",
                     "type": "boolean"
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean"
+                },
                 "omitNotBefore": {
                     "title": "label.omit-not-before-condition",
                     "type": "boolean",
diff --git a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
index 4113b372c..9e13dd370 100644
--- a/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
+++ b/backend/src/test/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/CustomPropertiesConfigurationTests.groovy
@@ -25,7 +25,7 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
 
         expect:
         ceadService.getAllDefinitions().size() == 0
-        configUnderTest.getOverrides().size() == 10
+        configUnderTest.getOverrides().size() == 11
         
         def ca = new CustomEntityAttributeDefinition().with {
             it.name = "newDefName"
@@ -38,7 +38,7 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 1
-        configUnderTest.getOverrides().size() == 11
+        configUnderTest.getOverrides().size() == 12
         
         def ca2 = new CustomEntityAttributeDefinition().with {
             it.name = "newDefName2"
@@ -51,12 +51,12 @@ class CustomPropertiesConfigurationTests extends AbstractBaseDataJpaTest {
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 2
-        configUnderTest.getOverrides().size() == 12
+        configUnderTest.getOverrides().size() == 13
         
         ceadService.deleteDefinition(ca)
         entityManager.flush()
         
         ceadService.getAllDefinitions().size() == 1
-        configUnderTest.getOverrides().size() == 11
+        configUnderTest.getOverrides().size() == 12
     }
 }
\ No newline at end of file
diff --git a/backend/src/test/resources/entity-descriptor-json-schema.json b/backend/src/test/resources/entity-descriptor-json-schema.json
index cb9e3a46c..db40ba086 100644
--- a/backend/src/test/resources/entity-descriptor-json-schema.json
+++ b/backend/src/test/resources/entity-descriptor-json-schema.json
@@ -243,6 +243,9 @@
         "omitNotBefore": {
           "type": "boolean"
         },
+        "ignoreRequestSignatures": {
+          "type": "boolean"
+        },
         "responderId": {
           "type": "string"
         },
diff --git a/ui/public/assets/schema/filter/entity-attributes.schema.json b/ui/public/assets/schema/filter/entity-attributes.schema.json
index e754c4983..84b341606 100644
--- a/ui/public/assets/schema/filter/entity-attributes.schema.json
+++ b/ui/public/assets/schema/filter/entity-attributes.schema.json
@@ -92,6 +92,11 @@
                     "description": "tooltip.ignore-auth-method",
                     "type": "boolean"
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean"
+                },
                 "omitNotBefore": {
                     "title": "label.omit-not-before-condition",
                     "description": "tooltip.omit-not-before-condition",
@@ -178,4 +183,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/ui/public/assets/schema/source/metadata-source.json b/ui/public/assets/schema/source/metadata-source.json
index 0a2f6baba..7348000d7 100644
--- a/ui/public/assets/schema/source/metadata-source.json
+++ b/ui/public/assets/schema/source/metadata-source.json
@@ -194,6 +194,12 @@
                     "type": "boolean",
                     "default": false
                 },
+                "ignoreRequestSignatures": {
+                    "title": "label.ignore-request-signatures",
+                    "description": "tooltip.ignore-request-signatures",
+                    "type": "boolean",
+                    "default": false
+                },
                 "useSha": {
                     "title": "label.use-sha1-signing-algorithm",
                     "description": "tooltip.usa-sha-algorithm",
@@ -640,4 +646,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}