From 6a3367389dc1f42a512da090bf2cd5c48f646c9b Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Thu, 8 Jul 2021 12:36:09 +0100 Subject: [PATCH] fixing conflict with OIDCButton --- .../auth/_components/OidcButton.svelte | 39 ------------------- .../builder/portal/manage/auth/index.svelte | 20 +++++----- 2 files changed, 10 insertions(+), 49 deletions(-) delete mode 100644 packages/builder/src/pages/builder/auth/_components/OidcButton.svelte diff --git a/packages/builder/src/pages/builder/auth/_components/OidcButton.svelte b/packages/builder/src/pages/builder/auth/_components/OidcButton.svelte deleted file mode 100644 index 46990b759e..0000000000 --- a/packages/builder/src/pages/builder/auth/_components/OidcButton.svelte +++ /dev/null @@ -1,39 +0,0 @@ - - - {#if show} - window.open("/api/admin/auth/oidc", "_blank")} - > -
- oidc icon -

Sign in with OIDC

-
-
- {/if} - - - \ No newline at end of file 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 3f4b39bd4e..3837699e6a 100644 --- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte @@ -85,7 +85,7 @@ let fileName = e.target.files[0].name image = e.target.files[0] providers.oidc.config["iconName"] = fileName - iconDropdownOptions.unshift({label: fileName, value: fileName}) + iconDropdownOptions.unshift({ label: fileName, value: fileName }) } const providers = { google, oidc } @@ -140,17 +140,17 @@ const configSettings = await res.json() if (configSettings.config) { - const logoKeys = Object.keys(configSettings.config) + const logoKeys = Object.keys(configSettings.config) - logoKeys.map(logoKey => { - const logoUrl = configSettings.config[logoKey] - iconDropdownOptions.unshift({ - label: logoKey, - value: logoKey, - icon: logoUrl, + 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()