From af792cc09eff520c4076487961273c0776798435 Mon Sep 17 00:00:00 2001 From: Peter Clement Date: Tue, 13 Jul 2021 14:54:20 +0100 Subject: [PATCH] improve structure of OIDC config --- packages/builder/assets/oracle-logo.png | Bin 26997 -> 0 bytes .../src/pages/builder/auth/login.svelte | 8 ++--- .../builder/portal/manage/auth/index.svelte | 26 +++++--------- packages/builder/src/stores/portal/index.js | 1 + packages/builder/src/stores/portal/oidc.js | 32 ++++++++++++++++++ .../builder/src/stores/portal/organisation.js | 2 -- .../src/api/controllers/admin/configs.js | 24 +++++++++++++ packages/worker/src/api/index.js | 4 +++ .../worker/src/api/routes/admin/configs.js | 15 +++++--- 9 files changed, 82 insertions(+), 30 deletions(-) delete mode 100644 packages/builder/assets/oracle-logo.png create mode 100644 packages/builder/src/stores/portal/oidc.js diff --git a/packages/builder/assets/oracle-logo.png b/packages/builder/assets/oracle-logo.png deleted file mode 100644 index b6491a8a636dbf1751f90db1f099583004c0d8da..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 26997 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 diff --git a/packages/builder/src/pages/builder/auth/login.svelte b/packages/builder/src/pages/builder/auth/login.svelte index 69b76a129b..0b726fb08d 100644 --- a/packages/builder/src/pages/builder/auth/login.svelte +++ b/packages/builder/src/pages/builder/auth/login.svelte @@ -10,7 +10,7 @@ notifications, } from "@budibase/bbui" import { goto, params } from "@roxi/routify" - import { auth, organisation } from "stores/portal" + import { auth, organisation, oidc } from "stores/portal" import GoogleButton from "./_components/GoogleButton.svelte" import OIDCButton from "./_components/OIDCButton.svelte" import Logo from "assets/bb-emblem.svg" @@ -50,6 +50,7 @@ onMount(async () => { await organisation.init() + await oidc.init() }) @@ -62,10 +63,7 @@ Sign in to {company} - + Sign in with email 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 623d80400b..9c91974177 100644 --- a/packages/builder/src/pages/builder/portal/manage/auth/index.svelte +++ b/packages/builder/src/pages/builder/portal/manage/auth/index.svelte @@ -2,7 +2,6 @@ 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" import Auth0Logo from "assets/auth0-logo.png" import OidcLogoPng from "assets/oidc-logo.png" @@ -19,14 +18,8 @@ } from "@budibase/bbui" import { onMount } from "svelte" import api from "builderStore/api" - import { writable } from "svelte/store" import { organisation } from "stores/portal" - const values = writable({ - oidcIcon: $organisation.oidcIcon, - oidcName: $organisation.oidcName, - }) - const ConfigTypes = { Google: "google", OIDC: "oidc", @@ -58,11 +51,10 @@ let iconDropdownOptions = [ { - label: "Azure AD", - value: "AD", + label: "Microsoft", + value: "Microsoft", icon: MicrosoftLogo, }, - { label: "Oracle", value: "Oracle", icon: OracleLogo }, { label: "Auth0", value: "Auth0", icon: Auth0Logo }, { label: "OIDC", value: "Oidc", icon: OidcLogoPng }, @@ -88,9 +80,8 @@ const onFileSelected = e => { let fileName = e.target.files[0].name image = e.target.files[0] - $values.oidcIcon = fileName + providers.oidc.config.configs[0].logo = fileName iconDropdownOptions.unshift({ label: fileName, value: fileName }) - image && uploadLogo(image) } const providers = { google, oidc } @@ -98,7 +89,6 @@ async function save(docs) { // only if the user has provided an image, upload it. image && uploadLogo(image) - await organisation.save($values) let calls = [] docs.forEach(element => { calls.push(api.post(`/api/admin/configs`, element)) @@ -164,7 +154,7 @@ if (!oidcDoc._id) { providers.oidc = { type: ConfigTypes.OIDC, - config: {}, + config: { configs: [{}] }, } } else { providers.oidc = oidcDoc @@ -194,7 +184,7 @@ To allow users to authenticate using their Google accounts, fill out the fields below. - + dddd {#each GoogleConfigFields.Google as field}
@@ -221,7 +211,7 @@ {#each OIDCConfigFields.Oidc as field}
- +
{/each}
@@ -230,13 +220,13 @@
- +