From 4ae29f6b545b085a282e0fe5be1bd188ff41462e Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Fri, 9 Jul 2021 14:18:03 +0100
Subject: [PATCH] Fix bug where OIDC icon was not being displayed due to
 misconfiguration

---
 packages/bbui/src/Form/Core/Picker.svelte     |  1 -
 .../auth/_components/OIDCButton.svelte        |  1 -
 .../builder/portal/manage/auth/index.svelte   |  6 ++---
 .../src/api/controllers/admin/configs.js      | 23 +++++++++++++------
 .../worker/src/api/routes/admin/configs.js    | 12 ++++------
 5 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index cd8f784b14..4705f6f0d8 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -31,7 +31,6 @@
     }
     open = true
   }
-  console.log(fieldIcon)
 </script>
 
 <button
diff --git a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
index e03faa0208..93f34106b0 100644
--- a/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
+++ b/packages/builder/src/pages/builder/auth/_components/OIDCButton.svelte
@@ -18,7 +18,6 @@
     AD: MicrosoftLogo
   }
   $: show = $admin.checklist?.oidc
-  console.log(preDefinedIcons[oidcIcon])
 </script>
 
 {#if show}
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 051b7bc2f8..3754316834 100644
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@@ -19,8 +19,6 @@
   } from "@budibase/bbui"
   import { onMount } from "svelte"
   import api from "builderStore/api"
-  import { writable } from "svelte/store"
-  import { organisation } from "stores/portal"
 
   const ConfigTypes = {
     Google: "google",
@@ -41,12 +39,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/controllers/admin/configs.js b/packages/worker/src/api/controllers/admin/configs.js
index 8774dd488d..4485e1f5d3 100644
--- a/packages/worker/src/api/controllers/admin/configs.js
+++ b/packages/worker/src/api/controllers/admin/configs.js
@@ -111,15 +111,24 @@ exports.publicSettings = async function (ctx) {
     const oidcConfig = await getScopedFullConfig(db, {
       type: Configs.OIDC,
     })
-    if (!publicConfig) {
-      ctx.body = {}
-    } else {
+
+    if (publicConfig && !oidcConfig) {
       ctx.body = publicConfig
-      if (oidcConfig.config) {
-        publicConfig.config.oidcIcon = oidcConfig.config.iconName
-        publicConfig.config.oidcName = oidcConfig.config.name
-      }
     }
+    else if(!publicConfig && oidcConfig) {
+      // Pull out the OIDC icon and name because the other properties shouldn't
+      // be made public
+      let config = {}
+      config.oidcIcon = oidcConfig.config.iconName
+      config.oidcName = oidcConfig.config.name
+      oidcConfig.config = config
+      ctx.body = oidcConfig
+    }
+    else if (publicConfig && oidcConfig) {
+      ctx.body = publicConfig 
+      publicConfig.config.oidcIcon = oidcConfig.config.iconName
+      publicConfig.config.oidcName = oidcConfig.config.name
+  }     
   } catch (err) {
     ctx.throw(err.status, err)
   }
diff --git a/packages/worker/src/api/routes/admin/configs.js b/packages/worker/src/api/routes/admin/configs.js
index 2e926b61f0..362099c094 100644
--- a/packages/worker/src/api/routes/admin/configs.js
+++ b/packages/worker/src/api/routes/admin/configs.js
@@ -3,7 +3,7 @@ const controller = require("../../controllers/admin/configs")
 const joiValidator = require("../../../middleware/joi-validator")
 const adminOnly = require("../../../middleware/adminOnly")
 const Joi = require("joi")
-const { Configs, ConfigUploads } = require("../../../constants")
+const { Configs } = require("../../../constants")
 
 const router = Router()
 
@@ -41,16 +41,14 @@ function googleValidation() {
   }).unknown(true)
 }
 
-function OidcValidation() {
+function oidcValidation() {
   // prettier-ignore
   return Joi.object({
     clientID: Joi.string().required(),
-    authUrl: Joi.string().required(),
-    tokenUrl: Joi.string().required(),
-    userInfoUrl: Joi.string().required(),
-    clientId: Joi.string().required(),
     clientSecret: Joi.string().required(),
-    callbackUrl: Joi.string().required(),
+    configUrl: Joi.string().required(),
+    iconName: Joi.string().required(),
+    name: Joi.string().required(),
   }).unknown(true)
 }