Working on the organization and permissions.

app/(customer)/dashboard/(organization)/settings/page.tsx

@@ -17,7 +17,6 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
     const user = await currentUser();
     const activeMember = await getActiveMember()
 
-
     if (!organization) {
         notFound();
     }
@@ -35,12 +34,12 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
                 <PageTitle className="flex items-center">
                     Organization settings
                     {!isMember && organization.slug !== "default" && (
-                        <EditButtonSettings />
+                        <EditButtonSettings/>
                     )}
                 </PageTitle>
                 <PageActions>
                     {!isMember && organization.slug !== "default" && (
-                        <DeleteOrganizationButton organizationSlug={organization.slug} />
+                        <DeleteOrganizationButton organizationSlug={organization.slug}/>
                     )}
                 </PageActions>
             </PageHeader>
@@ -48,7 +47,7 @@ export default async function RoutePage(props: PageParams<{ slug: string }>) {
             {/*    Manage your organization settings.*/}
             {/*</PageDescription>*/}
             <PageContent>
-                <SettingsOrganizationMembersTable organization={organization} />
+                <SettingsOrganizationMembersTable organization={organization}/>
             </PageContent>
         </Page>
     )

src/components/wrappers/dashboard/organization/delete-organization/delete-organization-button.tsx

@@ -22,8 +22,8 @@ export const DeleteOrganizationButton = (props: DeleteOrganizationButtonProps) =
                     organizationSlug: "default",
                 });
                 router.push("/");
-
                 toast.success(result.data.actionSuccess?.message || "Organization deleted.");
+                router.refresh()
             } else {
                 // @ts-ignore
                 const errorMsg = result?.data?.actionError?.message || result?.data?.actionError?.messageParams?.message || "Failed to delete the organization.";

src/components/wrappers/dashboard/organization/organization.action.ts

@@ -222,7 +222,13 @@ export const deleteOrganizationAction = userAction.schema(z.string()).action(
             let deletedOrganization: Organization;
 
             try {
-                deletedOrganization = await deleteOrganization(org.id) as Organization;
+                // TODO : Improve with better auth, always getting 403 error
+                // deletedOrganization = await deleteOrganization(org.id) as Organization;
+                [deletedOrganization] = await db
+                    .delete(drizzleDb.schemas.organization)
+                    .where(eq(drizzleDb.schemas.organization.id, org.id))
+                    .returning();
+
             } catch (authError: any) {
                 console.error("Auth deletion failed:", authError);
                 return {

src/components/wrappers/dashboard/profile/button-delete-account/delete-account.action.ts

@@ -5,24 +5,32 @@ import { v4 as uuidv4 } from "uuid";
 import { db } from "@/db";
 import { eq } from "drizzle-orm";
 import * as drizzleDb from "@/db";
+import {authClient} from "@/lib/auth/auth-client";
+import {auth} from "@/lib/auth/auth";
 
 
 export const deleteUserAction = userAction.schema(z.string()).action(async ({ parsedInput, ctx }) => {
     const userId = parsedInput.length > 0 ? parsedInput : ctx.user.id;
     const uuid = uuidv4();
 
-    const [updatedUser] = await db
-        .update(drizzleDb.schemas.user)
-        .set({
-            email: `${uuid}@portabase.com`,
-            name: `${uuid}`,
-            //deleted: true,
-            //todo: add deleted
-        })
+
+    // const [updatedUser] = await db
+    //     .update(drizzleDb.schemas.user)
+    //     .set({
+    //         email: `${uuid}@portabase.com`,
+    //         name: `${uuid}`,
+    //         //deleted: true,
+    //         //todo: add deleted
+    //     })
+    //     .where(eq(drizzleDb.schemas.user.id, userId))
+    //     .returning();
+    const [deletedUser] = await db
+        .delete(drizzleDb.schemas.user)
         .where(eq(drizzleDb.schemas.user.id, userId))
         .returning();
 
+
     return {
-        data: updatedUser,
+        data: deletedUser,
     };
 });

src/lib/auth/permissions.ts

@@ -19,8 +19,7 @@ const superadmin = ac.newRole({
     ...adminAc.statements,
     ...orgAdminAc.statements,
     ...orgOwnerAc.statements,
-    ...orgMemberAc.statements
-
+    ...orgMemberAc.statements,
 });
 
 const admin = ac.newRole({