This commit is contained in:
mike12345567 2021-07-21 18:24:58 +01:00
parent 82465bdf7a
commit 8121528f76
3 changed files with 7 additions and 11 deletions

View File

@ -8,10 +8,10 @@
Heading, Heading,
ActionButton, ActionButton,
} from "@budibase/bbui" } from "@budibase/bbui"
import {organisation, auth} from "stores/portal" import { organisation, auth } from "stores/portal"
import Logo from "assets/bb-emblem.svg" import Logo from "assets/bb-emblem.svg"
import {onMount} from "svelte" import { onMount } from "svelte"
import {goto} from "@roxi/routify" import { goto } from "@roxi/routify"
let email = "" let email = ""
@ -47,9 +47,7 @@
<Button cta on:click={forgot} disabled={!email}> <Button cta on:click={forgot} disabled={!email}>
Reset your password Reset your password
</Button> </Button>
<ActionButton quiet on:click={() => $goto("../")}> <ActionButton quiet on:click={() => $goto("../")}>Back</ActionButton>
Back
</ActionButton>
</Layout> </Layout>
</Layout> </Layout>
</div> </div>

View File

@ -10,7 +10,7 @@
notifications, notifications,
} from "@budibase/bbui" } from "@budibase/bbui"
import { goto, params } from "@roxi/routify" import { goto, params } from "@roxi/routify"
import {auth, organisation, oidc, admin} from "stores/portal" import { auth, organisation, oidc, admin } from "stores/portal"
import GoogleButton from "./_components/GoogleButton.svelte" import GoogleButton from "./_components/GoogleButton.svelte"
import OIDCButton from "./_components/OIDCButton.svelte" import OIDCButton from "./_components/OIDCButton.svelte"
import Logo from "assets/bb-emblem.svg" import Logo from "assets/bb-emblem.svg"

View File

@ -113,15 +113,13 @@
// Create a flag so that it will only try to save completed forms // Create a flag so that it will only try to save completed forms
$: partialGoogle = $: partialGoogle =
providers.google?.config?.clientID || providers.google?.config?.clientID || providers.google?.config?.clientSecret
providers.google?.config?.clientSecret
$: partialOidc = $: partialOidc =
providers.oidc?.config?.configs[0].configUrl || providers.oidc?.config?.configs[0].configUrl ||
providers.oidc?.config?.configs[0].clientID || providers.oidc?.config?.configs[0].clientID ||
providers.oidc?.config?.configs[0].clientSecret providers.oidc?.config?.configs[0].clientSecret
$: googleComplete = $: googleComplete =
providers.google?.config?.clientID && providers.google?.config?.clientID && providers.google?.config?.clientSecret
providers.google?.config?.clientSecret
$: oidcComplete = $: oidcComplete =
providers.oidc?.config?.configs[0].configUrl && providers.oidc?.config?.configs[0].configUrl &&
providers.oidc?.config?.configs[0].clientID && providers.oidc?.config?.configs[0].clientID &&