From cacd4e76a27c7c01b7eef02a7934f0bb748e92f1 Mon Sep 17 00:00:00 2001
From: peintnermax <max@caos.ch>
Date: Thu, 8 Aug 2024 09:24:03 +0200
Subject: [PATCH] single-object

---
 apps/login/src/app/(login)/mfa/page.tsx    |  4 +--
 apps/login/src/app/api/otp/set/route.ts    |  2 +-
 apps/login/src/app/api/session/route.ts    |  2 +-
 packages/zitadel-next/src/utils/cookies.ts | 29 +++++++++++++++++-----
 packages/zitadel-next/src/utils/session.ts |  2 +-
 packages/zitadel-next/turbo.json           |  3 ---
 packages/zitadel-proto/turbo.json          |  2 +-
 7 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/apps/login/src/app/(login)/mfa/page.tsx b/apps/login/src/app/(login)/mfa/page.tsx
index e230819390d..bb875daf3bd 100644
--- a/apps/login/src/app/(login)/mfa/page.tsx
+++ b/apps/login/src/app/(login)/mfa/page.tsx
@@ -29,10 +29,10 @@ export default async function Page({
     loginName?: string,
     organization?: string,
   ) {
-    const recent = await getMostRecentCookieWithLoginname(
+    const recent = await getMostRecentCookieWithLoginname({
       loginName,
       organization,
-    );
+    });
     return getSession(recent.id, recent.token).then((response) => {
       if (response?.session && response.session.factors?.user?.id) {
         return listAuthenticationMethodTypes(
diff --git a/apps/login/src/app/api/otp/set/route.ts b/apps/login/src/app/api/otp/set/route.ts
index d5afcb01624..f7fa1d020cb 100644
--- a/apps/login/src/app/api/otp/set/route.ts
+++ b/apps/login/src/app/api/otp/set/route.ts
@@ -20,7 +20,7 @@ export async function POST(request: NextRequest) {
           return Promise.reject(error);
         })
       : loginName
-        ? getSessionCookieByLoginName(loginName, organization).catch(
+        ? getSessionCookieByLoginName({ loginName, organization }).catch(
             (error) => {
               return Promise.reject(error);
             },
diff --git a/apps/login/src/app/api/session/route.ts b/apps/login/src/app/api/session/route.ts
index 83baceef869..1a6a4329d5d 100644
--- a/apps/login/src/app/api/session/route.ts
+++ b/apps/login/src/app/api/session/route.ts
@@ -80,7 +80,7 @@ export async function PUT(request: NextRequest) {
           return Promise.reject(error);
         })
       : loginName
-        ? getSessionCookieByLoginName(loginName, organization).catch(
+        ? getSessionCookieByLoginName({ loginName, organization }).catch(
             (error) => {
               return Promise.reject(error);
             },
diff --git a/packages/zitadel-next/src/utils/cookies.ts b/packages/zitadel-next/src/utils/cookies.ts
index e16a48602e7..1cc4eadea68 100644
--- a/packages/zitadel-next/src/utils/cookies.ts
+++ b/packages/zitadel-next/src/utils/cookies.ts
@@ -110,7 +110,13 @@ export async function getMostRecentSessionCookie<T>(): Promise<any> {
   }
 }
 
-export async function getSessionCookieById<T>(id: string, organization?: string): Promise<SessionCookie<T>> {
+export async function getSessionCookieById<T>({
+  id,
+  organization,
+}: {
+  id: string;
+  organization?: string;
+}): Promise<SessionCookie<T>> {
   const cookiesList = cookies();
   const stringifiedCookie = cookiesList.get("sessions");
 
@@ -128,7 +134,13 @@ export async function getSessionCookieById<T>(id: string, organization?: string)
   }
 }
 
-export async function getSessionCookieByLoginName<T>(loginName: string, organization?: string): Promise<SessionCookie<T>> {
+export async function getSessionCookieByLoginName<T>({
+  loginName,
+  organization,
+}: {
+  loginName?: string;
+  organization?: string;
+}): Promise<SessionCookie<T>> {
   const cookiesList = cookies();
   const stringifiedCookie = cookiesList.get("sessions");
 
@@ -197,10 +209,17 @@ export async function getAllSessions<T>(cleanup: boolean = false): Promise<Sessi
 
 /**
  * Returns most recent session filtered by optinal loginName
- * @param loginName
+ * @param loginName optional loginName to filter cookies, if non provided, returns most recent session
+ * @param organization optional organization to filter cookies
  * @returns most recent session
  */
-export async function getMostRecentCookieWithLoginname<T>(loginName?: string, organization?: string): Promise<any> {
+export async function getMostRecentCookieWithLoginname<T>({
+  loginName,
+  organization,
+}: {
+  loginName?: string;
+  organization?: string;
+}): Promise<any> {
   const cookiesList = cookies();
   const stringifiedCookie = cookiesList.get("sessions");
 
@@ -233,5 +252,3 @@ export async function getMostRecentCookieWithLoginname<T>(loginName?: string, or
     return Promise.reject("Could not read session cookie");
   }
 }
-
-export async function clearSessions() {}
diff --git a/packages/zitadel-next/src/utils/session.ts b/packages/zitadel-next/src/utils/session.ts
index fc50d005bcc..fac865fffc9 100644
--- a/packages/zitadel-next/src/utils/session.ts
+++ b/packages/zitadel-next/src/utils/session.ts
@@ -7,7 +7,7 @@ export async function loadMostRecentSession(
   loginName?: string,
   organization?: string,
 ): Promise<Session | undefined> {
-  const recent = await getMostRecentCookieWithLoginname(loginName, organization);
+  const recent = await getMostRecentCookieWithLoginname({ loginName, organization });
   return sessionService
     .getSession({ sessionId: recent.id, sessionToken: recent.token }, {})
     .then((resp: GetSessionResponse) => resp.session);
diff --git a/packages/zitadel-next/turbo.json b/packages/zitadel-next/turbo.json
index 5a1a7d4995c..3e82b759f92 100644
--- a/packages/zitadel-next/turbo.json
+++ b/packages/zitadel-next/turbo.json
@@ -1,9 +1,6 @@
 {
   "extends": ["//"],
   "tasks": {
-    "dev": {
-      "dependsOn": ["@zitadel/client#build"]
-    },
     "build": {
       "outputs": ["dist/**"],
       "dependsOn": ["@zitadel/client#build", "@zitadel/react#build"]
diff --git a/packages/zitadel-proto/turbo.json b/packages/zitadel-proto/turbo.json
index 2d24f0349bc..bffd614f624 100644
--- a/packages/zitadel-proto/turbo.json
+++ b/packages/zitadel-proto/turbo.json
@@ -3,7 +3,7 @@
   "tasks": {
     "generate": {
       "outputs": ["zitadel/**"],
-      "cache": false
+      "cache": true
     }
   }
 }