refactor: simplify user ensure updates

Author: steipete

convex/users.test.ts

@@ -8,12 +8,19 @@ vi.mock('./lib/access', async () => {
 const { requireUser } = await import('./lib/access')
 const { ensureHandler } = await import('./users')
 
+function makeCtx() {
+  const patch = vi.fn()
+  const get = vi.fn()
+  return { ctx: { db: { patch, get } } as never, patch, get }
+}
+
 describe('ensureHandler', () => {
   afterEach(() => {
     vi.mocked(requireUser).mockReset()
   })
 
   it('updates handle and display name when GitHub login changes', async () => {
+    const { ctx, patch } = makeCtx()
     vi.mocked(requireUser).mockResolvedValue({
       userId: 'users:1',
       user: {
@@ -27,11 +34,7 @@ describe('ensureHandler', () => {
       },
     } as never)
 
-    const patch = vi.fn()
-    const get = vi.fn()
-    const ctx = { db: { patch, get } }
-
-    await ensureHandler(ctx as never)
+    await ensureHandler(ctx)
 
     expect(patch).toHaveBeenCalledWith('users:1', {
       handle: 'new-handle',
@@ -41,6 +44,7 @@ describe('ensureHandler', () => {
   })
 
   it('does not override a custom display name when syncing handle', async () => {
+    const { ctx, patch } = makeCtx()
     vi.mocked(requireUser).mockResolvedValue({
       userId: 'users:2',
       user: {
@@ -53,11 +57,7 @@ describe('ensureHandler', () => {
       },
     } as never)
 
-    const patch = vi.fn()
-    const get = vi.fn()
-    const ctx = { db: { patch, get } }
-
-    await ensureHandler(ctx as never)
+    await ensureHandler(ctx)
 
     expect(patch).toHaveBeenCalledWith('users:2', {
       handle: 'new-handle',
@@ -66,6 +66,7 @@ describe('ensureHandler', () => {
   })
 
   it('fills display name from existing handle when missing', async () => {
+    const { ctx, patch } = makeCtx()
     vi.mocked(requireUser).mockResolvedValue({
       userId: 'users:3',
       user: {
@@ -79,11 +80,7 @@ describe('ensureHandler', () => {
       },
     } as never)
 
-    const patch = vi.fn()
-    const get = vi.fn()
-    const ctx = { db: { patch, get } }
-
-    await ensureHandler(ctx as never)
+    await ensureHandler(ctx)
 
     expect(patch).toHaveBeenCalledWith('users:3', {
       displayName: 'steady-handle',

convex/users.ts

@@ -77,23 +77,35 @@ export const ensure = mutation({
   handler: ensureHandler,
 })
 
-export async function ensureHandler(ctx: MutationCtx) {
-  const { userId, user } = await requireUser(ctx)
+function normalizeHandle(handle: string | undefined) {
+  const normalized = handle?.trim()
+  return normalized ? normalized : undefined
+}
+
+function deriveHandle(args: { existingHandle?: string; githubLogin?: string; email?: string }) {
+  // Prefer the GitHub login; only fall back to email-derived handle when we don't already have one.
+  if (args.githubLogin) return args.githubLogin
+  if (!args.existingHandle && args.email) return args.email.split('@')[0]?.trim() || undefined
+  return undefined
+}
+
+function computeEnsureUpdates(user: Doc<'users'>) {
   const updates: Record<string, unknown> = {}
 
-  const existingHandle = user.handle?.trim() || undefined
-  const nameHandle = user.name?.trim() || undefined
-  const emailHandle = user.email?.split('@')[0]?.trim() || undefined
-  // `user.name` is the GitHub login (see convex/auth.ts profile mapping).
-  // Only fall back to deriving from email if we don't already have a handle.
-  const derivedHandle = nameHandle || (!existingHandle ? emailHandle : undefined)
+  const existingHandle = normalizeHandle(user.handle)
+  const githubLogin = normalizeHandle(user.name)
+  const derivedHandle = deriveHandle({
+    existingHandle,
+    githubLogin,
+    email: user.email,
+  })
   const baseHandle = derivedHandle ?? existingHandle
 
-  if (derivedHandle && (!existingHandle || existingHandle !== derivedHandle)) {
+  if (derivedHandle && existingHandle !== derivedHandle) {
     updates.handle = derivedHandle
   }
 
-  const displayName = user.displayName?.trim() || undefined
+  const displayName = normalizeHandle(user.displayName)
   if (!displayName && baseHandle) {
     updates.displayName = baseHandle
   } else if (derivedHandle && displayName === existingHandle) {
@@ -106,6 +118,13 @@ export async function ensureHandler(ctx: MutationCtx) {
 
   if (!user.createdAt) updates.createdAt = user._creationTime
 
+  return updates
+}
+
+export async function ensureHandler(ctx: MutationCtx) {
+  const { userId, user } = await requireUser(ctx)
+  const updates = computeEnsureUpdates(user)
+
   if (Object.keys(updates).length > 0) {
     updates.updatedAt = Date.now()
     await ctx.db.patch(userId, updates)