From fba02494a9cf6ec14a680a10f3b540d962e5816a Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 11 Jun 2021 07:42:10 -0700
Subject: [PATCH] Fixed schema files

---
 ...ebacked-http-metadata-provider.schema.json |  2 +-
 .../resources/metadata-sources-ui-schema.json | 20 +++++++++--
 .../provider/filebacked-http.schema.json      |  2 +-
 .../assets/schema/source/metadata-source.json | 35 ++++++++++++++-----
 4 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/resources/filebacked-http-metadata-provider.schema.json b/backend/src/main/resources/filebacked-http-metadata-provider.schema.json
index 655ff5e0d..ab766c1a5 100644
--- a/backend/src/main/resources/filebacked-http-metadata-provider.schema.json
+++ b/backend/src/main/resources/filebacked-http-metadata-provider.schema.json
@@ -188,7 +188,7 @@
                     "description": "tooltip.proxy-host"
                 },
                 "proxyPort": {
-                    "type": "string",
+                    "type": "integer",
                     "title": "label.proxy-port",
                     "description": "tooltip.proxy-port"
                 },
diff --git a/backend/src/main/resources/metadata-sources-ui-schema.json b/backend/src/main/resources/metadata-sources-ui-schema.json
index e82f9832d..e156a4c62 100644
--- a/backend/src/main/resources/metadata-sources-ui-schema.json
+++ b/backend/src/main/resources/metadata-sources-ui-schema.json
@@ -140,9 +140,23 @@
                 }
             },
             "dependencies": {
-                "nameIdFormats": [
-                    "protocolSupportEnum"
-                ]
+                "nameIdFormats": {
+                    "oneOf": [
+                        {
+                            "nameIdFormats": {
+                                "minLength": 1
+                            },
+                            "required": [
+                                "protocolSupportEnum"
+                            ]
+                        },
+                        {
+                            "nameIdFormats": {
+                                "minLength": 0
+                            }
+                        }
+                    ]
+                }
             }
         },
         "logoutEndpoints": {
diff --git a/ui/public/assets/schema/provider/filebacked-http.schema.json b/ui/public/assets/schema/provider/filebacked-http.schema.json
index a85d1e400..c06d7a5f3 100644
--- a/ui/public/assets/schema/provider/filebacked-http.schema.json
+++ b/ui/public/assets/schema/provider/filebacked-http.schema.json
@@ -188,7 +188,7 @@
                     "description": "tooltip.proxy-host"
                 },
                 "proxyPort": {
-                    "type": "string",
+                    "type": "integer",
                     "title": "label.proxy-port",
                     "description": "tooltip.proxy-port"
                 },
diff --git a/ui/public/assets/schema/source/metadata-source.json b/ui/public/assets/schema/source/metadata-source.json
index a35ccbb45..0bffdff55 100644
--- a/ui/public/assets/schema/source/metadata-source.json
+++ b/ui/public/assets/schema/source/metadata-source.json
@@ -50,7 +50,9 @@
                         {
                             "properties": {
                                 "authenticationRequestsSigned": {
-                                    "const": true
+                                    "enum": [
+                                        true
+                                    ]
                                 },
                                 "x509Certificates": {
                                     "minItems": 1
@@ -60,7 +62,9 @@
                         {
                             "properties": {
                                 "authenticationRequestsSigned": {
-                                    "const": false
+                                    "enum": [
+                                        false
+                                    ]
                                 },
                                 "x509Certificates": {
                                     "minItems": 0
@@ -71,6 +75,10 @@
                 }
             },
             "properties": {
+                "x509CertificateAvailable": {
+                    "type": "boolean",
+                    "default": true
+                },
                 "authenticationRequestsSigned": {
                     "title": "label.authentication-requests-signed",
                     "description": "tooltip.authentication-requests-signed",
@@ -136,9 +144,23 @@
                 }
             },
             "dependencies": {
-                "nameIdFormats": [
-                    "protocolSupportEnum"
-                ]
+                "nameIdFormats": {
+                    "oneOf": [
+                        {
+                            "nameIdFormats": {
+                                "minLength": 1
+                            },
+                            "required": [
+                                "protocolSupportEnum"
+                            ]
+                        },
+                        {
+                            "nameIdFormats": {
+                                "minLength": 0
+                            }
+                        }
+                    ]
+                }
             }
         },
         "logoutEndpoints": {
@@ -595,9 +617,6 @@
             "description": "tooltip.nameid-format",
             "type": "array",
             "uniqueItems": true,
-            "additionalProperties": {
-                "type": "string"
-            },
             "items": {
                 "type": "string",
                 "minLength": 1,