feat(auth): only show "Successfully logged in." if MFA not required

It's weird to show the "Successfully logged in." message when the user
is prompted for verification because they aren't fully logged in yet.
This commit is contained in:
Steven Nguyen committed 2024-05-16 11:11:58 -07:00
1 parent fb01768652
commit 184f2ecfe7
4 files changed
+21 -10

No files matched your search

+3 -2
View File
@@ -1,5 +1,5 @@
<script lang="ts">
import { goto } from '$app/navigation';
import { goto, invalidate } from '$app/navigation';
import { base } from '$app/paths';
import { AvatarInitials, DropList, DropListItem, DropListLink, Support } from '$lib/components';
import { app } from '$lib/stores/app';
@@ -24,7 +24,7 @@
import CreateOrganizationCloud from '$routes/console/createOrganizationCloud.svelte';
import { Feedback } from '$lib/components/feedback';
import ChangeOrganizationTierCloud from '$routes/console/changeOrganizationTierCloud.svelte';
import { BillingPlan } from '$lib/constants';
import { BillingPlan, Dependencies } from '$lib/constants';
let showDropdown = false;
let showSupport = false;
@@ -40,6 +40,7 @@
async function logout() {
await sdk.forConsole.account.deleteSession('current');
await invalidate(Dependencies.ACCOUNT);
trackEvent(Submit.AccountLogout);
await goto(`${base}/login`);
}
+2 -1
View File
@@ -42,12 +42,13 @@ export const load: LayoutLoad = async ({ depends, url }) => {
const path = url.search ? `${url.search}&${redirectUrl}` : `?${redirectUrl}`;
if (error.type === 'user_more_factors_required') {
if (url.pathname === '/mfa') return;
if (url.pathname === '/mfa') return {}; // Ensure any previous account/organizations are cleared
redirect(303, `/mfa${path}`);
}
if (!acceptedRoutes.some((n) => url.pathname.startsWith(n))) {
redirect(303, `/login${path}`);
}
return {}; // Ensure any previous account/organizations are cleared
}
};
+8 -1
View File
@@ -67,6 +67,10 @@
trackError(error, Submit.AccountRecoveryCodesUpdate);
}
}
$: if (!showRecoveryCodes) {
codes = null;
}
</script>
<CardGrid>
@@ -194,7 +198,10 @@
<DeleteMfa bind:showDelete />
<MfaRecoveryCodes bind:showRecoveryCodes {codes} />
<MfaRegenerateCodes bind:show={showRegenerateRecoveryCodes} {regenerateRecoveryCodes} />
<MfaRegenerateCodes
bind:show={showRegenerateRecoveryCodes}
{regenerateRecoveryCodes}
factors={$factors} />
<style lang="scss">
@import '@appwrite.io/pink/src/abstract/variables/_devices.scss';
+8 -6
View File
@@ -18,6 +18,7 @@
import { page } from '$app/stores';
import { OAuthProvider } from '@appwrite.io/console';
import { redirectTo } from '$routes/store';
import { user } from '$lib/stores/user';
let mail: string, pass: string, disabled: boolean;
@@ -26,17 +27,18 @@
disabled = true;
await sdk.forConsole.account.createEmailPasswordSession(mail, pass);
await invalidate(Dependencies.ACCOUNT);
addNotification({
type: 'success',
message: 'Successfully logged in.'
});
trackEvent(Submit.AccountLogin);
if ($user) {
addNotification({
type: 'success',
message: 'Successfully logged in.'
});
}
if ($redirectTo) {
window.location.href = $redirectTo;
return;
}
await invalidate(Dependencies.ACCOUNT);
trackEvent(Submit.AccountCreate);
if ($page.url.searchParams) {
const redirect = $page.url.searchParams.get('redirect');