Browse Source

Move account portal redirect to top of auth level

master
Rory Powell 5 years ago
parent
commit
33090a2521
  1. 7
      packages/builder/src/pages/builder/auth/_layout.svelte
  2. 6
      packages/builder/src/pages/builder/auth/login.svelte
  3. 2
      packages/builder/src/pages/builder/portal/_layout.svelte

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

@ -1,5 +1,5 @@
<script> <script>
import { auth } from "stores/portal" import { auth, admin } from "stores/portal"
import { onMount } from "svelte" import { onMount } from "svelte"
import { redirect } from "@roxi/routify" import { redirect } from "@roxi/routify"
@ -10,6 +10,11 @@
if ($auth.user && !$auth.user.forceResetPassword) { if ($auth.user && !$auth.user.forceResetPassword) {
$redirect("../") $redirect("../")
} }
// redirect to account portal for authentication in the cloud
if ($admin.cloud && $admin.accountPortalUrl) {
window.location.href = $admin.accountPortalUrl
}
}) })
</script> </script>

6
packages/builder/src/pages/builder/auth/login.svelte

@ -51,12 +51,6 @@
onMount(async () => { onMount(async () => {
await organisation.init() await organisation.init()
// redirect to account portal for login in the cloud
if ($admin.cloud && $admin.accountPortalUrl) {
window.location.href = $admin.accountPortalUrl
}
loaded = true loaded = true
}) })
</script> </script>

2
packages/builder/src/pages/builder/portal/_layout.svelte

@ -60,7 +60,7 @@
} }
// add link to account portal if the user has access // add link to account portal if the user has access
if ($auth.user.account) { if ($auth?.user?.account) {
menu = menu.concat([ menu = menu.concat([
{ {
title: "Account", title: "Account",

Loading…
Cancel
Save