From 86b1f780e71666f983e92272394e78f20906abec Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Fri, 11 Jun 2021 14:17:20 -0700
Subject: [PATCH] Fixed SHIBUI-1941

---
 .../assets/schema/source/metadata-source.json | 19 -------------------
 .../domain/source/SourceDefinition.js         |  6 +++++-
 2 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/ui/public/assets/schema/source/metadata-source.json b/ui/public/assets/schema/source/metadata-source.json
index 0bffdff55..dc19fe8d4 100644
--- a/ui/public/assets/schema/source/metadata-source.json
+++ b/ui/public/assets/schema/source/metadata-source.json
@@ -142,25 +142,6 @@
                 "nameIdFormats": {
                     "$ref": "#/definitions/nameIdFormats"
                 }
-            },
-            "dependencies": {
-                "nameIdFormats": {
-                    "oneOf": [
-                        {
-                            "nameIdFormats": {
-                                "minLength": 1
-                            },
-                            "required": [
-                                "protocolSupportEnum"
-                            ]
-                        },
-                        {
-                            "nameIdFormats": {
-                                "minLength": 0
-                            }
-                        }
-                    ]
-                }
             }
         },
         "logoutEndpoints": {
diff --git a/ui/src/app/metadata/domain/source/SourceDefinition.js b/ui/src/app/metadata/domain/source/SourceDefinition.js
index d3db4f603..c2e557c7a 100644
--- a/ui/src/app/metadata/domain/source/SourceDefinition.js
+++ b/ui/src/app/metadata/domain/source/SourceDefinition.js
@@ -11,7 +11,6 @@ export const SourceBase = {
     type: '@MetadataProvider',
     steps: [],
     schema: `${API_BASE_PATH}/ui/MetadataSources`,
-    validatorParams: [/*getAllOtherIds*/],
 
     parser: (data) => removeNull(data, true),
 
@@ -28,6 +27,11 @@ export const SourceBase = {
             if (entityIds.indexOf(formData.entityId) > -1) {
                 errors.entityId.addError('message.id-unique');
             }
+
+            if (formData?.serviceProviderSsoDescriptor?.nameIdFormats?.length > 0 && !formData.serviceProviderSsoDescriptor.protocolSupportEnum) {
+                errors.serviceProviderSsoDescriptor.protocolSupportEnum.addError('message.protocol-support-required')
+            }
+
             return errors;
         }
     },