can successfully add new users

src/lib/supabase.ts

@@ -7,17 +7,204 @@ const supabaseAnonKey = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYm
 export const supabase = createClient(supabaseUrl, supabaseAnonKey)
 
 // Database types for TypeScript
+export type RoleName = 'admin' | 'conductor' | 'analyst' | 'data recorder'
+export type UserStatus = 'active' | 'disabled'
+
 export interface User {
   id: string
   email: string
-  role: 'admin' | 'conductor' | 'analyst'
+  roles: RoleName[]
+  status: UserStatus
   created_at: string
   updated_at: string
 }
 
 export interface Role {
   id: string
-  name: 'admin' | 'conductor' | 'analyst'
+  name: RoleName
   description: string
   created_at: string
 }
+
+export interface UserRole {
+  id: string
+  user_id: string
+  role_id: string
+  assigned_at: string
+  assigned_by?: string
+}
+
+export interface UserProfile {
+  id: string
+  email: string
+  status: UserStatus
+  created_at: string
+  updated_at: string
+  role_id?: string // Legacy field, will be deprecated
+}
+
+export interface CreateUserRequest {
+  email: string
+  roles: RoleName[]
+  tempPassword?: string
+}
+
+export interface CreateUserResponse {
+  user_id: string
+  email: string
+  temp_password: string
+  roles: RoleName[]
+  status: UserStatus
+}
+
+// User management utility functions
+export const userManagement = {
+  // Get all users with their roles
+  async getAllUsers(): Promise<User[]> {
+    const { data: profiles, error: profilesError } = await supabase
+      .from('user_profiles')
+      .select(`
+        id,
+        email,
+        status,
+        created_at,
+        updated_at
+      `)
+
+    if (profilesError) throw profilesError
+
+    // Get roles for each user
+    const usersWithRoles = await Promise.all(
+      profiles.map(async (profile) => {
+        const { data: userRoles, error: rolesError } = await supabase
+          .from('user_roles')
+          .select(`
+            roles!inner (
+              name
+            )
+          `)
+          .eq('user_id', profile.id)
+
+        if (rolesError) throw rolesError
+
+        return {
+          ...profile,
+          roles: userRoles.map(ur => ur.roles.name as RoleName)
+        }
+      })
+    )
+
+    return usersWithRoles
+  },
+
+  // Get all available roles
+  async getAllRoles(): Promise<Role[]> {
+    const { data, error } = await supabase
+      .from('roles')
+      .select('*')
+      .order('name')
+
+    if (error) throw error
+    return data
+  },
+
+  // Create a new user with roles
+  async createUser(userData: CreateUserRequest): Promise<CreateUserResponse> {
+    const { data, error } = await supabase.rpc('create_user_with_roles', {
+      user_email: userData.email,
+      role_names: userData.roles,
+      temp_password: userData.tempPassword
+    })
+
+    if (error) throw error
+    return data
+  },
+
+  // Update user status (enable/disable)
+  async updateUserStatus(userId: string, status: UserStatus): Promise<void> {
+    const { error } = await supabase
+      .from('user_profiles')
+      .update({ status })
+      .eq('id', userId)
+
+    if (error) throw error
+  },
+
+  // Update user roles
+  async updateUserRoles(userId: string, roleNames: RoleName[]): Promise<void> {
+    // First, remove all existing roles for the user
+    const { error: deleteError } = await supabase
+      .from('user_roles')
+      .delete()
+      .eq('user_id', userId)
+
+    if (deleteError) throw deleteError
+
+    // Get role IDs for the new roles
+    const { data: roles, error: rolesError } = await supabase
+      .from('roles')
+      .select('id, name')
+      .in('name', roleNames)
+
+    if (rolesError) throw rolesError
+
+    // Insert new role assignments
+    const roleAssignments = roles.map(role => ({
+      user_id: userId,
+      role_id: role.id
+    }))
+
+    const { error: insertError } = await supabase
+      .from('user_roles')
+      .insert(roleAssignments)
+
+    if (insertError) throw insertError
+  },
+
+  // Update user email
+  async updateUserEmail(userId: string, email: string): Promise<void> {
+    const { error } = await supabase
+      .from('user_profiles')
+      .update({ email })
+      .eq('id', userId)
+
+    if (error) throw error
+  },
+
+  // Get current user with roles
+  async getCurrentUser(): Promise<User | null> {
+    const { data: { user: authUser }, error: authError } = await supabase.auth.getUser()
+
+    if (authError || !authUser) return null
+
+    const { data: profile, error: profileError } = await supabase
+      .from('user_profiles')
+      .select(`
+        id,
+        email,
+        status,
+        created_at,
+        updated_at
+      `)
+      .eq('id', authUser.id)
+      .single()
+
+    if (profileError) throw profileError
+
+    const { data: userRoles, error: rolesError } = await supabase
+      .from('user_roles')
+      .select(`
+        roles!inner (
+          name
+        )
+      `)
+      .eq('user_id', authUser.id)
+
+    if (rolesError) throw rolesError
+
+    return {
+      ...profile,
+      roles: userRoles.map(ur => ur.roles.name as RoleName)
+    }
+  }
+}