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

fix firefox redirect loop

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/portal/install", "_blank")
   }
 </script>
 

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) {
-    if ($auth.user && !$auth.user.forceResetPassword) {
+    $redirect("../")
-      $redirect("../")
+  }
-    }
 
-    // redirect to account portal for authentication in the cloud
+  // redirect to account portal for authentication in the cloud
-    if (
+  if (
-      !$auth.user &&
+    !$auth.user &&
-      $admin.cloud &&
+    $admin.cloud &&
-      $admin.accountPortalUrl &&
+    $admin.accountPortalUrl &&
-      !$admin?.checklist?.sso?.checked
+    !$admin?.checklist?.sso?.checked
-    ) {
+  ) {
-      window.location.href = $admin.accountPortalUrl
+    window.location.href = $admin.accountPortalUrl
-    }
+  }
-  })
 </script>
 
 {#if !$auth.user || $auth.user.forceResetPassword}