Skip to content

Commit 6dab360

Browse files
committed
used backend one
1 parent 6f67cbf commit 6dab360

5 files changed

Lines changed: 23 additions & 23 deletions

File tree

bun.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
},
2121
"dependencies": {
2222
"@ai-sdk/svelte": "^1.1.24",
23-
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@d223f36",
23+
"@appwrite.io/console": "https://pkg.vc/-/@appwrite/@appwrite.io/console@467cd21",
2424
"@appwrite.io/pink-icons": "0.25.0",
2525
"@appwrite.io/pink-icons-svelte": "https://pkg.vc/-/@appwrite/@appwrite.io/pink-icons-svelte@bfe7ce3",
2626
"@appwrite.io/pink-legacy": "^1.0.3",
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import type { Models } from '@appwrite.io/console';
2+
3+
export function isEmailVerificationEnabled(
4+
consoleVariables: Models.ConsoleVariables | undefined
5+
): boolean {
6+
if (!consoleVariables) {
7+
return false;
8+
}
9+
10+
return String(consoleVariables._APP_CONSOLE_EMAIL_VERIFICATION) === '1';
11+
}

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,7 @@ import { normalizeConsoleVariables } from '$lib/helpers/domains';
99
import { syncServerTime } from '$lib/helpers/fingerprint';
1010
import { redirect } from '@sveltejs/kit';
1111
import { resolve } from '$app/paths';
12-
13-
function isEmailVerificationEnabledFromBackend(flag: string | undefined): boolean {
14-
if (!flag) return false;
15-
const normalized = flag.toLowerCase();
16-
return normalized === 'enabled' || normalized === 'true' || normalized === '1';
17-
}
12+
import { isEmailVerificationEnabled } from '$lib/helpers/emailVerification';
1813

1914
export const load: LayoutLoad = async ({ depends, parent, url }) => {
2015
const { organizations, plansInfo, account } = await parent();
@@ -50,11 +45,12 @@ export const load: LayoutLoad = async ({ depends, parent, url }) => {
5045

5146
const consoleVariables = normalizeConsoleVariables(rawConsoleVariables);
5247

53-
const emailVerificationEnabled = isEmailVerificationEnabledFromBackend(
54-
consoleVariables._APP_CONSOLE_EMAIL_VERIFICATION
55-
);
56-
57-
if (isCloud && account && !account.emailVerification && emailVerificationEnabled) {
48+
if (
49+
isCloud &&
50+
account &&
51+
!account.emailVerification &&
52+
isEmailVerificationEnabled(consoleVariables)
53+
) {
5854
const isVerifyEmailPage = url.pathname === resolve('/verify-email');
5955

6056
if (!isVerifyEmailPage) {

src/routes/(console)/verify-email/+page.ts

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,12 @@ import type { PageLoad } from './$types';
44
import { Dependencies } from '$lib/constants';
55
import { sdk } from '$lib/stores/sdk';
66
import { addNotification } from '$lib/stores/notifications';
7-
8-
function isEmailVerificationEnabledFromBackend(flag: string | undefined): boolean {
9-
if (!flag) return false;
10-
const normalized = flag.toLowerCase();
11-
return normalized === 'enabled' || normalized === 'true' || normalized === '1';
12-
}
7+
import { isEmailVerificationEnabled } from '$lib/helpers/emailVerification';
138

149
export const load: PageLoad = async ({ parent, depends, url }) => {
1510
const { account, consoleVariables } = await parent();
1611

17-
const emailVerificationEnabled = isEmailVerificationEnabledFromBackend(
18-
consoleVariables?._APP_CONSOLE_EMAIL_VERIFICATION
19-
);
12+
const emailVerificationEnabled = isEmailVerificationEnabled(consoleVariables);
2013

2114
if (!emailVerificationEnabled) {
2215
redirect(303, resolve('/'));

0 commit comments

Comments
 (0)