Use branded types for identifiers everywhere (#1149)

* do it

* format

Author: oscartbeaumont

apps/web/actions/caps/share.ts

@@ -11,13 +11,13 @@ import {
 	spaceVideos,
 	videos,
 } from "@cap/database/schema";
-import type { Video } from "@cap/web-domain";
+import type { Organisation, Space, Video } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 interface ShareCapParams {
 	capId: Video.VideoId;
-	spaceIds: string[];
+	spaceIds: Space.SpaceIdOrOrganisationId[];
 	public?: boolean;
 }
 
@@ -53,7 +53,7 @@ export async function shareCap({
 			.from(organizations)
 			.where(
 				and(
-					inArray(organizations.id, spaceIds),
+					inArray(organizations.id, spaceIds as Organisation.OrganisationId[]),
 					inArray(organizations.id, userOrganizationIds),
 				),
 			)

apps/web/actions/organization/check-domain.ts

@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { checkDomainStatus } from "./domain-utils";
 
-export async function checkOrganizationDomain(organizationId: string) {
+export async function checkOrganizationDomain(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user || !organizationId) {

apps/web/actions/organization/create-space.ts

@@ -6,6 +6,7 @@ import { nanoId, nanoIdLength } from "@cap/database/helpers";
 import { spaceMembers, spaces, users } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
 import { S3Buckets } from "@cap/web-backend";
+import { Space } from "@cap/web-domain";
 import { and, eq, inArray } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -62,7 +63,7 @@ export async function createSpace(
 		}
 
 		// Generate the space ID early so we can use it in the file path
-		const spaceId = nanoId();
+		const spaceId = Space.SpaceId.make(nanoId());
 
 		const iconFile = formData.get("icon") as File | null;
 		let iconUrl = null;

apps/web/actions/organization/delete-space.ts

@@ -9,6 +9,7 @@ import {
 	spaceVideos,
 } from "@cap/database/schema";
 import { S3Buckets } from "@cap/web-backend";
+import type { Space } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { Effect, Option } from "effect";
 import { revalidatePath } from "next/cache";
@@ -20,7 +21,7 @@ interface DeleteSpaceResponse {
 }
 
 export async function deleteSpace(
-	spaceId: string,
+	spaceId: Space.SpaceIdOrOrganisationId,
 ): Promise<DeleteSpaceResponse> {
 	try {
 		const user = await getCurrentUser();

apps/web/actions/organization/get-organization-sso-data.ts

@@ -2,9 +2,12 @@
 
 import { db } from "@cap/database";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 
-export async function getOrganizationSSOData(organizationId: string) {
+export async function getOrganizationSSOData(
+	organizationId: Organisation.OrganisationId,
+) {
 	if (!organizationId) {
 		throw new Error("Organization ID is required");
 	}

apps/web/actions/organization/remove-domain.ts

@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
-export async function removeOrganizationDomain(organizationId: string) {
+export async function removeOrganizationDomain(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {

apps/web/actions/organization/remove-icon.ts

@@ -3,10 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
-export async function removeOrganizationIcon(organizationId: string) {
+export async function removeOrganizationIcon(
+	organizationId: Organisation.OrganisationId,
+) {
 	const user = await getCurrentUser();
 
 	if (!user) {

apps/web/actions/organization/remove-invite.ts

@@ -3,12 +3,13 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizationInvites, organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function removeOrganizationInvite(
 	inviteId: string,
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 

apps/web/actions/organization/remove-member.ts

@@ -3,6 +3,7 @@
 import { db } from "@cap/database";
 import { getCurrentUser } from "@cap/database/auth/session";
 import { organizationMembers, organizations } from "@cap/database/schema";
+import type { Organisation } from "@cap/web-domain";
 import { and, eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
@@ -13,7 +14,7 @@ import { revalidatePath } from "next/cache";
  */
 export async function removeOrganizationMember(
 	memberId: string,
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();
 	if (!user) throw new Error("Unauthorized");

apps/web/actions/organization/send-invites.ts

@@ -7,12 +7,13 @@ import { OrganizationInvite } from "@cap/database/emails/organization-invite";
 import { nanoId } from "@cap/database/helpers";
 import { organizationInvites, organizations } from "@cap/database/schema";
 import { serverEnv } from "@cap/env";
+import type { Organisation } from "@cap/web-domain";
 import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
 
 export async function sendOrganizationInvites(
 	invitedEmails: string[],
-	organizationId: string,
+	organizationId: Organisation.OrganisationId,
 ) {
 	const user = await getCurrentUser();