fix firefox redirect loop

This commit is contained in:
Martin McKeaveney 2021-09-29 18:59:26 +01:00
parent 736970afcc
commit b94c65f1c4
6 changed files with 83 additions and 3058 deletions

View File

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

View File

@ -1,26 +1,23 @@
<script>
import { auth, admin } from "stores/portal"
import { onMount } from "svelte"
import { redirect } from "@roxi/routify"
// If already authenticated, redirect away from the auth section.
// Check this onMount rather than a reactive statement to avoid trumping
// the login return URL functionality.
onMount(() => {
if ($auth.user && !$auth.user.forceResetPassword) {
$redirect("../")
}
if ($auth.user && !$auth.user.forceResetPassword) {
$redirect("../")
}
// redirect to account portal for authentication in the cloud
if (
!$auth.user &&
$admin.cloud &&
$admin.accountPortalUrl &&
!$admin?.checklist?.sso?.checked
) {
window.location.href = $admin.accountPortalUrl
}
})
// redirect to account portal for authentication in the cloud
if (
!$auth.user &&
$admin.cloud &&
$admin.accountPortalUrl &&
!$admin?.checklist?.sso?.checked
) {
window.location.href = $admin.accountPortalUrl
}
</script>
{#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