Merge pull request #44 from diggerhq/fix/login-cache-org-cookie

Store orgId after onboarding in a cookie

package.json

@@ -119,6 +119,7 @@
     "hastscript": "^9.0.0",
     "html2canvas": "^1.4.1",
     "inbucket-js-client": "^1.0.1",
+    "js-cookie": "^3.0.5",
     "jsonwebtoken": "^9.0.2",
     "jspdf": "^2.5.1",
     "lodash": "^4.17.21",

src/app/(dynamic-pages)/(authenticated-pages)/dashboard/route.tsx

@@ -6,6 +6,11 @@ export const dynamic = 'force-dynamic';
 
 export async function GET(req: NextRequest) {
     try {
+        const initialOrgId = req.cookies.get('organization')?.value;
+        if (initialOrgId) {
+            console.log('Initial org id from cookies:', initialOrgId);
+            return NextResponse.redirect(new URL(`/org/${initialOrgId}`, req.url));
+        }
         const initialOrganization = await getInitialOrganizationToRedirectTo();
         if (initialOrganization.status === 'error') {
             return NextResponse.redirect(toSiteURL('/500'));

src/app/(dynamic-pages)/(authenticated-pages)/onboarding/OrganizationCreation.tsx

@@ -8,11 +8,9 @@ import { generateSlug } from "@/lib/utils";
 import { CreateOrganizationSchema, createOrganizationSchema } from "@/utils/zod-schemas/organization";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { useMutation } from "@tanstack/react-query";
+import Cookies from 'js-cookie';
 import { useForm } from "react-hook-form";
 
-
-
-
 type OrganizationCreationProps = {
   onSuccess: () => void;
 };
@@ -26,9 +24,11 @@ export function OrganizationCreation({ onSuccess }: OrganizationCreationProps) {
   const createOrgMutation = useMutation({
     mutationFn: async ({ organizationTitle, organizationSlug }: CreateOrganizationSchema) => {
       return createOrganization(organizationTitle, organizationSlug, { isOnboardingFlow: true })
-    }
-    ,
+    },
     onSuccess: (data) => {
+      const { data: orgId } = data as { data: string }
+      console.log('created organization ID:', orgId);
+      Cookies.set('organization', orgId);
       toast({ title: "Organization created!", description: "Your new organization is ready." });
       onSuccess();
     },