MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tidy up auth logic in routes

This commit is contained in:
Andrew Kingston 2021-05-06 14:52:20 +01:00
parent 735c724a0d
commit 2e335019cd
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/builder/src/components/login/LoginForm.svelte
View File

@ -18,7 +18,7 @@
username, username,
password, password,
}) })
notifications.success("Logged in successfully.") notifications.success("Logged in successfully")
$goto("../portal") $goto("../portal")
} catch (err) { } catch (err) {
console.error(err) console.error(err)

7
packages/builder/src/pages/_layout.svelte
View File

@ -8,12 +8,11 @@
onMount(async () => { onMount(async () => {
await admin.init() await admin.init()
await auth.checkAuth()
if (!$admin?.checklist?.adminUser) { if (!$admin?.checklist?.adminUser) {
$goto("./admin") $goto("./admin")
} else {
await auth.checkAuth()
checked = true
} }
checked = true
}) })
$: { $: {
@ -23,6 +22,6 @@
} }
</script> </script>
{#if $admin.checklist} {#if checked}
<slot /> <slot />
{/if} {/if}