store last visited org in cookie

server/routers/org/createOrg.ts

@@ -180,7 +180,7 @@ export async function createOrg(
 
             // Get all actions and create role actions
             const actionIds = await trx.select().from(actions).execute();
-            
+
             if (actionIds.length > 0) {
                 await trx
                     .insert(roleActions)
@@ -193,12 +193,14 @@ export async function createOrg(
                     );
             }
 
-            await trx.insert(orgDomains).values(
-                allDomains.map((domain) => ({
-                    orgId: newOrg[0].orgId,
-                    domainId: domain.domainId
-                }))
-            );
+            if (allDomains.length) {
+                await trx.insert(orgDomains).values(
+                    allDomains.map((domain) => ({
+                        orgId: newOrg[0].orgId,
+                        domainId: domain.domainId
+                    }))
+                );
+            }
 
             if (req.user) {
                 await trx.insert(userOrgs).values({

server/routers/org/listUserOrgs.ts

@@ -5,7 +5,7 @@ import { Org, orgs, userOrgs } from "@server/db";
 import response from "@server/lib/response";
 import HttpCode from "@server/types/HttpCode";
 import createHttpError from "http-errors";
-import { sql, inArray, eq } from "drizzle-orm";
+import { sql, inArray, eq, and } from "drizzle-orm";
 import logger from "@server/logger";
 import { fromZodError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
@@ -40,8 +40,10 @@ const listOrgsSchema = z.object({
 //     responses: {}
 // });
 
+type ResponseOrg = Org & { isOwner?: boolean };
+
 export type ListUserOrgsResponse = {
-    orgs: Org[];
+    orgs: ResponseOrg[];
     pagination: { total: number; limit: number; offset: number };
 };
 
@@ -106,6 +108,10 @@ export async function listUserOrgs(
             .select()
             .from(orgs)
             .where(inArray(orgs.orgId, userOrgIds))
+            .leftJoin(
+                userOrgs,
+                and(eq(userOrgs.orgId, orgs.orgId), eq(userOrgs.userId, userId))
+            )
             .limit(limit)
             .offset(offset);
 
@@ -115,9 +121,19 @@ export async function listUserOrgs(
             .where(inArray(orgs.orgId, userOrgIds));
         const totalCount = totalCountResult[0].count;
 
+        const responseOrgs = organizations.map((val) => {
+            const res = {
+                ...val.orgs
+            } as ResponseOrg;
+            if (val.userOrgs && val.userOrgs.isOwner) {
+                res.isOwner = val.userOrgs.isOwner;
+            }
+            return res;
+        });
+
         return response<ListUserOrgsResponse>(res, {
             data: {
-                orgs: organizations,
+                orgs: responseOrgs,
                 pagination: {
                     total: totalCount,
                     limit,

src/app/[orgId]/layout.tsx

@@ -8,6 +8,7 @@ import { GetOrgUserResponse } from "@server/routers/user";
 import { AxiosResponse } from "axios";
 import { redirect } from "next/navigation";
 import { cache } from "react";
+import SetLastOrgCookie from "@app/components/SetLastOrgCookie";
 
 export default async function OrgLayout(props: {
     children: React.ReactNode;
@@ -52,6 +53,7 @@ export default async function OrgLayout(props: {
     return (
         <>
             {props.children}
+            <SetLastOrgCookie orgId={orgId} />
         </>
     );
 }

src/app/page.tsx

@@ -12,6 +12,7 @@ import { cleanRedirect } from "@app/lib/cleanRedirect";
 import { Layout } from "@app/components/Layout";
 import { rootNavItems } from "./navigation";
 import { InitialSetupCompleteResponse } from "@server/routers/auth";
+import { cookies } from "next/headers";
 
 export const dynamic = "force-dynamic";
 
@@ -72,6 +73,25 @@ export default async function Page(props: {
         }
     }
 
+    // Check for pangolin-last-org cookie and redirect if valid
+    const allCookies = await cookies();
+    const lastOrgCookie = allCookies.get("pangolin-last-org")?.value;
+
+    if (lastOrgCookie && orgs.length > 0) {
+        // Check if the last org from cookie exists in user's organizations
+        const lastOrgExists = orgs.some(org => org.orgId === lastOrgCookie);
+        if (lastOrgExists) {
+            redirect(`/${lastOrgCookie}`);
+        } else {
+            const ownedOrg = orgs.find(org => org.isOwner);
+            if (ownedOrg) {
+                redirect(`/${ownedOrg.orgId}`);
+            } else {
+                redirect("/setup");
+            }
+        }
+    }
+
     return (
         <UserProvider user={user}>
             <Layout orgs={orgs} navItems={rootNavItems} showBreadcrumbs={false}>

src/components/SetLastOrgCookie.tsx

@@ -0,0 +1,19 @@
+"use client";
+
+import { useEffect } from "react";
+
+interface SetLastOrgCookieProps {
+    orgId: string;
+}
+
+export default function SetLastOrgCookie({ orgId }: SetLastOrgCookieProps) {
+    useEffect(() => {
+        const isSecure =
+            typeof window !== "undefined" &&
+            window.location.protocol === "https:";
+
+        document.cookie = `pangolin-last-org=${orgId}; path=/; max-age=${60 * 60 * 24 * 30}; samesite=lax${isSecure ? "; secure" : ""}`;
+    }, [orgId]);
+
+    return null;
+}