fix: root directory creation

Co-authored-by: Ona <no-reply@ona.com>

packages/convex/model/filesystem.ts

@@ -2,6 +2,7 @@ import { v } from "convex/values"
 import type { Doc, Id } from "../_generated/dataModel"
 import type { AuthenticatedMutationCtx } from "../functions"
 import * as Directories from "./directories"
+import * as Err from "./error"
 import * as Files from "./files"
 
 export enum FileType {
@@ -81,6 +82,29 @@ export const VFileHandle = v.object({
 })
 export const VFileSystemHandle = v.union(VFileHandle, VDirectoryHandle)
 
+export async function ensureRootDirectory(
+	ctx: AuthenticatedMutationCtx,
+): Promise<Id<"directories">> {
+	const existing = await ctx.db
+		.query("directories")
+		.withIndex("byParentId", (q) =>
+			q.eq("userId", ctx.user._id).eq("parentId", undefined),
+		)
+		.first()
+
+	if (existing) {
+		return existing._id
+	}
+
+	const now = Date.now()
+	return await ctx.db.insert("directories", {
+		name: "",
+		createdAt: now,
+		updatedAt: now,
+		userId: ctx.user._id,
+	})
+}
+
 /**
  * Recursively collects all file and directory handles from the given handles,
  * including all nested items. Only includes items that are in trash (deletedAt >= 0).

packages/convex/model/user.ts

@@ -1,54 +1,25 @@
 import type { MutationCtx, QueryCtx } from "../_generated/server"
-import type { AuthenticatedMutationCtx } from "../functions"
+import { authComponent } from "../auth"
 import * as Err from "./error"
 
+export type AuthUser = Awaited<ReturnType<typeof authComponent.getAuthUser>>
+
 /**
  * Get the current authenticated user identity
  * Throws an error if the user is not authenticated */
 export async function userIdentityOrThrow(ctx: QueryCtx | MutationCtx) {
 	const identity = await ctx.auth.getUserIdentity()
-
 	if (!identity) {
 		throw Err.create(Err.Code.Unauthenticated, "Not authenticated")
 	}
-
 	return identity
 }
 
 /**
- * Get internal user document from JWT authentication
+ * Get user document from JWT authentication
  * Throws an error if the user is not authenticated
  */
 export async function userOrThrow(ctx: QueryCtx | MutationCtx) {
-	const identity = await userIdentityOrThrow(ctx)
-
-	// Look for existing user by JWT subject
-	const user = await ctx.db
-		.query("users")
-		.withIndex("byJwtSubject", (q) => q.eq("jwtSubject", identity.subject))
-		.first()
-
-	if (!user) {
-		throw Err.create(
-			Err.Code.Unauthenticated,
-			"User not found - please sync user first",
-		)
-	}
-
+	const user = await authComponent.getAuthUser(ctx)
 	return user
 }
-
-export async function register(ctx: AuthenticatedMutationCtx) {
-	const now = Date.now()
-	await Promise.all([
-		ctx.db.insert("users", {
-			jwtSubject: ctx.identity.subject,
-		}),
-		ctx.db.insert("directories", {
-			name: "",
-			userId: ctx.user._id,
-			createdAt: now,
-			updatedAt: now,
-		}),
-	])
-}