cleanup

Author: ameer2468

apps/web/app/s/[videoId]/page.tsx

@@ -152,15 +152,12 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 		.where(
 			and(
 				eq(spaceMembers.userId, user?.id ?? ""),
-				eq(spaceMembers.spaceId, video?.spaceId ?? ""),
+				eq(spaceMembers.spaceId, video.spaceId ?? ""),
 			),
 		);
 
-	const userAccess = await userHasAccessToVideo(
-		user,
-		video,
-		!!space?.isSpaceMember,
-	);
+	const isMember = !!space?.isSpaceMember;
+	const userAccess = await userHasAccessToVideo(user, video, isMember);
 
 	const headersList = headers();
 	const referrer = headersList.get("x-referrer") || "";
@@ -337,18 +334,6 @@ export default async function ShareVideoPage(props: Props) {
 		.leftJoin(spaceVideos, eq(videos.id, spaceVideos.videoId))
 		.where(eq(videos.id, videoId));
 
-	const [space] = await db()
-		.select({
-			isSpaceMember: spaceMembers.userId,
-		})
-		.from(spaceMembers)
-		.where(
-			and(
-				eq(spaceMembers.userId, user?.id ?? ""),
-				eq(spaceMembers.spaceId, video?.spaceId ?? ""),
-			),
-		);
-
 	if (user && video && user.id !== video.ownerId) {
 		try {
 			await createNotification({ type: "view", videoId, authorId: user.id });
@@ -362,11 +347,20 @@ export default async function ShareVideoPage(props: Props) {
 		return <p>No video found</p>;
 	}
 
-	const userAccess = await userHasAccessToVideo(
-		user,
-		video,
-		!!space?.isSpaceMember,
-	);
+	const [space] = await db()
+		.select({
+			isSpaceMember: spaceMembers.userId,
+		})
+		.from(spaceMembers)
+		.where(
+			and(
+				eq(spaceMembers.userId, user?.id ?? ""),
+				eq(spaceMembers.spaceId, video.spaceId ?? ""),
+			),
+		);
+
+	const isMember = !!space?.isSpaceMember;
+	const userAccess = await userHasAccessToVideo(user, video, isMember);
 
 	if (userAccess === "private") {
 		return (

apps/web/utils/auth.ts

@@ -41,7 +41,8 @@ export async function userHasAccessToVideo(
 	}
 
 	// If the video is shared and has a space id, it's in a specific space
-	const isVideoSharedWithSpace = videoOrgId && video.spaceId;
+	const isVideoSharedWithSpace =
+		videoOrgId && video.spaceId && video.spaceId.length > 0;
 	if (
 		isSpaceMember &&
 		userActiveOrgId === videoOrgId &&