From cff2a9ad7d254c83cabc28b79301a6aea5e85b3c Mon Sep 17 00:00:00 2001
From: Peter Clement <peter@budibase.com>
Date: Wed, 7 Jul 2021 16:18:18 +0100
Subject: [PATCH] Fix for icon upload issue

---
 packages/auth/src/constants.js                |  2 +-
 packages/bbui/src/Form/Core/Picker.svelte     |  3 +-
 .../builder/portal/manage/auth/index.svelte   | 37 ++++++++++++-------
 3 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/packages/auth/src/constants.js b/packages/auth/src/constants.js
index ca0e69b34..54736bed6 100644
--- a/packages/auth/src/constants.js
+++ b/packages/auth/src/constants.js
@@ -21,5 +21,5 @@ exports.Configs = {
   SMTP: "smtp",
   GOOGLE: "google",
   OIDC: "oidc",
-  OIDC_LOGOS:"oidc_logos"
+  OIDC_LOGOS: "oidc_logos",
 }
diff --git a/packages/bbui/src/Form/Core/Picker.svelte b/packages/bbui/src/Form/Core/Picker.svelte
index b7f53fb86..cd8f784b1 100644
--- a/packages/bbui/src/Form/Core/Picker.svelte
+++ b/packages/bbui/src/Form/Core/Picker.svelte
@@ -14,7 +14,6 @@
   export let isPlaceholder = false
   export let placeholderOption = null
   export let options = []
-  export let callbackOptionValue = null
   export let isOptionSelected = () => false
   export let onSelectOption = () => {}
   export let getOptionLabel = option => option
@@ -47,7 +46,7 @@
 >
   {#if fieldIcon}
     <span class="icon-Placeholder-Padding">
-      <img src={fieldIcon} alt="test" width="20" height="15" />
+      <img src={fieldIcon} alt="OpenID Icon" width="20" height="15" />
     </span>
   {/if}
 
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 b5fd01b36..1b74e9aaa 100644
--- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
+++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte
@@ -1,5 +1,5 @@
 <script>
-  import GoogleLogo from "./_logos/Google.svelte"  
+  import GoogleLogo from "./_logos/Google.svelte"
   import OidcLogo from "./_logos/OIDC.svelte"
   import MicrosoftLogo from "assets/microsoft-logo.png"
   import OracleLogo from "assets/oracle-logo.png"
@@ -60,7 +60,7 @@
     },
     { label: "Oracle", value: "Oracle", icon: OracleLogo },
     { label: "Auth0", value: "Auth0", icon: Auth0Logo },
-    { label: "OIDC", value: "Auth0", icon: OidcLogoPng },
+    { label: "OIDC", value: "Oidc", icon: OidcLogoPng },
 
     { label: "Upload your own", value: "Upload" },
   ]
@@ -82,13 +82,17 @@
   }
 
   const onFileSelected = e => {
+    let fileName = e.target.files[0].name
     image = e.target.files[0]
+    providers.oidc.config["iconName"] = fileName
+    iconDropdownOptions.unshift({label: fileName, value: fileName})
   }
 
   const providers = { google, oidc }
 
   async function save(docs) {
-    uploadLogo(image)
+    // only if the user has provided an image, upload it.
+    image && uploadLogo(image)
     let calls = []
     docs.forEach(element => {
       calls.push(api.post(`/api/admin/configs`, element))
@@ -130,6 +134,21 @@
       providers.google = googleDoc
     }
 
+    //Get the list of user uploaded logos and push it to the dropdown options.
+    //This needs to be done before the config callso they're available when the dropdown renders
+    const res = await api.get(`/api/admin/configs/oidc_logos`)
+    const configSettings = await res.json()
+    const logoKeys = Object.keys(configSettings.config)
+
+    logoKeys.map(logoKey => {
+      const logoUrl = configSettings.config[logoKey]
+      iconDropdownOptions.unshift({
+        label: logoKey,
+        value: logoKey,
+        icon: logoUrl,
+      })
+    })
+
     const oidcResponse = await api.get(`/api/admin/configs/${ConfigTypes.OIDC}`)
     const oidcDoc = await oidcResponse.json()
 
@@ -141,16 +160,7 @@
     } else {
       providers.oidc = oidcDoc
     }
-    const res = await api.get(`/api/admin/configs/oidc_logos`)
-    const configSettings = await res.json()
-    console.log(configSettings)
-    const logoKeys = Object.keys(configSettings.config)
-    logoKeys.map(logoKey => {
-      const logoUrl = configSettings.config[logoKey]
-      iconDropdownOptions.unshift({label: logoKey, value: logoUrl, icon: logoUrl})
-    })
   })
-
 </script>
 
 <Layout>
@@ -215,12 +225,11 @@
       </div>
       <div class="form-row">
         <Label size="L">Icon</Label>
-
         <Select
           label=""
           bind:value={providers.oidc.config["iconName"]}
           options={iconDropdownOptions}
-          on:change={e => (e.detail === "Upload" && fileinput.click())}
+          on:change={e => e.detail === "Upload" && fileinput.click()}
         />
       </div>
       <input