Add user invitation system with UI and auto-accept feature

app/api/domain-invites/[domainId]/route.ts

@@ -0,0 +1,6 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function DELETE(_request: NextRequest, { params: _params }: { params: { domainId: string } }) {
+  // Return error since domain invites are not implemented yet
+  return NextResponse.json({ success: false, error: 'Domain invites are coming soon' }, { status: 501 });
+}

app/api/domain-invites/route.ts

@@ -0,0 +1,11 @@
+import { NextRequest, NextResponse } from 'next/server';
+
+export async function GET(_request: NextRequest) {
+  // Return empty array for now since domain invites are "Coming Soon"
+  return NextResponse.json({ success: true, domainInvites: [] });
+}
+
+export async function POST(_request: NextRequest) {
+  // Return error since domain invites are not implemented yet
+  return NextResponse.json({ success: false, error: 'Domain invites are coming soon' }, { status: 501 });
+}

app/api/invites/[inviteId]/route.ts

@@ -0,0 +1,31 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { requireUserAbility } from '~/auth/session';
+import { PermissionAction, PermissionResource } from '@prisma/client';
+import { inviteService } from '~/lib/services/inviteService';
+
+export async function DELETE(request: NextRequest, { params }: { params: { inviteId: string } }) {
+  try {
+    const { userAbility } = await requireUserAbility(request);
+
+    if (!userAbility.can(PermissionAction.delete, PermissionResource.AdminApp)) {
+      return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
+    }
+
+    const { inviteId } = params;
+
+    await inviteService.deleteInvite(inviteId);
+
+    return NextResponse.json({
+      success: true,
+      message: 'Invite removed successfully',
+    });
+  } catch (error) {
+    console.error('Error deleting invite:', error);
+
+    if (error instanceof Error && error.message === 'Invite not found') {
+      return NextResponse.json({ success: false, error: 'Invite not found' }, { status: 404 });
+    }
+
+    return NextResponse.json({ success: false, error: 'Failed to remove invite' }, { status: 500 });
+  }
+}

app/api/invites/accept/route.ts

@@ -0,0 +1,45 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+import { requireUserAbility } from '~/auth/session';
+import { inviteService } from '~/lib/services/inviteService';
+
+const acceptInviteSchema = z.object({
+  inviteId: z.string().min(1, 'Invite ID is required'),
+});
+
+export async function POST(request: NextRequest) {
+  try {
+    const { userId } = await requireUserAbility(request);
+
+    const body = await request.json();
+    const parsedBody = acceptInviteSchema.safeParse(body);
+
+    if (!parsedBody.success) {
+      return NextResponse.json({ success: false, error: parsedBody.error.flatten().fieldErrors }, { status: 400 });
+    }
+
+    const { inviteId } = parsedBody.data;
+
+    await inviteService.acceptInvite(inviteId, userId);
+
+    return NextResponse.json({
+      success: true,
+      message: 'Invite accepted successfully',
+    });
+  } catch (error) {
+    console.error('Error accepting invite:', error);
+
+    if (error instanceof Error) {
+      if (
+        error.message.includes('not found') ||
+        error.message.includes('no longer valid') ||
+        error.message.includes('expired') ||
+        error.message.includes('does not match')
+      ) {
+        return NextResponse.json({ success: false, error: error.message }, { status: 400 });
+      }
+    }
+
+    return NextResponse.json({ success: false, error: 'Failed to accept invite' }, { status: 500 });
+  }
+}

app/api/invites/route.ts

@@ -0,0 +1,74 @@
+import { NextRequest, NextResponse } from 'next/server';
+import { z } from 'zod';
+import { requireUserAbility } from '~/auth/session';
+import { PermissionAction, PermissionResource } from '@prisma/client';
+import { inviteService } from '~/lib/services/inviteService';
+import { InviteStatus } from '@prisma/client';
+
+const createInviteSchema = z.object({
+  email: z.string().email('Invalid email address'),
+  roleId: z.string().min(1, 'Role ID is required'),
+});
+
+export async function GET(request: NextRequest) {
+  try {
+    const { userAbility } = await requireUserAbility(request);
+
+    if (!userAbility.can(PermissionAction.read, PermissionResource.AdminApp)) {
+      return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
+    }
+
+    const { searchParams } = new URL(request.url);
+    const status = searchParams.get('status') as InviteStatus;
+
+    if (status && !Object.values(InviteStatus).includes(status)) {
+      return NextResponse.json({ success: false, error: 'Invalid status' }, { status: 400 });
+    }
+
+    const invites = status
+      ? await inviteService.getInvitesByStatus(status)
+      : await inviteService.getInvitesByStatus(InviteStatus.PENDING);
+
+    return NextResponse.json({ success: true, invites });
+  } catch (error) {
+    console.error('Error fetching invites:', error);
+    return NextResponse.json({ success: false, error: 'Failed to fetch invites' }, { status: 500 });
+  }
+}
+
+export async function POST(request: NextRequest) {
+  try {
+    const { userAbility, userId } = await requireUserAbility(request);
+
+    if (!userAbility.can(PermissionAction.create, PermissionResource.AdminApp)) {
+      return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
+    }
+
+    const body = await request.json();
+    const parsedBody = createInviteSchema.safeParse(body);
+
+    if (!parsedBody.success) {
+      return NextResponse.json({ success: false, error: parsedBody.error.flatten().fieldErrors }, { status: 400 });
+    }
+
+    const { email, roleId } = parsedBody.data;
+
+    const invite = await inviteService.createInvite(email, roleId, userId);
+
+    return NextResponse.json({
+      success: true,
+      invite,
+      message: 'Invitation sent successfully',
+    });
+  } catch (error) {
+    console.error('Error creating invite:', error);
+
+    if (error instanceof Error) {
+      if (error.message.includes('already exists') || error.message.includes('already a pending invite')) {
+        return NextResponse.json({ success: false, error: error.message }, { status: 400 });
+      }
+    }
+
+    return NextResponse.json({ success: false, error: 'Failed to create invite' }, { status: 500 });
+  }
+}

app/api/user/route.ts

@@ -2,11 +2,12 @@ import { PermissionAction, PermissionResource } from '@prisma/client';
 import { NextRequest, NextResponse } from 'next/server';
 import { requireUserAbility } from '~/auth/session';
 import { userService } from '~/lib/services/userService';
+import { z } from 'zod';
 
-type UpdateRoleBody = {
-  userId: string;
-  role: 'ADMIN' | 'MEMBER';
-};
+const updateRoleSchema = z.object({
+  userId: z.string().min(1, 'User ID is required'),
+  roleId: z.string().min(1, 'Role ID is required'),
+});
 
 export async function GET(request: NextRequest) {
   try {
@@ -16,9 +17,19 @@ export async function GET(request: NextRequest) {
       return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
     }
 
-    const users = await userService.getAllUsers();
-
-    return NextResponse.json({ success: true, users }, { status: 200 });
+    const [usersWithRoles, usersWithoutRoles] = await Promise.all([
+      userService.getAllUsersWithRoles(),
+      userService.getAllUsersWithoutRoles(),
+    ]);
+
+    return NextResponse.json(
+      {
+        success: true,
+        users: usersWithRoles,
+        usersWithoutRoles,
+      },
+      { status: 200 },
+    );
   } catch (error) {
     console.error('Failed to fetch users:', error);
     return NextResponse.json({ success: false, error: 'Failed to fetch users' }, { status: 500 });
@@ -28,13 +39,20 @@ export async function GET(request: NextRequest) {
 export async function PATCH(request: NextRequest) {
   try {
     const { userAbility } = await requireUserAbility(request);
-    const body = (await request.json()) as UpdateRoleBody;
+    const body = await request.json();
+    const parsedBody = updateRoleSchema.safeParse(body);
+
+    if (!parsedBody.success) {
+      return NextResponse.json({ success: false, error: parsedBody.error.flatten().fieldErrors }, { status: 400 });
+    }
 
     if (!userAbility.can(PermissionAction.manage, PermissionResource.AdminApp)) {
       return NextResponse.json({ success: false, error: 'Forbidden' }, { status: 403 });
     }
 
-    const targetUser = await userService.updateUserRole(body.userId, body.role);
+    const { userId, roleId } = parsedBody.data;
+
+    const targetUser = await userService.updateUserRoleToNewSystem(userId, roleId);
 
     return NextResponse.json({ success: true, user: targetUser });
   } catch (error) {

app/auth/auth-config.ts

@@ -4,6 +4,7 @@ import { prisma } from '~/lib/prisma';
 import { env } from '~/env';
 import { createAuthMiddleware } from 'better-auth/plugins';
 import { userService } from '~/lib/services/userService';
+import { inviteService } from '~/lib/services/inviteService';
 
 const { BASE_URL, GOOGLE_CLIENT_ID, GOOGLE_CLIENT_SECRET, LICENSE_KEY } = env.server;
 
@@ -121,6 +122,19 @@ export const auth = betterAuth({
           await userService.grantSystemAdminAccess(createdUser.id);
         }
       });
+
+      // Check for pending invites and auto-accept them
+      try {
+        const pendingInvite = await inviteService.getInviteByEmail(email);
+
+        if (pendingInvite) {
+          await inviteService.acceptInvite(pendingInvite.id, createdUser.id);
+          console.log(`✅ Auto-accepted invite for user ${email}`);
+        }
+      } catch (error) {
+        console.error(`❌ Failed to auto-accept invite for user ${email}:`, error);
+        // Don't fail the auth flow if invite acceptance fails
+      }
     }),
   },
 });