Merge pull request #28 from Saasfy/user-workspaces

fix(web): workspace list is available only for workspace user

apps/web/app/app/(dashboard)/[workspaceSlug]/page.tsx

@@ -5,16 +5,25 @@ import { redirect } from 'next/navigation';
 import { ArrowUpRightIcon, SettingsIcon } from 'lucide-react';
 
 import { CreateProjectSheet } from '@saasfy/components';
-import { createAdminClient } from '@saasfy/supabase/server';
+import { createAdminClient, getUser } from '@saasfy/supabase/server';
 import { Button } from '@saasfy/ui/button';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@saasfy/ui/table';
 
 export default async function Component({ params }: { params: { workspaceSlug: string } }) {
+  const user = await getUser();
+
+  if (!user) {
+    return redirect('/login');
+  }
+
   const supabase = createAdminClient();
 
-  const workspace = (
-    await supabase.from('workspaces').select('*').eq('slug', params.workspaceSlug)
-  )?.data?.at(0);
+  const { data: workspace } = await supabase
+    .from('workspaces')
+    .select('*, workspace_users(*)')
+    .eq('slug', params.workspaceSlug)
+    .eq('workspace_users.user_id', user.id)
+    .single();
 
   if (!workspace) {
     return redirect('/not-found');

apps/web/app/app/(dashboard)/[workspaceSlug]/settings/page.tsx

@@ -19,7 +19,7 @@ export default function Settings() {
         </CardHeader>
         <CardContent>
           <form>
-            <Input placeholder="Store Name" />
+            <Input />
           </form>
         </CardContent>
         <CardFooter className="border-t px-6 py-4">

apps/web/app/app/(dashboard)/layout.tsx

@@ -1,5 +1,4 @@
 import React, { ReactNode, Suspense } from 'react';
-import { headers } from 'next/headers';
 import Link from 'next/link';
 import { redirect } from 'next/navigation';
 
@@ -19,7 +18,10 @@ export default async function DashboardLayout({ children }: { children: ReactNod
 
   const supabase = createAdminClient();
 
-  const { data: workspaces } = await supabase.from('workspaces').select('*');
+  const { data: workspaces } = await supabase
+    .from('workspaces')
+    .select('*, workspace_users(*)')
+    .eq('workspace_users.user_id', user.id);
 
   return (
     <div>

apps/web/app/app/(dashboard)/page.tsx

@@ -1,19 +1,27 @@
 import React from 'react';
 import Link from 'next/link';
+import { redirect } from 'next/navigation';
 
 import { ArrowUpRightIcon } from 'lucide-react';
 
 import { CreateWorkspaceSheet } from '@saasfy/components';
-import { createAdminClient } from '@saasfy/supabase/server';
+import { createAdminClient, getUser } from '@saasfy/supabase/server';
 import { Badge } from '@saasfy/ui/badge';
 import { Button } from '@saasfy/ui/button';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@saasfy/ui/table';
 
 export default async function Component() {
+  const user = await getUser();
+
+  if (!user) {
+    return redirect('/login');
+  }
+
   const supabase = createAdminClient();
   const { data: workspaces } = await supabase
     .from('workspaces')
     .select('*, projects(id), domains(id), workspace_users(id), plans(name)')
+    .eq('user_id', user.id)
     .limit(8);
 
   return (

apps/web/app/app/(user)/settings/page.tsx

@@ -53,7 +53,7 @@ export default async function Settings() {
         </CardHeader>
         <CardContent>
           <form id="nameForm">
-            <Input placeholder="Store Name" name="name" defaultValue={user.user_metadata.name} />
+            <Input name="name" defaultValue={user.user_metadata.name} />
           </form>
         </CardContent>
         <CardFooter className="border-t px-6 py-4">