From e4cb016463bc2d4e165493721e20daf1ffd976f4 Mon Sep 17 00:00:00 2001
From: tglide <26071571+TGlide@users.noreply.github.com>
Date: Wed, 8 Mar 2023 17:22:10 +0000
Subject: [PATCH] refactor: replace sdkForConsole with sdk.forConsole

---
 src/lib/components/avatarInitials.svelte             |  4 ++--
 src/lib/layout/header.svelte                         |  4 ++--
 src/lib/layout/logs.svelte                           |  6 +++---
 src/lib/stores/sdk.ts                                | 12 ------------
 src/routes/+layout.ts                                |  6 +++---
 src/routes/console/+layout.ts                        |  4 ++--
 src/routes/console/account/+page.svelte              |  8 ++++----
 .../console/account/activity/[[page]]/+page.ts       |  4 ++--
 src/routes/console/account/delete.svelte             |  4 ++--
 src/routes/console/account/header.svelte             |  4 ++--
 .../account/organizations/[[page]]/+page.svelte      |  4 ++--
 .../console/account/organizations/[[page]]/+page.ts  |  4 ++--
 .../console/account/sessions/[[page]]/+page.svelte   |  8 ++++----
 .../console/account/sessions/[[page]]/+page.ts       |  4 ++--
 src/routes/console/createOrganization.svelte         |  4 ++--
 src/routes/console/onboarding/+page.svelte           |  6 +++---
 .../console/organization-[organization]/+layout.ts   |  6 +++---
 .../organization-[organization]/[[page]]/+page.ts    |  4 ++--
 .../organization-[organization]/createMember.svelte  |  4 ++--
 .../organization-[organization]/createProject.svelte |  4 ++--
 .../organization-[organization]/deleteMember.svelte  |  6 +++---
 .../deleteOrganization.svelte                        |  4 ++--
 .../members/[[page]]/+page.svelte                    |  4 ++--
 .../members/[[page]]/+page.ts                        |  4 ++--
 .../settings/+page.svelte                            |  4 ++--
 src/routes/console/project-[project]/+layout.svelte  |  4 ++--
 src/routes/console/project-[project]/+layout.ts      |  6 +++---
 .../console/project-[project]/auth/appleOAuth.svelte |  6 +++---
 .../console/project-[project]/auth/auth0OAuth.svelte |  6 +++---
 .../project-[project]/auth/authentikOAuth.svelte     |  6 +++---
 .../project-[project]/auth/gitlabOAuth.svelte        |  6 +++---
 .../console/project-[project]/auth/mainOAuth.svelte  |  6 +++---
 .../project-[project]/auth/microsoftOAuth.svelte     |  6 +++---
 .../console/project-[project]/auth/oktaOAuth.svelte  |  6 +++---
 .../auth/security/updateSessionLength.svelte         |  4 ++--
 .../auth/security/updateSessionsLimit.svelte         |  4 ++--
 .../auth/security/updateUsersLimit.svelte            |  4 ++--
 .../project-[project]/auth/settings/+page.svelte     |  4 ++--
 .../collection-[collection]/+layout.svelte           |  4 ++--
 .../project-[project]/functions/+layout.svelte       |  4 ++--
 .../function-[function]/[[page]]/+page.svelte        |  4 ++--
 .../executions/[[page]]/+page.svelte                 |  4 ++--
 .../console/project-[project]/overview/keys/+page.ts |  4 ++--
 .../project-[project]/overview/keys/[key]/+page.ts   |  4 ++--
 .../keys/[key]/+page@project-[project].svelte        |  6 +++---
 .../overview/keys/[key]/delete.svelte                |  4 ++--
 .../overview/keys/[key]/updateExpirationDate.svelte  |  4 ++--
 .../project-[project]/overview/keys/wizard.svelte    |  4 ++--
 .../project-[project]/overview/platforms/+page.ts    |  4 ++--
 .../overview/platforms/[platform]/+page.ts           |  4 ++--
 .../[platform]/+page@project-[project].svelte        |  4 ++--
 .../overview/platforms/[platform]/android.svelte     |  4 ++--
 .../overview/platforms/[platform]/appleIOS.svelte    |  4 ++--
 .../overview/platforms/[platform]/appleMacOS.svelte  |  4 ++--
 .../overview/platforms/[platform]/appleTvOS.svelte   |  4 ++--
 .../platforms/[platform]/appleWatchOS.svelte         |  4 ++--
 .../overview/platforms/[platform]/delete.svelte      |  4 ++--
 .../platforms/[platform]/flutterAndroid.svelte       |  4 ++--
 .../overview/platforms/[platform]/flutterIOS.svelte  |  4 ++--
 .../platforms/[platform]/flutterLinux.svelte         |  4 ++--
 .../platforms/[platform]/flutterMacOS.svelte         |  4 ++--
 .../platforms/[platform]/flutterWindows.svelte       |  4 ++--
 .../overview/platforms/[platform]/web.svelte         |  4 ++--
 .../overview/platforms/wizard/android/step1.svelte   |  6 +++---
 .../overview/platforms/wizard/apple/step1.svelte     |  6 +++---
 .../overview/platforms/wizard/flutter/step1.svelte   |  6 +++---
 .../overview/platforms/wizard/store.ts               |  4 ++--
 .../overview/platforms/wizard/web/step1.svelte       |  6 +++---
 .../console/project-[project]/overview/store.ts      |  4 ++--
 .../console/project-[project]/settings/+page.svelte  |  8 ++++----
 .../project-[project]/settings/deleteProject.svelte  |  4 ++--
 .../settings/domains/[[page]]/+page.svelte           |  4 ++--
 .../settings/domains/[[page]]/+page.ts               |  4 ++--
 .../project-[project]/settings/domains/delete.svelte |  4 ++--
 .../settings/domains/wizard/step1.svelte             |  6 +++---
 .../settings/domains/wizard/step4.svelte             |  4 ++--
 .../settings/domains/wizard/verificationBox.svelte   |  4 ++--
 .../project-[project]/settings/webhooks/+page.ts     |  4 ++--
 .../settings/webhooks/[webhook]/+layout.ts           |  4 ++--
 .../settings/webhooks/[webhook]/delete.svelte        |  4 ++--
 .../settings/webhooks/[webhook]/regenerate.svelte    |  4 ++--
 .../settings/webhooks/[webhook]/updateEvents.svelte  |  4 ++--
 .../settings/webhooks/[webhook]/updateName.svelte    |  4 ++--
 .../webhooks/[webhook]/updateSecurity.svelte         |  4 ++--
 .../settings/webhooks/[webhook]/updateURL.svelte     |  4 ++--
 .../settings/webhooks/createWebhook.svelte           |  4 ++--
 src/routes/invite/+page.svelte                       |  4 ++--
 src/routes/login/+page.svelte                        |  4 ++--
 src/routes/recover/+page.svelte                      |  6 +++---
 src/routes/register/+page.svelte                     |  6 +++---
 src/routes/register/invite/[slug]/+page.svelte       |  8 ++++----
 91 files changed, 209 insertions(+), 221 deletions(-)

diff --git a/src/lib/components/avatarInitials.svelte b/src/lib/components/avatarInitials.svelte
index 5e8a25372..025dd998c 100644
--- a/src/lib/components/avatarInitials.svelte
+++ b/src/lib/components/avatarInitials.svelte
@@ -1,11 +1,11 @@
 <script lang="ts">
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import Avatar from './avatar.svelte';
 
     export let name: string;
     export let size: number;
 
-    $: src = sdkForConsole.avatars.getInitials(name, size * 2, size * 2).toString();
+    $: src = sdk.forConsole.avatars.getInitials(name, size * 2, size * 2).toString();
 </script>
 
 <Avatar {name} {size} {src} />
diff --git a/src/lib/layout/header.svelte b/src/lib/layout/header.svelte
index d0041ca89..0cc8abfdd 100644
--- a/src/lib/layout/header.svelte
+++ b/src/lib/layout/header.svelte
@@ -20,7 +20,7 @@
     import { slide } from 'svelte/transition';
     import { page } from '$app/stores';
     import { Submit, trackEvent } from '$lib/actions/analytics';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { goto } from '$app/navigation';
 
     let showDropdown = false;
@@ -35,7 +35,7 @@
     }
 
     async function logout() {
-        await sdkForConsole.account.deleteSession('current');
+        await sdk.forConsole.account.deleteSession('current');
         trackEvent(Submit.AccountLogout);
         await goto(`${base}/login`);
     }
diff --git a/src/lib/layout/logs.svelte b/src/lib/layout/logs.svelte
index 1799f6905..488316853 100644
--- a/src/lib/layout/logs.svelte
+++ b/src/lib/layout/logs.svelte
@@ -6,7 +6,7 @@
     import { Button } from '$lib/elements/forms';
     import { base } from '$app/paths';
     import { app } from '$lib/stores/app';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { calculateTime } from '$lib/helpers/timeConversion';
     import type { Models } from '@aw-labs/appwrite-console';
@@ -17,7 +17,7 @@
     function isDeployment(data: Models.Deployment | Models.Execution): data is Models.Deployment {
         if ('buildId' in data) {
             selectedTab = 'logs';
-            rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`;
+            rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/deployment/${$log.data.$id}?mode=admin&project=${$page.params.project}`;
             return true;
         }
     }
@@ -25,7 +25,7 @@
     function isExecution(data: Models.Deployment | Models.Execution): data is Models.Execution {
         if ('trigger' in data) {
             selectedTab = 'response';
-            rawData = `${sdkForConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`;
+            rawData = `${sdk.forConsole.client.config.endpoint}/functions/${$log.func.$id}/execution/${$log.data.$id}?mode=admin&project=${$page.params.project}`;
             return true;
         }
     }
diff --git a/src/lib/stores/sdk.ts b/src/lib/stores/sdk.ts
index 4cf860552..8ed0b4696 100644
--- a/src/lib/stores/sdk.ts
+++ b/src/lib/stores/sdk.ts
@@ -19,18 +19,6 @@ const endpoint = VARS.APPWRITE_ENDPOINT ?? `${globalThis?.location?.origin}/v1`;
 const clientConsole = new Client();
 clientConsole.setEndpoint(endpoint).setProject('console');
 
-export const sdkForConsole = {
-    client: clientConsole,
-    account: new Account(clientConsole),
-    avatars: new Avatars(clientConsole),
-    functions: new Functions(clientConsole),
-    health: new Health(clientConsole),
-    locale: new Locale(clientConsole),
-    projects: new Projects(clientConsole),
-    teams: new Teams(clientConsole),
-    users: new Users(clientConsole)
-};
-
 export function sdkForProject() {
     const clientProject = new Client();
     clientProject.setEndpoint(endpoint).setMode('admin');
diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 5288e2300..596e79f15 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -1,7 +1,7 @@
 import '@appwrite.io/pink';
 import '@appwrite.io/pink-icons';
 import 'tippy.js/dist/tippy.css';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { redirect } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
 import type { LayoutLoad } from './$types';
@@ -11,11 +11,11 @@ export const ssr = false;
 export const load: LayoutLoad = async ({ depends, url }) => {
     depends(Dependencies.ACCOUNT);
     try {
-        const account = await sdkForConsole.account.get();
+        const account = await sdk.forConsole.account.get();
 
         return {
             account,
-            organizations: sdkForConsole.teams.list()
+            organizations: sdk.forConsole.teams.list()
         };
     } catch (error) {
         const acceptedRoutes = [
diff --git a/src/routes/console/+layout.ts b/src/routes/console/+layout.ts
index 0d77b07b4..65de11ecd 100644
--- a/src/routes/console/+layout.ts
+++ b/src/routes/console/+layout.ts
@@ -1,8 +1,8 @@
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import type { LayoutLoad } from './$types';
 
 export const load: LayoutLoad = async () => {
-    const response = await fetch(`${sdkForConsole.client.config.endpoint}/health/version`);
+    const response = await fetch(`${sdk.forConsole.client.config.endpoint}/health/version`);
     const data = await response.json();
 
     return {
diff --git a/src/routes/console/account/+page.svelte b/src/routes/console/account/+page.svelte
index 229112c51..66c40a4f2 100644
--- a/src/routes/console/account/+page.svelte
+++ b/src/routes/console/account/+page.svelte
@@ -4,7 +4,7 @@
     import { Container } from '$lib/layout';
     import { onMount } from 'svelte';
     import { user } from '$lib/stores/user';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
     import { base } from '$app/paths';
     import Delete from './delete.svelte';
@@ -26,7 +26,7 @@
 
     async function updateName() {
         try {
-            await sdkForConsole.account.updateName(name);
+            await sdk.forConsole.account.updateName(name);
             invalidate(Dependencies.ACCOUNT);
             addNotification({
                 message: 'Name has been updated',
@@ -43,7 +43,7 @@
     }
     async function updateEmail() {
         try {
-            await sdkForConsole.account.updateEmail(email, emailPassword);
+            await sdk.forConsole.account.updateEmail(email, emailPassword);
             invalidate(Dependencies.ACCOUNT);
             addNotification({
                 message: 'Email has been updated',
@@ -61,7 +61,7 @@
 
     async function updatePassword() {
         try {
-            await sdkForConsole.account.updatePassword(newPassword, oldPassword);
+            await sdk.forConsole.account.updatePassword(newPassword, oldPassword);
             newPassword = oldPassword = null;
             addNotification({
                 message: 'Password has been updated',
diff --git a/src/routes/console/account/activity/[[page]]/+page.ts b/src/routes/console/account/activity/[[page]]/+page.ts
index 0814c74e5..d3fc1b4d0 100644
--- a/src/routes/console/account/activity/[[page]]/+page.ts
+++ b/src/routes/console/account/activity/[[page]]/+page.ts
@@ -1,5 +1,5 @@
 import { Query } from '@aw-labs/appwrite-console';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { pageToOffset } from '$lib/helpers/load';
 import { PAGE_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
@@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params }) => {
 
     return {
         offset,
-        logs: await sdkForConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)])
+        logs: await sdk.forConsole.account.listLogs([Query.offset(offset), Query.limit(PAGE_LIMIT)])
     };
 };
diff --git a/src/routes/console/account/delete.svelte b/src/routes/console/account/delete.svelte
index 7550908ef..ae86006b6 100644
--- a/src/routes/console/account/delete.svelte
+++ b/src/routes/console/account/delete.svelte
@@ -5,13 +5,13 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
 
     export let showDelete = false;
 
     const deleteAccount = async () => {
         try {
-            await sdkForConsole.account.updateStatus();
+            await sdk.forConsole.account.updateStatus();
             showDelete = false;
             invalidate(Dependencies.ACCOUNT);
             addNotification({
diff --git a/src/routes/console/account/header.svelte b/src/routes/console/account/header.svelte
index ae42246da..71d54f3d3 100644
--- a/src/routes/console/account/header.svelte
+++ b/src/routes/console/account/header.svelte
@@ -7,7 +7,7 @@
     import { Button } from '$lib/elements/forms';
     import { isTabSelected } from '$lib/helpers/load';
     import { Cover, CoverTitle } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { user } from '$lib/stores/user';
 
     const path = `/console/account`;
@@ -38,7 +38,7 @@
     ];
 
     async function logout() {
-        await sdkForConsole.account.deleteSession('current');
+        await sdk.forConsole.account.deleteSession('current');
         trackEvent(Submit.AccountLogout);
         await goto(`${base}/login`);
     }
diff --git a/src/routes/console/account/organizations/[[page]]/+page.svelte b/src/routes/console/account/organizations/[[page]]/+page.svelte
index 5b7a3ceec..69ba0d589 100644
--- a/src/routes/console/account/organizations/[[page]]/+page.svelte
+++ b/src/routes/console/account/organizations/[[page]]/+page.svelte
@@ -11,14 +11,14 @@
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import CreateOrganization from '../../../createOrganization.svelte';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { CARD_LIMIT } from '$lib/constants';
     import type { PageData } from './$types';
 
     export let data: PageData;
 
     const getMemberships = async (teamId: string) => {
-        const memberships = await sdkForConsole.teams.listMemberships(teamId);
+        const memberships = await sdk.forConsole.teams.listMemberships(teamId);
         return memberships.memberships.map((team) => team.userName);
     };
 
diff --git a/src/routes/console/account/organizations/[[page]]/+page.ts b/src/routes/console/account/organizations/[[page]]/+page.ts
index 147fcac37..9b602d7b5 100644
--- a/src/routes/console/account/organizations/[[page]]/+page.ts
+++ b/src/routes/console/account/organizations/[[page]]/+page.ts
@@ -1,5 +1,5 @@
 import { Query } from '@aw-labs/appwrite-console';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
@@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => {
 
     return {
         offset,
-        organizations: await sdkForConsole.teams.list([
+        organizations: await sdk.forConsole.teams.list([
             Query.offset(offset),
             Query.limit(CARD_LIMIT),
             Query.orderDesc('$createdAt')
diff --git a/src/routes/console/account/sessions/[[page]]/+page.svelte b/src/routes/console/account/sessions/[[page]]/+page.svelte
index 46666c02d..6fd4e45cf 100644
--- a/src/routes/console/account/sessions/[[page]]/+page.svelte
+++ b/src/routes/console/account/sessions/[[page]]/+page.svelte
@@ -12,7 +12,7 @@
         TableScroll
     } from '$lib/elements/table';
     import { Container } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { goto, invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
     import type { Models } from '@aw-labs/appwrite-console';
@@ -23,11 +23,11 @@
     export let data: PageData;
 
     const getBrowser = (clientCode: string) => {
-        return sdkForConsole.avatars.getBrowser(clientCode, 40, 40);
+        return sdk.forConsole.avatars.getBrowser(clientCode, 40, 40);
     };
 
     const logout = async (session: Models.Session) => {
-        await sdkForConsole.account.deleteSession(session.$id);
+        await sdk.forConsole.account.deleteSession(session.$id);
         trackEvent(Submit.AccountDeleteSession);
         if (session.current) {
             await goto(`${base}/login`);
@@ -35,7 +35,7 @@
         invalidate(Dependencies.ACCOUNT_SESSIONS);
     };
     const logoutAll = async () => {
-        await sdkForConsole.account.deleteSessions();
+        await sdk.forConsole.account.deleteSessions();
         trackEvent(Submit.AccountDeleteAllSessions);
         await goto(`${base}/login`);
         invalidate(Dependencies.ACCOUNT_SESSIONS);
diff --git a/src/routes/console/account/sessions/[[page]]/+page.ts b/src/routes/console/account/sessions/[[page]]/+page.ts
index 49ecca7cc..6165d5472 100644
--- a/src/routes/console/account/sessions/[[page]]/+page.ts
+++ b/src/routes/console/account/sessions/[[page]]/+page.ts
@@ -1,11 +1,11 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ depends }) => {
     depends(Dependencies.ACCOUNT_SESSIONS);
 
     return {
-        sessions: await sdkForConsole.account.listSessions()
+        sessions: await sdk.forConsole.account.listSessions()
     };
 };
diff --git a/src/routes/console/createOrganization.svelte b/src/routes/console/createOrganization.svelte
index 64d4abaff..3e72de421 100644
--- a/src/routes/console/createOrganization.svelte
+++ b/src/routes/console/createOrganization.svelte
@@ -3,7 +3,7 @@
     import { Pill } from '$lib/elements';
     import { InputText, Button, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
     import { goto, invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
@@ -21,7 +21,7 @@
 
     const create = async () => {
         try {
-            const org = await sdkForConsole.teams.create(id ?? ID.unique(), name);
+            const org = await sdk.forConsole.teams.create(id ?? ID.unique(), name);
             await invalidate(Dependencies.ACCOUNT);
             dispatch('created');
             await goto(`/console/organization-${org.$id}`);
diff --git a/src/routes/console/onboarding/+page.svelte b/src/routes/console/onboarding/+page.svelte
index e34074b71..be0fe4dcb 100644
--- a/src/routes/console/onboarding/+page.svelte
+++ b/src/routes/console/onboarding/+page.svelte
@@ -9,7 +9,7 @@
     import FormList from '$lib/elements/forms/formList.svelte';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { ID } from '@aw-labs/appwrite-console';
 
     let name: string;
@@ -21,7 +21,7 @@
         try {
             loading = true;
             const org = await createOrganization();
-            const project = await sdkForConsole.projects.create(
+            const project = await sdk.forConsole.projects.create(
                 id ?? ID.unique(),
                 name,
                 org.$id,
@@ -44,7 +44,7 @@
     }
 
     async function createOrganization() {
-        return await sdkForConsole.teams.create(ID.unique(), 'Personal Projects');
+        return await sdk.forConsole.teams.create(ID.unique(), 'Personal Projects');
     }
 </script>
 
diff --git a/src/routes/console/organization-[organization]/+layout.ts b/src/routes/console/organization-[organization]/+layout.ts
index a4ea6fa42..7d0fbf647 100644
--- a/src/routes/console/organization-[organization]/+layout.ts
+++ b/src/routes/console/organization-[organization]/+layout.ts
@@ -1,6 +1,6 @@
 import Header from './header.svelte';
 import Breadcrumbs from './breadcrumbs.svelte';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import type { LayoutLoad } from './$types';
 import { error } from '@sveltejs/kit';
 import { Dependencies } from '$lib/constants';
@@ -12,8 +12,8 @@ export const load: LayoutLoad = async ({ params, parent, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            organization: await sdkForConsole.teams.get(params.organization),
-            members: await sdkForConsole.teams.listMemberships(params.organization)
+            organization: await sdk.forConsole.teams.get(params.organization),
+            members: await sdk.forConsole.teams.listMemberships(params.organization)
         };
     } catch (e) {
         localStorage.removeItem('organization');
diff --git a/src/routes/console/organization-[organization]/[[page]]/+page.ts b/src/routes/console/organization-[organization]/[[page]]/+page.ts
index fc08ffaeb..d7cbd284d 100644
--- a/src/routes/console/organization-[organization]/[[page]]/+page.ts
+++ b/src/routes/console/organization-[organization]/[[page]]/+page.ts
@@ -1,5 +1,5 @@
 import { Query } from '@aw-labs/appwrite-console';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { pageToOffset } from '$lib/helpers/load';
 import { CARD_LIMIT } from '$lib/constants';
 import type { PageLoad } from './$types';
@@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params }) => {
 
     return {
         offset,
-        projects: await sdkForConsole.projects.list([
+        projects: await sdk.forConsole.projects.list([
             Query.offset(offset),
             Query.limit(CARD_LIMIT),
             Query.equal('teamId', params.organization),
diff --git a/src/routes/console/organization-[organization]/createMember.svelte b/src/routes/console/organization-[organization]/createMember.svelte
index a3bbec3ce..0359d2bcc 100644
--- a/src/routes/console/organization-[organization]/createMember.svelte
+++ b/src/routes/console/organization-[organization]/createMember.svelte
@@ -3,7 +3,7 @@
     import { Modal } from '$lib/components';
     import { InputText, InputEmail, Button, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { createEventDispatcher } from 'svelte';
     import { organization } from '$lib/stores/organization';
     import { invalidate } from '$app/navigation';
@@ -19,7 +19,7 @@
 
     const create = async () => {
         try {
-            const team = await sdkForConsole.teams.createMembership(
+            const team = await sdk.forConsole.teams.createMembership(
                 $organization.$id,
                 email,
                 ['owner'],
diff --git a/src/routes/console/organization-[organization]/createProject.svelte b/src/routes/console/organization-[organization]/createProject.svelte
index 58b53eded..7314cb430 100644
--- a/src/routes/console/organization-[organization]/createProject.svelte
+++ b/src/routes/console/organization-[organization]/createProject.svelte
@@ -5,7 +5,7 @@
     import { Pill } from '$lib/elements';
     import { InputText, Button, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { ID } from '@aw-labs/appwrite-console';
     import { createEventDispatcher } from 'svelte';
 
@@ -23,7 +23,7 @@
     async function create() {
         try {
             isCreating = true;
-            const project = await sdkForConsole.projects.create(
+            const project = await sdk.forConsole.projects.create(
                 id ?? ID.unique(),
                 name,
                 teamId,
diff --git a/src/routes/console/organization-[organization]/deleteMember.svelte b/src/routes/console/organization-[organization]/deleteMember.svelte
index 86813b12b..fb596d656 100644
--- a/src/routes/console/organization-[organization]/deleteMember.svelte
+++ b/src/routes/console/organization-[organization]/deleteMember.svelte
@@ -4,7 +4,7 @@
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Models } from '@aw-labs/appwrite-console';
     import { createEventDispatcher } from 'svelte';
     import { user } from '$lib/stores/user';
@@ -17,10 +17,10 @@
 
     const deleteMembership = async () => {
         try {
-            await sdkForConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id);
+            await sdk.forConsole.teams.deleteMembership(selectedMember.teamId, selectedMember.$id);
 
             if (isUser) {
-                await sdkForConsole.account.deleteSession('current');
+                await sdk.forConsole.account.deleteSession('current');
                 await goto(`${base}/login`);
             } else {
                 dispatch('deleted');
diff --git a/src/routes/console/organization-[organization]/deleteOrganization.svelte b/src/routes/console/organization-[organization]/deleteOrganization.svelte
index 81b7638a8..62bc28d63 100644
--- a/src/routes/console/organization-[organization]/deleteOrganization.svelte
+++ b/src/routes/console/organization-[organization]/deleteOrganization.svelte
@@ -2,7 +2,7 @@
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { organization, organizationList } from '$lib/stores/organization';
     import { goto, invalidate } from '$app/navigation';
     import { base } from '$app/paths';
@@ -13,7 +13,7 @@
 
     const deleteOrg = async () => {
         try {
-            await sdkForConsole.teams.delete($organization.$id);
+            await sdk.forConsole.teams.delete($organization.$id);
             addNotification({
                 type: 'success',
                 message: `${$organization.name} has been deleted`
diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
index 231a553fc..da3f38381 100644
--- a/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
+++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.svelte
@@ -13,7 +13,7 @@
     import { Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import { organization, members, newMemberModal } from '$lib/stores/organization';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
@@ -32,7 +32,7 @@
     const deleted = () => invalidate(Dependencies.ACCOUNT);
     const resend = async (member: Models.Membership) => {
         try {
-            await sdkForConsole.teams.createMembership(
+            await sdk.forConsole.teams.createMembership(
                 $organization.$id,
                 member.userEmail,
                 member.roles,
diff --git a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts
index d611210d7..1fccd6469 100644
--- a/src/routes/console/organization-[organization]/members/[[page]]/+page.ts
+++ b/src/routes/console/organization-[organization]/members/[[page]]/+page.ts
@@ -1,6 +1,6 @@
 import { PAGE_LIMIT } from '$lib/constants';
 import { pageToOffset } from '$lib/helpers/load';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { Query } from '@aw-labs/appwrite-console';
 import type { PageLoad } from './$types';
 
@@ -10,7 +10,7 @@ export const load: PageLoad = async ({ params, parent }) => {
 
     return {
         offset,
-        organizationMembers: await sdkForConsole.teams.listMemberships(params.organization, [
+        organizationMembers: await sdk.forConsole.teams.listMemberships(params.organization, [
             Query.limit(PAGE_LIMIT),
             Query.offset(offset)
         ])
diff --git a/src/routes/console/organization-[organization]/settings/+page.svelte b/src/routes/console/organization-[organization]/settings/+page.svelte
index ff8f54e84..5863ddeb0 100644
--- a/src/routes/console/organization-[organization]/settings/+page.svelte
+++ b/src/routes/console/organization-[organization]/settings/+page.svelte
@@ -3,7 +3,7 @@
     import { InputText, Form, Button } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { members, organization } from '$lib/stores/organization';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
@@ -20,7 +20,7 @@
 
     async function updateName() {
         try {
-            await sdkForConsole.teams.update($organization.$id, name);
+            await sdk.forConsole.teams.update($organization.$id, name);
             await invalidate(Dependencies.ORGANIZATION);
             addNotification({
                 message: 'Name has been updated',
diff --git a/src/routes/console/project-[project]/+layout.svelte b/src/routes/console/project-[project]/+layout.svelte
index b8c9f66fa..eb2816695 100644
--- a/src/routes/console/project-[project]/+layout.svelte
+++ b/src/routes/console/project-[project]/+layout.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { UploadBox } from '$lib/components';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onDestroy, onMount } from 'svelte';
     import { stats } from './store';
 
     let unsubscribe: { (): void };
 
     onMount(() => {
-        unsubscribe = sdkForConsole.client.subscribe(['project', 'console'], (response) => {
+        unsubscribe = sdk.forConsole.client.subscribe(['project', 'console'], (response) => {
             if (response.events.includes('stats.connections')) {
                 for (const [projectId, value] of Object.entries(response.payload)) {
                     stats.add(projectId, [new Date(response.timestamp).toISOString(), value]);
diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts
index fe783b0e1..f2747454a 100644
--- a/src/routes/console/project-[project]/+layout.ts
+++ b/src/routes/console/project-[project]/+layout.ts
@@ -1,5 +1,5 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { error } from '@sveltejs/kit';
 import type { LayoutLoad } from './$types';
 
@@ -7,13 +7,13 @@ export const load: LayoutLoad = async ({ params, depends }) => {
     depends(Dependencies.PROJECT);
 
     try {
-        const project = await sdkForConsole.projects.get(params.project);
+        const project = await sdk.forConsole.projects.get(params.project);
         localStorage.setItem('project', project.$id);
         localStorage.setItem('organization', project.teamId);
 
         return {
             project,
-            organization: await sdkForConsole.teams.get(project.teamId)
+            organization: await sdk.forConsole.teams.get(project.teamId)
         };
     } catch (e) {
         throw error(e.code, e.message);
diff --git a/src/routes/console/project-[project]/auth/appleOAuth.svelte b/src/routes/console/project-[project]/auth/appleOAuth.svelte
index bf209efb4..32caf84bb 100644
--- a/src/routes/console/project-[project]/auth/appleOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/appleOAuth.svelte
@@ -3,7 +3,7 @@
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputText, InputTextarea, InputSwitch, FormList } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { onMount } from 'svelte';
     import { invalidate } from '$app/navigation';
@@ -29,7 +29,7 @@
     const projectId = $page.params.project;
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -84,7 +84,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/auth0OAuth.svelte b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
index 7dbd4eb42..7a3f40eb1 100644
--- a/src/routes/console/project-[project]/auth/auth0OAuth.svelte
+++ b/src/routes/console/project-[project]/auth/auth0OAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -27,7 +27,7 @@
     const projectId = $page.params.project;
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -93,7 +93,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/authentikOAuth.svelte b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
index 2dd2734a6..e8bae4fd3 100644
--- a/src/routes/console/project-[project]/auth/authentikOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/authentikOAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -27,7 +27,7 @@
     const projectId = $page.params.project;
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -93,7 +93,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
index 77b9659b6..d6000f2e5 100644
--- a/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/gitlabOAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -27,7 +27,7 @@
     const projectId = $page.params.project;
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -91,7 +91,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/mainOAuth.svelte b/src/routes/console/project-[project]/auth/mainOAuth.svelte
index 1e4ac55ef..624109426 100644
--- a/src/routes/console/project-[project]/auth/mainOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/mainOAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -28,7 +28,7 @@
 
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -84,7 +84,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
index 2958702e3..29083d997 100644
--- a/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/microsoftOAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -28,7 +28,7 @@
 
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -93,7 +93,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/oktaOAuth.svelte b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
index ed33f176d..8cf32f239 100644
--- a/src/routes/console/project-[project]/auth/oktaOAuth.svelte
+++ b/src/routes/console/project-[project]/auth/oktaOAuth.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { Modal, CopyInput, Alert } from '$lib/components';
     import { Button, InputPassword, InputText, InputSwitch, FormList } from '$lib/elements/forms';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import type { Provider } from '$lib/stores/oauth-providers';
     import { addNotification } from '$lib/stores/notifications';
     import { onMount } from 'svelte';
@@ -31,7 +31,7 @@
 
     const update = async () => {
         try {
-            await sdkForConsole.projects.updateOAuth2(
+            await sdk.forConsole.projects.updateOAuth2(
                 projectId,
                 provider.name.toLowerCase(),
                 appId,
@@ -103,7 +103,7 @@
             <p>URI</p>
             <CopyInput
                 value={`${
-                    sdkForConsole.client.config.endpoint
+                    sdk.forConsole.client.config.endpoint
                 }/account/sessions/oauth2/callback/${provider.name.toLocaleLowerCase()}/${projectId}`} />
         </div>
     </FormList>
diff --git a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte
index 53bfbd60c..053fc4fea 100644
--- a/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte
+++ b/src/routes/console/project-[project]/auth/security/updateSessionLength.svelte
@@ -6,7 +6,7 @@
     import { Button, InputNumber, InputSelect } from '$lib/elements/forms';
     import { createTimeUnitPair } from '$lib/helpers/unit';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
 
     const projectId = $project.$id;
@@ -15,7 +15,7 @@
 
     async function updateSessionLength() {
         try {
-            await sdkForConsole.projects.updateAuthDuration(projectId, $baseValue);
+            await sdk.forConsole.projects.updateAuthDuration(projectId, $baseValue);
             invalidate(Dependencies.PROJECT);
 
             addNotification({
diff --git a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte
index df67b07b6..720316b92 100644
--- a/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte
+++ b/src/routes/console/project-[project]/auth/security/updateSessionsLimit.svelte
@@ -3,7 +3,7 @@
     import { CardGrid, Heading } from '$lib/components';
     import { Button, Form, InputNumber } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
 
     const projectId = $project.$id;
@@ -12,7 +12,7 @@
 
     async function updateSessionsLimit() {
         try {
-            await sdkForConsole.projects.updateAuthSessionsLimit(projectId, maxSessions);
+            await sdk.forConsole.projects.updateAuthSessionsLimit(projectId, maxSessions);
 
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
index 7a812159b..3e0dade55 100644
--- a/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
+++ b/src/routes/console/project-[project]/auth/security/updateUsersLimit.svelte
@@ -7,7 +7,7 @@
     import { Button } from '$lib/elements/forms';
     import { clickOnEnter } from '$lib/helpers/a11y';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
 
     const projectId = $project.$id;
@@ -31,7 +31,7 @@
     async function updateLimit() {
         submitting = true;
         try {
-            await sdkForConsole.projects.updateAuthLimit(projectId, isLimited ? newLimit : 0);
+            await sdk.forConsole.projects.updateAuthLimit(projectId, isLimited ? newLimit : 0);
             invalidate(Dependencies.PROJECT).then(() => (submitting = false));
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/project-[project]/auth/settings/+page.svelte b/src/routes/console/project-[project]/auth/settings/+page.svelte
index 83d1909e5..c40d7934e 100644
--- a/src/routes/console/project-[project]/auth/settings/+page.svelte
+++ b/src/routes/console/project-[project]/auth/settings/+page.svelte
@@ -4,7 +4,7 @@
     import { InputSwitch } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../store';
     import { authMethods, type AuthMethod } from '$lib/stores/auth-methods';
     import { OAuthProviders } from '$lib/stores/oauth-providers';
@@ -22,7 +22,7 @@
 
     async function authUpdate(box: AuthMethod) {
         try {
-            await sdkForConsole.projects.updateAuthStatus(projectId, box.method, box.value);
+            await sdk.forConsole.projects.updateAuthStatus(projectId, box.method, box.value);
             addNotification({
                 type: 'success',
                 message: `${box.label} authentication has been ${
diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
index a3c6b6dad..e8c0d8ccc 100644
--- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
+++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/+layout.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onDestroy, onMount } from 'svelte';
     import { collection } from './store';
 
     let unsubscribe: { (): void };
 
     onMount(() => {
-        unsubscribe = sdkForConsole.client.subscribe('console', (response) => {
+        unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
             if (
                 response.events.includes('databases.*.collections.*.attributes.*') ||
                 response.events.includes('databases.*.collections.*.indexes.*')
diff --git a/src/routes/console/project-[project]/functions/+layout.svelte b/src/routes/console/project-[project]/functions/+layout.svelte
index 9e7bd217a..268f2cfc0 100644
--- a/src/routes/console/project-[project]/functions/+layout.svelte
+++ b/src/routes/console/project-[project]/functions/+layout.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
     import { onDestroy, onMount } from 'svelte';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Dependencies } from '$lib/constants';
     import { invalidate } from '$app/navigation';
 
     let unsubscribe: { (): void };
 
     onMount(() => {
-        unsubscribe = sdkForConsole.client.subscribe('console', (response) => {
+        unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
             if (response.events.includes('functions.*.deployments.*')) {
                 invalidate(Dependencies.DEPLOYMENTS);
             }
diff --git a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
index 32091a050..fae9832b9 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/[[page]]/+page.svelte
@@ -35,7 +35,7 @@
     import Create from '../create.svelte';
     import Activate from '../activate.svelte';
     import { browser } from '$app/environment';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import Output from '$lib/components/output.svelte';
     import { calculateTime } from '$lib/helpers/timeConversion';
@@ -57,7 +57,7 @@
     $: activeDeployment = data.deployments.deployments.find((d) => d.$id === $func?.deployment);
 
     if (browser) {
-        sdkForConsole.client.subscribe<Models.Deployment>('console', (message) => {
+        sdk.forConsole.client.subscribe<Models.Deployment>('console', (message) => {
             if (message.events.includes('functions.*.deployments.*.create')) {
                 invalidate(Dependencies.DEPLOYMENTS);
 
diff --git a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
index a75e0e58b..6267e7c2e 100644
--- a/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/functions/function-[function]/executions/[[page]]/+page.svelte
@@ -18,7 +18,7 @@
     import { calculateTime } from '$lib/helpers/timeConversion';
     import { Container } from '$lib/layout';
     import { log } from '$lib/stores/logs';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onDestroy, onMount } from 'svelte';
     import { func } from '../../store';
     import CreateDeployment from '../../create.svelte';
@@ -31,7 +31,7 @@
     let unsubscribe: { (): void };
 
     onMount(() => {
-        unsubscribe = sdkForConsole.client.subscribe('console', (response) => {
+        unsubscribe = sdk.forConsole.client.subscribe('console', (response) => {
             if (response.events.includes('functions.*.executions.*')) {
                 invalidate(Dependencies.EXECUTIONS);
             }
diff --git a/src/routes/console/project-[project]/overview/keys/+page.ts b/src/routes/console/project-[project]/overview/keys/+page.ts
index 9817e5fd1..160a52560 100644
--- a/src/routes/console/project-[project]/overview/keys/+page.ts
+++ b/src/routes/console/project-[project]/overview/keys/+page.ts
@@ -1,5 +1,5 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { selectedTab } from '../store';
 import type { PageLoad } from './$types';
 
@@ -8,6 +8,6 @@ selectedTab.set('keys');
 export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.KEYS);
     return {
-        keys: await sdkForConsole.projects.listKeys(params.project)
+        keys: await sdk.forConsole.projects.listKeys(params.project)
     };
 };
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts
index 3fbb6f07a..1c8f8a44d 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page.ts
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page.ts
@@ -1,13 +1,13 @@
 import Header from './header.svelte';
 import Breadcrumbs from './breadcrumbs.svelte';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.KEY);
 
-    const key = await sdkForConsole.projects.getKey(params.project, params.key);
+    const key = await sdk.forConsole.projects.getKey(params.project, params.key);
     if (key.expire) {
         key.expire = new Date(key.expire).toISOString().slice(0, 23);
     }
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
index 41249633e..9999cc644 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/+page@project-[project].svelte
@@ -8,7 +8,7 @@
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import Scopes from '../scopes.svelte';
@@ -29,7 +29,7 @@
 
     async function updateName() {
         try {
-            await sdkForConsole.projects.updateKey(
+            await sdk.forConsole.projects.updateKey(
                 $project.$id,
                 $key.$id,
                 name,
@@ -53,7 +53,7 @@
 
     async function updateScopes() {
         try {
-            await sdkForConsole.projects.updateKey(
+            await sdk.forConsole.projects.updateKey(
                 $project.$id,
                 $key.$id,
                 $key.name,
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte b/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte
index f8f4f87d5..dd6b0c262 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/delete.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../../store';
     import { key } from './store';
 
@@ -14,7 +14,7 @@
 
     async function handleDelete() {
         try {
-            await sdkForConsole.projects.deleteKey($project.$id, $key.$id);
+            await sdk.forConsole.projects.deleteKey($project.$id, $key.$id);
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
index 5fde24cf2..a48e80c8e 100644
--- a/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
+++ b/src/routes/console/project-[project]/overview/keys/[key]/updateExpirationDate.svelte
@@ -6,7 +6,7 @@
     import { Button, Form, FormList } from '$lib/elements/forms';
     import { diffDays } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../../store';
     import ExpirationInput from '../expirationInput.svelte';
     import { key } from './store';
@@ -15,7 +15,7 @@
 
     async function updateExpire() {
         try {
-            await sdkForConsole.projects.updateKey(
+            await sdk.forConsole.projects.updateKey(
                 $project.$id,
                 $key.$id,
                 $key.name,
diff --git a/src/routes/console/project-[project]/overview/keys/wizard.svelte b/src/routes/console/project-[project]/overview/keys/wizard.svelte
index 0c5cde264..a1e41169d 100644
--- a/src/routes/console/project-[project]/overview/keys/wizard.svelte
+++ b/src/routes/console/project-[project]/overview/keys/wizard.svelte
@@ -6,7 +6,7 @@
     import Step1 from './wizard/step1.svelte';
     import Step2 from './wizard/step2.svelte';
     import { key } from './wizard/store';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import { addNotification } from '$lib/stores/notifications';
     import { onDestroy } from 'svelte';
@@ -16,7 +16,7 @@
 
     async function onFinish() {
         try {
-            const { $id } = await sdkForConsole.projects.createKey(
+            const { $id } = await sdk.forConsole.projects.createKey(
                 $page.params.project,
                 $key.name,
                 $key.scopes,
diff --git a/src/routes/console/project-[project]/overview/platforms/+page.ts b/src/routes/console/project-[project]/overview/platforms/+page.ts
index a6dfc42a6..5ef5a94ed 100644
--- a/src/routes/console/project-[project]/overview/platforms/+page.ts
+++ b/src/routes/console/project-[project]/overview/platforms/+page.ts
@@ -1,5 +1,5 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { selectedTab } from '../store';
 import type { PageLoad } from './$types';
 
@@ -8,6 +8,6 @@ selectedTab.set('platforms');
 export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.PLATFORMS);
     return {
-        platforms: await sdkForConsole.projects.listPlatforms(params.project)
+        platforms: await sdk.forConsole.projects.listPlatforms(params.project)
     };
 };
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts
index c962b9fa7..f102df440 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page.ts
@@ -1,6 +1,6 @@
 import Header from './header.svelte';
 import Breadcrumbs from './breadcrumbs.svelte';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants';
 import type { PageLoad } from './$types';
 
@@ -10,6 +10,6 @@ export const load: PageLoad = async ({ params, depends }) => {
     return {
         header: Header,
         breadcrumbs: Breadcrumbs,
-        platform: await sdkForConsole.projects.getPlatform(params.project, params.platform)
+        platform: await sdk.forConsole.projects.getPlatform(params.project, params.platform)
     };
 };
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
index 6dc0f1a81..0161dda1b 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/+page@project-[project].svelte
@@ -15,7 +15,7 @@
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount, SvelteComponent } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -47,7 +47,7 @@
     async function updateName() {
         updating = true;
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
index 839b14719..94f62e859 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
index a18bb649d..a4771f24f 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleIOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
index e8f26a1fc..1fb5dcd94 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleMacOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
index e4ad66ed7..59f25247c 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleTvOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
index 4d9128828..b68c6cab6 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/appleWatchOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte
index 4258b259a..6cd85abde 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/delete.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../../store';
     import { platform } from './store';
 
@@ -14,7 +14,7 @@
 
     const handleDelete = async () => {
         try {
-            await sdkForConsole.projects.deletePlatform($project.$id, $platform.$id);
+            await sdk.forConsole.projects.deletePlatform($project.$id, $platform.$id);
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
index 330ed7ff6..102ef619f 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterAndroid.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
index 05e1f3158..8de62fb0e 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterIOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
index a01185741..62e9f94f8 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterLinux.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
index adf40e11c..a57ecea2b 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterMacOS.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
index 60bda7c77..3aeeff050 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/flutterWindows.svelte
@@ -5,7 +5,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -18,7 +18,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
index 8b5ca23f0..e5d520f65 100644
--- a/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/[platform]/web.svelte
@@ -4,7 +4,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { project } from '../../../store';
     import { platform } from './store';
@@ -17,7 +17,7 @@
 
     const updateHostname = async () => {
         try {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 $project.$id,
                 $platform.$id,
                 $platform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte
index e1f0543c2..d67b0d872 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte
@@ -2,7 +2,7 @@
     import { page } from '$app/stores';
     import { FormList, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { createPlatform } from '../store';
     import { wizard } from '$lib/stores/wizard';
     import { app } from '$lib/stores/app';
@@ -16,7 +16,7 @@
 
     async function beforeSubmit() {
         if ($createPlatform.$id) {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 projectId,
                 $createPlatform.$id,
                 $createPlatform.name,
@@ -28,7 +28,7 @@
             return;
         }
 
-        const platform = await sdkForConsole.projects.createPlatform(
+        const platform = await sdk.forConsole.projects.createPlatform(
             projectId,
             'android',
             $createPlatform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte
index 782c39118..7ac5c285b 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte
@@ -3,7 +3,7 @@
     import { Pill } from '$lib/elements';
     import { FormItem, FormList, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { createPlatform } from '../store';
     import { wizard } from '$lib/stores/wizard';
     import { app } from '$lib/stores/app';
@@ -26,10 +26,10 @@
 
     async function beforeSubmit() {
         if ($createPlatform.$id) {
-            await sdkForConsole.projects.deletePlatform(projectId, $createPlatform.$id);
+            await sdk.forConsole.projects.deletePlatform(projectId, $createPlatform.$id);
         }
 
-        const response = await sdkForConsole.projects.createPlatform(
+        const response = await sdk.forConsole.projects.createPlatform(
             projectId,
             platform,
             $createPlatform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte
index 6188484e5..ca0c62f7e 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte
@@ -3,7 +3,7 @@
     import { Pill } from '$lib/elements';
     import { FormList, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { createPlatform } from '../store';
     import { wizard } from '$lib/stores/wizard';
     import { app } from '$lib/stores/app';
@@ -87,10 +87,10 @@
 
     async function beforeSubmit() {
         if ($createPlatform.$id) {
-            await sdkForConsole.projects.deletePlatform(projectId, $createPlatform.$id);
+            await sdk.forConsole.projects.deletePlatform(projectId, $createPlatform.$id);
         }
 
-        const response = await sdkForConsole.projects.createPlatform(
+        const response = await sdk.forConsole.projects.createPlatform(
             projectId,
             platform,
             $createPlatform.name,
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
index 2195bab1d..229b48459 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/store.ts
@@ -1,5 +1,5 @@
 import { writable } from 'svelte/store';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import { cachedStore } from '$lib/helpers/cache';
 import type { Models } from '@aw-labs/appwrite-console';
 
@@ -56,7 +56,7 @@ export const versions = cachedStore<
 >('versions', function ({ set }) {
     return {
         load: async () => {
-            const { endpoint } = sdkForConsole.client.config;
+            const { endpoint } = sdk.forConsole.client.config;
             const response = await fetch(`${endpoint}/../versions`);
             set(await response.json());
         }
diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte
index 3b7ce418c..86a32638f 100644
--- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte
+++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte
@@ -4,7 +4,7 @@
     import { Pill } from '$lib/elements';
     import { FormList, InputText } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { wizard } from '$lib/stores/wizard';
     import { createPlatform } from '../store';
     import { app } from '$lib/stores/app';
@@ -18,7 +18,7 @@
     $wizard.media = $app.themeInUse === 'dark' ? Dark : Light;
     async function beforeSubmit() {
         if ($createPlatform.$id) {
-            await sdkForConsole.projects.updatePlatform(
+            await sdk.forConsole.projects.updatePlatform(
                 projectId,
                 $createPlatform.$id,
                 $createPlatform.name,
@@ -30,7 +30,7 @@
             return;
         }
 
-        const platform = await sdkForConsole.projects.createPlatform(
+        const platform = await sdk.forConsole.projects.createPlatform(
             projectId,
             'web',
             $createPlatform.name,
diff --git a/src/routes/console/project-[project]/overview/store.ts b/src/routes/console/project-[project]/overview/store.ts
index bf097c5d0..ee2556b46 100644
--- a/src/routes/console/project-[project]/overview/store.ts
+++ b/src/routes/console/project-[project]/overview/store.ts
@@ -1,4 +1,4 @@
-import { sdk, sdkForConsole, sdkForProject } from '$lib/stores/sdk';
+import { sdk, sdkForProject } from '$lib/stores/sdk';
 import { cachedStore } from '$lib/helpers/cache';
 import type { Models } from '@aw-labs/appwrite-console';
 import { writable, type Writable } from 'svelte/store';
@@ -14,7 +14,7 @@ export const usage = cachedStore<
         load: async (projectId, range) => {
             const usages = isCloud
                 ? await sdkForProject().project.getUsage(range)
-                : await sdkForConsole.projects.getUsage(projectId, range);
+                : await sdk.forConsole.projects.getUsage(projectId, range);
             set(usages);
         }
     };
diff --git a/src/routes/console/project-[project]/settings/+page.svelte b/src/routes/console/project-[project]/settings/+page.svelte
index a6dae100e..2421e3d8e 100644
--- a/src/routes/console/project-[project]/settings/+page.svelte
+++ b/src/routes/console/project-[project]/settings/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { toLocaleDateTime } from '$lib/helpers/date';
     import { addNotification } from '$lib/stores/notifications';
@@ -18,7 +18,7 @@
     let name: string = null;
     let showDelete = false;
     let updating = false;
-    const endpoint = sdkForConsole.client.config.endpoint;
+    const endpoint = sdk.forConsole.client.config.endpoint;
     const projectId = $page.params.project;
 
     onMount(async () => {
@@ -28,7 +28,7 @@
     async function updateName() {
         updating = true;
         try {
-            await sdkForConsole.projects.update($project.$id, name);
+            await sdk.forConsole.projects.update($project.$id, name);
             invalidate(Dependencies.PROJECT);
             addNotification({
                 type: 'success',
@@ -52,7 +52,7 @@
 
     async function serviceUpdate(service: Service) {
         try {
-            await sdkForConsole.projects.updateServiceStatus(
+            await sdk.forConsole.projects.updateServiceStatus(
                 $project.$id,
                 service.method,
                 service.value
diff --git a/src/routes/console/project-[project]/settings/deleteProject.svelte b/src/routes/console/project-[project]/settings/deleteProject.svelte
index 81cdbce39..8ea06e6c9 100644
--- a/src/routes/console/project-[project]/settings/deleteProject.svelte
+++ b/src/routes/console/project-[project]/settings/deleteProject.svelte
@@ -5,7 +5,7 @@
     import { Modal } from '$lib/components';
     import { Button, FormList, InputPassword, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../store';
 
     export let showDelete = false;
@@ -15,7 +15,7 @@
 
     const handleDelete = async () => {
         try {
-            await sdkForConsole.projects.delete($project.$id, password);
+            await sdk.forConsole.projects.delete($project.$id, password);
             showDelete = false;
             addNotification({
                 type: 'success',
diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
index 2bafa76d2..56b154268 100644
--- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
+++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.svelte
@@ -14,7 +14,7 @@
     } from '$lib/elements/table';
     import { Container } from '$lib/layout';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { wizard } from '$lib/stores/wizard';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
@@ -45,7 +45,7 @@
                 invalidate(Dependencies.DOMAINS);
                 return;
             }
-            await sdkForConsole.projects.updateDomainVerification(projectId, domainId);
+            await sdk.forConsole.projects.updateDomainVerification(projectId, domainId);
             invalidate(Dependencies.DOMAINS);
             trackEvent(Submit.DomainUpdateVerification);
         } catch (error) {
diff --git a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts
index 91eb7e13a..f9f0f2dcf 100644
--- a/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts
+++ b/src/routes/console/project-[project]/settings/domains/[[page]]/+page.ts
@@ -1,11 +1,11 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, parent, depends }) => {
     depends(Dependencies.DOMAINS);
 
     return {
-        domains: await sdkForConsole.projects.listDomains(params.project)
+        domains: await sdk.forConsole.projects.listDomains(params.project)
     };
 };
diff --git a/src/routes/console/project-[project]/settings/domains/delete.svelte b/src/routes/console/project-[project]/settings/domains/delete.svelte
index d71db173e..f0318ba59 100644
--- a/src/routes/console/project-[project]/settings/domains/delete.svelte
+++ b/src/routes/console/project-[project]/settings/domains/delete.svelte
@@ -2,7 +2,7 @@
     import { Modal } from '$lib/components';
     import { Button } from '$lib/elements/forms';
     import { project } from '../../store';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { addNotification } from '$lib/stores/notifications';
     import { invalidate } from '$app/navigation';
     import { Dependencies } from '$lib/constants';
@@ -14,7 +14,7 @@
 
     const deleteDomain = async () => {
         try {
-            await sdkForConsole.projects.deleteDomain($project.$id, selectedDomain.$id);
+            await sdk.forConsole.projects.deleteDomain($project.$id, selectedDomain.$id);
             invalidate(Dependencies.DOMAINS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
index 52217026a..671284d7f 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/step1.svelte
@@ -2,17 +2,17 @@
     import { Submit, trackEvent } from '$lib/actions/analytics';
     import { FormList, InputDomain } from '$lib/elements/forms';
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../../store';
     import { domain } from './store';
 
     const projectId = $project.$id;
     const createDomain = async () => {
         if ($domain.$id) {
-            await sdkForConsole.projects.deleteDomain(projectId, $domain.$id);
+            await sdk.forConsole.projects.deleteDomain(projectId, $domain.$id);
         }
 
-        const { $id } = await sdkForConsole.projects.createDomain(projectId, $domain.domain);
+        const { $id } = await sdk.forConsole.projects.createDomain(projectId, $domain.domain);
         $domain.$id = $id;
         trackEvent(Submit.DomainCreate);
     };
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
index 87c5e3a33..91b0a575a 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/step4.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import { WizardStep } from '$lib/layout';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { domain } from './store';
     import { project } from '../../../store';
     import CnameTable from './cnameTable.svelte';
@@ -11,7 +11,7 @@
     let certificate = false;
     const checkCertificate = () => {
         setTimeout(async () => {
-            const result = await sdkForConsole.projects.getDomain(projectId, $domain.$id);
+            const result = await sdk.forConsole.projects.getDomain(projectId, $domain.$id);
             if (!result.certificateId) {
                 checkCertificate();
                 return;
diff --git a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
index dffb24eee..fec80c01f 100644
--- a/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
+++ b/src/routes/console/project-[project]/settings/domains/wizard/verificationBox.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
     import Button from '$lib/elements/forms/button.svelte';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { domain } from './store';
     import { project } from '../../../store';
     import { addNotification } from '$lib/stores/notifications';
@@ -14,7 +14,7 @@
     const verifyDomain = async () => {
         isVerifying = true;
         try {
-            const result = await sdkForConsole.projects.updateDomainVerification(
+            const result = await sdk.forConsole.projects.updateDomainVerification(
                 projectId,
                 $domain.$id
             );
diff --git a/src/routes/console/project-[project]/settings/webhooks/+page.ts b/src/routes/console/project-[project]/settings/webhooks/+page.ts
index 71cde978c..10c30754e 100644
--- a/src/routes/console/project-[project]/settings/webhooks/+page.ts
+++ b/src/routes/console/project-[project]/settings/webhooks/+page.ts
@@ -1,11 +1,11 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ params, depends }) => {
     depends(Dependencies.WEBHOOKS);
 
     return {
-        webhooks: await sdkForConsole.projects.listWebhooks(params.project)
+        webhooks: await sdk.forConsole.projects.listWebhooks(params.project)
     };
 };
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
index 6ecea62dd..e8f219bdc 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/+layout.ts
@@ -1,5 +1,5 @@
 import { Dependencies } from '$lib/constants';
-import { sdk, sdkForConsole } from '$lib/stores/sdk';
+import { sdk } from '$lib/stores/sdk';
 import Breadcrumbs from './breadcrumbs.svelte';
 import Header from './header.svelte';
 import type { LayoutLoad } from './$types';
@@ -12,7 +12,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
         return {
             header: Header,
             breadcrumbs: Breadcrumbs,
-            webhook: await sdkForConsole.projects.getWebhook(params.project, params.webhook)
+            webhook: await sdk.forConsole.projects.getWebhook(params.project, params.webhook)
         };
     } catch (e) {
         throw error(e.code, e.message);
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte
index 6c4642e7a..b170845b8 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/delete.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { project } from '../../../store';
     import { webhook } from './store';
 
@@ -14,7 +14,7 @@
 
     async function handleDelete() {
         try {
-            await sdkForConsole.projects.deleteWebhook($project.$id, $webhook.$id);
+            await sdk.forConsole.projects.deleteWebhook($project.$id, $webhook.$id);
             await invalidate(Dependencies.WEBHOOKS);
             showDelete = false;
             addNotification({
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
index b59c9f56b..c6341a1f5 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/regenerate.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { webhook } from './store';
 
     export let show = false;
@@ -14,7 +14,7 @@
 
     async function regenerate() {
         try {
-            await sdkForConsole.projects.updateWebhookSignature(projectId, $webhook.$id);
+            await sdk.forConsole.projects.updateWebhookSignature(projectId, $webhook.$id);
             invalidate(Dependencies.WEBHOOK);
             show = false;
             addNotification({
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
index 24e853c6e..f113583d2 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateEvents.svelte
@@ -8,7 +8,7 @@
     import { TableCell, TableCellText, TableList } from '$lib/elements/table';
     import { symmetricDifference } from '$lib/helpers/array';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { writable, type Writable } from 'svelte/store';
     import { webhook } from './store';
@@ -25,7 +25,7 @@
 
     async function updateEvents() {
         try {
-            await sdkForConsole.projects.updateWebhook(
+            await sdk.forConsole.projects.updateWebhook(
                 projectId,
                 $webhook.$id,
                 $webhook.name,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
index 5ba121fc4..bb92e9103 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateName.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
@@ -19,7 +19,7 @@
 
     async function updateName() {
         try {
-            await sdkForConsole.projects.updateWebhook(
+            await sdk.forConsole.projects.updateWebhook(
                 projectId,
                 $webhook.$id,
                 name,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
index 0dcb54d40..1cb6a81af 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateSecurity.svelte
@@ -13,7 +13,7 @@
         InputText
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
@@ -30,7 +30,7 @@
 
     async function updateSecurity() {
         try {
-            await sdkForConsole.projects.updateWebhook(
+            await sdk.forConsole.projects.updateWebhook(
                 projectId,
                 $webhook.$id,
                 $webhook.name,
diff --git a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
index 84d489dbd..7c57a601d 100644
--- a/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/[webhook]/updateURL.svelte
@@ -6,7 +6,7 @@
     import { Dependencies } from '$lib/constants';
     import { Button, Form, FormList, InputText } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { onMount } from 'svelte';
     import { webhook } from './store';
 
@@ -19,7 +19,7 @@
 
     async function updateUrl() {
         try {
-            await sdkForConsole.projects.updateWebhook(
+            await sdk.forConsole.projects.updateWebhook(
                 projectId,
                 $webhook.$id,
                 $webhook.name,
diff --git a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte
index b27c6335c..0c34d9420 100644
--- a/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte
+++ b/src/routes/console/project-[project]/settings/webhooks/createWebhook.svelte
@@ -4,7 +4,7 @@
     import { addNotification } from '$lib/stores/notifications';
     import { wizard } from '$lib/stores/wizard';
     import { createWebhook } from './wizard/store';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { page } from '$app/stores';
     import Step1 from './wizard/step1.svelte';
     import Step2 from './wizard/step2.svelte';
@@ -17,7 +17,7 @@
     const projectId = $page.params.project;
     const create = async () => {
         try {
-            await sdkForConsole.projects.createWebhook(
+            await sdk.forConsole.projects.createWebhook(
                 projectId,
                 $createWebhook.name,
                 $createWebhook.events,
diff --git a/src/routes/invite/+page.svelte b/src/routes/invite/+page.svelte
index 9f0ba4e54..67424c92b 100644
--- a/src/routes/invite/+page.svelte
+++ b/src/routes/invite/+page.svelte
@@ -3,7 +3,7 @@
     import { base } from '$app/paths';
     import { Button, Form, FormList, InputChoice } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import { page } from '$app/stores';
     import { onMount } from 'svelte';
@@ -22,7 +22,7 @@
 
     const acceptInvite = async () => {
         try {
-            await sdkForConsole.teams.updateMembershipStatus(teamId, membershipId, userId, secret);
+            await sdk.forConsole.teams.updateMembershipStatus(teamId, membershipId, userId, secret);
             addNotification({
                 type: 'success',
                 message: 'Successfully logged in.'
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 0f8dba6d7..cd38f047c 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -10,7 +10,7 @@
         InputPassword
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import { Dependencies } from '$lib/constants';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
@@ -20,7 +20,7 @@
     async function login() {
         try {
             disabled = true;
-            await sdkForConsole.account.createEmailSession(mail, pass);
+            await sdk.forConsole.account.createEmailSession(mail, pass);
             await invalidate(Dependencies.ACCOUNT);
             addNotification({
                 type: 'success',
diff --git a/src/routes/recover/+page.svelte b/src/routes/recover/+page.svelte
index 1f8cf0c86..6d28dd722 100644
--- a/src/routes/recover/+page.svelte
+++ b/src/routes/recover/+page.svelte
@@ -9,7 +9,7 @@
         InputPassword
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import { Submit, trackEvent, trackError } from '$lib/actions/analytics';
     import { onMount } from 'svelte';
@@ -30,7 +30,7 @@
 
     async function recover() {
         try {
-            await sdkForConsole.account.createRecovery(email, window.location.toString());
+            await sdk.forConsole.account.createRecovery(email, window.location.toString());
             addNotification({
                 type: 'success',
                 message: 'We have sent you an email with a password reset link'
@@ -47,7 +47,7 @@
 
     async function setPassword() {
         try {
-            await sdkForConsole.account.updateRecovery(userId, secret, password, confirmPassword);
+            await sdk.forConsole.account.updateRecovery(userId, secret, password, confirmPassword);
             await goto(`${base}/login`);
             addNotification({
                 type: 'success',
diff --git a/src/routes/register/+page.svelte b/src/routes/register/+page.svelte
index eec8755d0..1abcebced 100644
--- a/src/routes/register/+page.svelte
+++ b/src/routes/register/+page.svelte
@@ -11,7 +11,7 @@
         InputText
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import FormList from '$lib/elements/forms/formList.svelte';
     import { Dependencies } from '$lib/constants';
@@ -24,8 +24,8 @@
     async function register() {
         try {
             disabled = true;
-            await sdkForConsole.account.create(ID.unique(), mail, pass, name ?? '');
-            await sdkForConsole.account.createEmailSession(mail, pass);
+            await sdk.forConsole.account.create(ID.unique(), mail, pass, name ?? '');
+            await sdk.forConsole.account.createEmailSession(mail, pass);
             await invalidate(Dependencies.ACCOUNT);
             await goto(`${base}/console`);
             trackEvent(Submit.AccountCreate);
diff --git a/src/routes/register/invite/[slug]/+page.svelte b/src/routes/register/invite/[slug]/+page.svelte
index a33f38e02..60fc25a5b 100644
--- a/src/routes/register/invite/[slug]/+page.svelte
+++ b/src/routes/register/invite/[slug]/+page.svelte
@@ -11,7 +11,7 @@
         InputText
     } from '$lib/elements/forms';
     import { addNotification } from '$lib/stores/notifications';
-    import { sdk, sdkForConsole } from '$lib/stores/sdk';
+    import { sdk } from '$lib/stores/sdk';
     import { Unauthenticated } from '$lib/layout';
     import FormList from '$lib/elements/forms/formList.svelte';
     import { Dependencies } from '$lib/constants';
@@ -55,7 +55,7 @@
     async function invite() {
         try {
             disabled = true;
-            const res = await fetch(`${sdkForConsole.client.config.endpoint}/account/invite`, {
+            const res = await fetch(`${sdk.forConsole.client.config.endpoint}/account/invite`, {
                 method: 'POST',
                 headers: {
                     'Content-Type': 'application/json'
@@ -71,8 +71,8 @@
             if (!res.ok) {
                 throw new Error((await res.json()).message);
             } else {
-                await sdkForConsole.account.createEmailSession(mail, pass);
-                await sdkForConsole.account.updatePrefs({ code });
+                await sdk.forConsole.account.createEmailSession(mail, pass);
+                await sdk.forConsole.account.updatePrefs({ code });
                 await invalidate(Dependencies.ACCOUNT);
                 await goto(`${base}/console`);
                 trackEvent('submit_account_create', { code: code });