update api for desktop

Author: ameer2468

apps/web/app/(org)/dashboard/settings/organization/components/DeleteOrgDialog.tsx

@@ -23,14 +23,16 @@ interface DeleteOrgDialogProps {
 }
 
 const DeleteOrgDialog = ({ open, onOpenChange }: DeleteOrgDialogProps) => {
-	const { activeOrganization, organizationData, user } = useDashboardContext();
+	const { activeOrganization, organizationData } = useDashboardContext();
 	const [organizationName, setOrganizationName] = useState("");
 	const rpc = useRpcClient();
+	const inputId = useId();
 	const router = useRouter();
 	const deleteOrg = useEffectMutation({
 		mutationFn: Effect.fn(function* () {
+			if (!activeOrganization) return;
 			yield* rpc.OrganisationDelete({
-				id: activeOrganization?.organization.id as Organisation.OrganisationId,
+				id: activeOrganization.organization.id,
 			});
 		}),
 		onSuccess: () => {
@@ -58,7 +60,7 @@ const DeleteOrgDialog = ({ open, onOpenChange }: DeleteOrgDialogProps) => {
 				</DialogHeader>
 				<div className="p-5">
 					<Input
-						id={useId()}
+						id={inputId}
 						value={organizationName}
 						onChange={(e) => setOrganizationName(e.target.value)}
 						placeholder="Organization name"

apps/web/app/api/desktop/[...route]/root.ts

@@ -8,7 +8,7 @@ import {
 import { buildEnv, serverEnv } from "@cap/env";
 import { stripe, userIsPro } from "@cap/utils";
 import { zValidator } from "@hono/zod-validator";
-import { eq, or } from "drizzle-orm";
+import { and, eq, isNull, or } from "drizzle-orm";
 import { Hono } from "hono";
 import { PostHog } from "posthog-node";
 import type Stripe from "stripe";
@@ -212,9 +212,12 @@ app.get("/organizations", withAuth, async (c) => {
 			eq(organizations.id, organizationMembers.organizationId),
 		)
 		.where(
-			or(
-				eq(organizations.ownerId, user.id),
-				eq(organizationMembers.userId, user.id),
+			and(
+				isNull(organizations.tombstoneAt),
+				or(
+					eq(organizations.ownerId, user.id),
+					eq(organizationMembers.userId, user.id),
+				),
 			),
 		)
 		.groupBy(organizations.id);

packages/web-backend/src/Organisations/index.ts

@@ -53,6 +53,8 @@ export class Organisations extends Effect.Service<Organisations>()(
 			) {
 				const user = yield* CurrentUser;
 
+				yield* Policy.withPolicy(policy.isOwner(id))(Effect.void);
+
 				//this is fake deleting for now
 				yield* db.use((db) =>
 					db