From 83a091269869cde3531aec6d377e240d56454b1e Mon Sep 17 00:00:00 2001
From: Torsten Dittmann <torsten.dittmann@googlemail.com>
Date: Thu, 16 Nov 2023 13:00:52 +0100
Subject: [PATCH] fix: last org in prefs

---
 src/routes/+layout.ts                           | 2 +-
 src/routes/console/+page.ts                     | 4 ++--
 src/routes/console/project-[project]/+layout.ts | 3 +--
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts
index 4052367489..5bff848e1c 100644
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -13,7 +13,7 @@ export const load: LayoutLoad = async ({ depends, url }) => {
     depends(Dependencies.ACCOUNT);
 
     try {
-        const account = await sdk.forConsole.account.get();
+        const account = await sdk.forConsole.account.get<{ organization?: string }>();
 
         LogRocket.identify(account.$id, {
             name: account.name,
diff --git a/src/routes/console/+page.ts b/src/routes/console/+page.ts
index d3738605b9..14e5b45e92 100644
--- a/src/routes/console/+page.ts
+++ b/src/routes/console/+page.ts
@@ -3,9 +3,9 @@ import { redirect } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 
 export const load: PageLoad = async ({ parent }) => {
-    const { organizations } = await parent();
+    const { organizations, account } = await parent();
     if (organizations.total) {
-        const teamId = localStorage.getItem('organization') ?? organizations.teams[0].$id;
+        const teamId = account.prefs.organization ?? organizations.teams[0].$id;
         throw redirect(303, `${base}/console/organization-${teamId}`);
     } else {
         throw redirect(303, `${base}/console/onboarding`);
diff --git a/src/routes/console/project-[project]/+layout.ts b/src/routes/console/project-[project]/+layout.ts
index ab513b5831..cd22bca7bd 100644
--- a/src/routes/console/project-[project]/+layout.ts
+++ b/src/routes/console/project-[project]/+layout.ts
@@ -9,8 +9,7 @@ export const load: LayoutLoad = async ({ params, depends }) => {
 
     try {
         const project = await sdk.forConsole.projects.get(params.project);
-        localStorage.setItem('project', project.$id);
-        localStorage.setItem('organization', project.teamId);
+        sdk.forConsole.account.updatePrefs({ organization: project.teamId });
         preferences.loadTeamPrefs(project.teamId);
 
         return {