Browse Source

fix firefox redirect loop

pull/4023/head
Martin McKeaveney 5 years ago
parent
commit
e4473a32fd
  1. 2
      packages/builder/src/components/upgrade/UpgradeModal.svelte
  2. 27
      packages/builder/src/pages/builder/auth/_layout.svelte
  3. 743
      packages/builder/yarn.lock
  4. 977
      packages/client/yarn.lock
  5. 739
      packages/server/yarn.lock
  6. 655
      packages/worker/yarn.lock

2
packages/builder/src/components/upgrade/UpgradeModal.svelte

@ -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>

27
packages/builder/src/pages/builder/auth/_layout.svelte

@ -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}

743
packages/builder/yarn.lock

File diff suppressed because it is too large

977
packages/client/yarn.lock

File diff suppressed because it is too large

739
packages/server/yarn.lock

File diff suppressed because it is too large

655
packages/worker/yarn.lock

File diff suppressed because it is too large
Loading…
Cancel
Save