Merge pull request #2804 from Budibase/fix/redirect-loop-ff

fix firefox redirect loop
This commit is contained in:
Martin McKeaveney 2021-09-29 19:27:15 +01:00 committed by GitHub
commit 6edc25f52e
6 changed files with 83 additions and 3058 deletions

View File

@ -4,7 +4,7 @@
let upgradeModal let upgradeModal
const onConfirm = () => { const onConfirm = () => {
window.open("https://accounts.budibase.com/install", "_blank") window.open("https://account.budibase.app/portal/install", "_blank")
} }
</script> </script>

View File

@ -1,12 +1,10 @@
<script> <script>
import { auth, admin } from "stores/portal" import { auth, admin } from "stores/portal"
import { onMount } from "svelte"
import { redirect } from "@roxi/routify" import { redirect } from "@roxi/routify"
// If already authenticated, redirect away from the auth section. // If already authenticated, redirect away from the auth section.
// Check this onMount rather than a reactive statement to avoid trumping // Check this onMount rather than a reactive statement to avoid trumping
// the login return URL functionality. // the login return URL functionality.
onMount(() => {
if ($auth.user && !$auth.user.forceResetPassword) { if ($auth.user && !$auth.user.forceResetPassword) {
$redirect("../") $redirect("../")
} }
@ -20,7 +18,6 @@
) { ) {
window.location.href = $admin.accountPortalUrl window.location.href = $admin.accountPortalUrl
} }
})
</script> </script>
{#if !$auth.user || $auth.user.forceResetPassword} {#if !$auth.user || $auth.user.forceResetPassword}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff