fix frontend

Author: HarshMN2345

src/lib/helpers/emailVerification.ts

@@ -1,5 +1,7 @@
 import type { Models } from '@appwrite.io/console';
 
+const EMAIL_VERIFICATION_REQUIRED_ERROR_TYPE = 'user_email_not_verified';
+
 export function isEmailVerificationEnabled(
     consoleVariables: Models.ConsoleVariables | undefined
 ): boolean {
@@ -9,3 +11,7 @@ export function isEmailVerificationEnabled(
 
     return String(consoleVariables._APP_CONSOLE_EMAIL_VERIFICATION) === 'true';
 }
+
+export function isEmailVerificationRequiredError(type: string | undefined): boolean {
+    return type === EMAIL_VERIFICATION_REQUIRED_ERROR_TYPE;
+}

src/routes/(console)/+error.svelte

@@ -1,9 +1,17 @@
-<script>
-    import { base } from '$app/paths';
+<script lang="ts">
+    import { goto } from '$app/navigation';
+    import { base, resolve } from '$app/paths';
     import { page } from '$app/state';
     import { Button } from '$lib/elements/forms';
+    import { isEmailVerificationRequiredError } from '$lib/helpers/emailVerification';
     import { Container } from '$lib/layout';
     import { Typography } from '@appwrite.io/pink-svelte';
+
+    $effect(() => {
+        if (isEmailVerificationRequiredError(page.error.type)) {
+            goto(resolve('/verify-email'), { replaceState: true });
+        }
+    });
 </script>
 
 <Container>

src/routes/(console)/+layout.ts

@@ -2,17 +2,17 @@ import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import type { LayoutLoad } from './$types';
 import { Dependencies } from '$lib/constants';
-import { Platform, Query } from '@appwrite.io/console';
+import { AppwriteException, Platform, Query } from '@appwrite.io/console';
 import { makePlansMap } from '$lib/helpers/billing';
 import { plansInfo as plansInfoStore } from '$lib/stores/billing';
 import { normalizeConsoleVariables } from '$lib/helpers/domains';
 import { syncServerTime } from '$lib/helpers/fingerprint';
 import { redirect } from '@sveltejs/kit';
 import { resolve } from '$app/paths';
-import { isEmailVerificationEnabled } from '$lib/helpers/emailVerification';
+import { isEmailVerificationRequiredError } from '$lib/helpers/emailVerification';
 
-export const load: LayoutLoad = async ({ depends, parent, url }) => {
-    const { organizations, plansInfo, account } = await parent();
+export const load: LayoutLoad = async ({ depends, parent }) => {
+    const { organizations, plansInfo } = await parent();
 
     depends(Dependencies.RUNTIMES);
     depends(Dependencies.CONSOLE_VARIABLES);
@@ -41,22 +41,15 @@ export const load: LayoutLoad = async ({ depends, parent, url }) => {
             return response.json() as { version?: string };
         }),
         sdk.forConsole.console.variables()
-    ]);
-
-    const consoleVariables = normalizeConsoleVariables(rawConsoleVariables);
-
-    if (
-        isCloud &&
-        account &&
-        !account.emailVerification &&
-        isEmailVerificationEnabled(consoleVariables)
-    ) {
-        const isVerifyEmailPage = url.pathname === resolve('/verify-email');
-
-        if (!isVerifyEmailPage) {
+    ]).catch((error) => {
+        if (error instanceof AppwriteException && isEmailVerificationRequiredError(error.type)) {
             redirect(303, resolve('/verify-email'));
         }
-    }
+
+        throw error;
+    });
+
+    const consoleVariables = normalizeConsoleVariables(rawConsoleVariables);
 
     let fallbackPlansInfoArray = plansInfo;
     if (!fallbackPlansInfoArray) {
@@ -81,6 +74,10 @@ export const load: LayoutLoad = async ({ depends, parent, url }) => {
                 })
             ).total;
         } catch (e) {
+            if (e instanceof AppwriteException && isEmailVerificationRequiredError(e.type)) {
+                redirect(303, resolve('/verify-email'));
+            }
+
             projectsCount = 0;
         }
     }

src/routes/+layout.ts

@@ -8,12 +8,13 @@ import type { LayoutLoad } from './$types';
 import { redirectTo } from './store';
 import { resolve } from '$app/paths';
 import type { Account } from '$lib/stores/user';
-import { type AppwriteException, Platform } from '@appwrite.io/console';
+import { AppwriteException, Platform } from '@appwrite.io/console';
 import { isCloud } from '$lib/system';
 import { checkPricingRefAndRedirect } from '$lib/helpers/pricingRedirect';
 import { getTeamOrOrganizationList } from '$lib/stores/organization';
 import { makePlansMap } from '$lib/helpers/billing';
 import { plansInfo as plansInfoStore } from '$lib/stores/billing';
+import { isEmailVerificationRequiredError } from '$lib/helpers/emailVerification';
 
 export const ssr = false;
 
@@ -32,14 +33,33 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
     }
 
     if (account) {
-        const plansInfo = await getPlatformPlans();
-        plansInfoStore.set(plansInfo);
-
-        return {
-            plansInfo,
-            account: account,
-            organizations: await getTeamOrOrganizationList()
-        };
+        try {
+            const [plansInfo, organizations] = await Promise.all([
+                getPlatformPlans(),
+                getTeamOrOrganizationList()
+            ]);
+
+            plansInfoStore.set(plansInfo);
+
+            return {
+                plansInfo,
+                account: account,
+                organizations
+            };
+        } catch (error) {
+            if (
+                error instanceof AppwriteException &&
+                isEmailVerificationRequiredError(error.type)
+            ) {
+                const verifyEmailUrl = resolve('/verify-email');
+
+                if (url.pathname !== verifyEmailUrl) {
+                    redirect(303, withParams(verifyEmailUrl, url.searchParams));
+                }
+            }
+
+            throw error;
+        }
     }
 
     const isPublicRoute = route.id?.startsWith('/(public)');
@@ -57,6 +77,14 @@ export const load: LayoutLoad = async ({ depends, url, route }) => {
         redirect(303, withParams(mfaUrl, url.searchParams));
     }
 
+    if (isEmailVerificationRequiredError(error.type)) {
+        const verifyEmailUrl = resolve('/verify-email');
+
+        if (url.pathname !== verifyEmailUrl) {
+            redirect(303, withParams(verifyEmailUrl, url.searchParams));
+        }
+    }
+
     if (!isPublicRoute) {
         if (isCloud) {
             checkPricingRefAndRedirect(url.searchParams, true);