From de075a7549e47571ce69627ddff404f89f0ee819 Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 9 Jul 2021 15:50:46 +0100
Subject: [PATCH] Fix OIDC logo conditional display

---
 .../src/pages/builder/auth/_components/OIDCButton.svelte      | 4 ++--
 .../builder/src/pages/builder/portal/manage/auth/index.svelte | 4 ++--
 packages/worker/src/api/routes/admin/configs.js               | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
index 351370b871..96b247b150 100644
--- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
@@ -24,9 +24,9 @@
   <ActionButton on:click={() => window.open("/api/admin/auth/oidc", "_blank")}>
     <div class="inner">
       <img
-        src={preDefinedIcons[oidcIcon]
+        src={!oidcIcon ? OidcLogo : preDefinedIcons[oidcIcon]
           ? preDefinedIcons[oidcIcon]
-          : `/global/oidc_logos/${oidcIcon}` || OidcLogo}
+          : `/global/oidc_logos/${oidcIcon}`}
         alt="oidc icon"
       />
       <p>{`Sign in with ${oidcName || "OIDC"}`}</p>
diff --git a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
index ddda8e226b..623d80400b 100644
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@@ -46,12 +46,12 @@
   }
 
   const OIDCConfigFields = {
-    Oidc: ["configUrl", "clientId", "clientSecret"],
+    Oidc: ["configUrl", "clientID", "clientSecret"],
   }
   const OIDCConfigLabels = {
     Oidc: {
       configUrl: "Config URL",
-      clientId: "Client ID",
+      clientID: "Client ID",
       clientSecret: "Client Secret",
     },
   }
diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js
index 66c6c29c7b..67e110aa1b 100644
--- a/packages/worker/src/api/routes/admin/configs.js
+++ b/packages/worker/src/api/routes/admin/configs.js
@@ -47,8 +47,8 @@ function oidcValidation() {
     clientID: Joi.string().required(),
     clientSecret: Joi.string().required(),
     configUrl: Joi.string().required(),
-    iconName: Joi.string().required(),
-    name: Joi.string().required(),
+    iconName: Joi.string().optional(),
+    name: Joi.string().optional(),
   }).unknown(true)
 }