Restructure everything after overhaul

app/(dashboard)/DashboardLayout.tsx

@@ -7,10 +7,7 @@
 //
 import Link from 'next/link'
 import { LogoType } from '@/components/icons/LogoType'
-import {
-  getAuthenticatedOnlyApp,
-  getCurrentUserRole,
-} from '@/modules/firebase/guards'
+import { getAuthenticatedOnlyApp } from '@/modules/firebase/guards'
 import { getUserInfo } from '@stanfordbdhg/design-system/modules/auth/user'
 import {
   DashboardLayout as DashboardLayoutBase,
@@ -23,8 +20,8 @@ interface DashboardLayoutProps
   extends Omit<DashboardLayoutPropsBase, 'aside' | 'mobile'> {}
 
 export const DashboardLayout = async (props: DashboardLayoutProps) => {
-  const { currentUser } = await getAuthenticatedOnlyApp()
-  const { role: userRole } = await getCurrentUserRole()
+  const { currentUser, user: userDoc } = await getAuthenticatedOnlyApp()
+  const role = userDoc.type
   const user = <User user={getUserInfo(currentUser)} />
 
   return (
@@ -35,15 +32,15 @@ export const DashboardLayout = async (props: DashboardLayoutProps) => {
             <LogoType className="!h-auto !w-full px-2 xl:px-8" />
           </Link>
           <nav className="mt-9 flex flex-col gap-1 xl:w-full">
-            <MenuLinks role={userRole} />
+            <MenuLinks userType={role} />
           </nav>
           {user}
         </>
       }
       mobile={
         <>
           <nav className="mt-9 flex flex-col gap-1 px-4">
-            <MenuLinks role={userRole} />
+            <MenuLinks userType={role} />
           </nav>
           {user}
         </>

app/(dashboard)/MenuLinks.tsx

@@ -8,15 +8,15 @@
 'use client'
 import { Home, Users, Contact } from 'lucide-react'
 import { usePathname } from 'next/navigation'
-import { Role } from '@/modules/firebase/role'
+import { UserType } from '@/modules/firebase/utils'
 import { routes } from '@/modules/routes'
 import { MenuItem } from '@stanfordbdhg/design-system/molecules/DashboardLayout'
 
 interface MenuLinksProps {
-  role: Role
+  userType: UserType
 }
 
-export const MenuLinks = ({ role }: MenuLinksProps) => {
+export const MenuLinks = ({ userType }: MenuLinksProps) => {
   const pathname = usePathname()
 
   const hrefProps = (href: string) => ({
@@ -27,7 +27,7 @@ export const MenuLinks = ({ role }: MenuLinksProps) => {
   return (
     <>
       <MenuItem {...hrefProps('/')} label="Home" icon={<Home />} />
-      {[Role.admin, Role.owner].includes(role) && (
+      {[UserType.admin, UserType.owner].includes(userType) && (
         <MenuItem
           {...hrefProps(routes.users.index)}
           label="Users"

app/(dashboard)/layout.tsx

@@ -6,12 +6,9 @@
 // SPDX-License-Identifier: MIT
 //
 import { type ReactNode } from 'react'
-import {
-  getAuthenticatedOnlyApp,
-  getCurrentUserRole,
-} from '@/modules/firebase/guards'
+import { getAuthenticatedOnlyApp } from '@/modules/firebase/guards'
 import { UserContextProvider } from '@/modules/firebase/UserProvider'
-import { getDocData } from '@/modules/firebase/utils'
+import { getDocDataOrThrow } from '@/modules/firebase/utils'
 import { getUserInfo } from '@/packages/design-system/src/modules/auth/user'
 
 interface DashboardLayoutProps {
@@ -22,14 +19,12 @@ export const dynamic = 'force-dynamic'
 
 const DashboardLayout = async ({ children }: DashboardLayoutProps) => {
   const { currentUser, docRefs } = await getAuthenticatedOnlyApp()
-  const { role } = await getCurrentUserRole()
-  const user = await getDocData(docRefs.user(currentUser.uid))
+  const user = await getDocDataOrThrow(docRefs.user(currentUser.uid))
   return (
     <UserContextProvider
       user={{
-        ...getUserInfo(currentUser),
-        organization: user?.organization,
-        role,
+        auth: getUserInfo(currentUser),
+        user,
       }}
     >
       {children}

app/(dashboard)/patients/PatientForm.tsx

@@ -7,9 +7,7 @@
 //
 'use client'
 import { z } from 'zod'
-import { Role } from '@/modules/firebase/role'
-import { useUser } from '@/modules/firebase/UserProvider'
-import { type Organization, type User } from '@/modules/firebase/utils'
+import { type User } from '@/modules/firebase/utils'
 import { Button } from '@/packages/design-system/src/components/Button'
 import { Input } from '@/packages/design-system/src/components/Input'
 import {
@@ -21,48 +19,45 @@ import {
 } from '@/packages/design-system/src/components/Select'
 import { Field } from '@/packages/design-system/src/forms/Field'
 import { useForm } from '@/packages/design-system/src/forms/useForm'
-import { type UserInfo } from '@/packages/design-system/src/modules/auth/user'
+import {
+  getUserName,
+  type UserInfo,
+} from '@/packages/design-system/src/modules/auth/user'
 
 export const patientFormSchema = z.object({
   email: z.string().min(1, 'Email is required'),
   displayName: z.string(),
   invitationCode: z.string(),
   clinician: z.string(),
-  organizationId: z.string().optional(),
 })
 
 export type PatientFormSchema = z.infer<typeof patientFormSchema>
 
 interface PatientFormProps {
-  organizations: Array<Pick<Organization, 'name' | 'id'>>
   clinicians: Array<{
     id: string
-    name: string
+    displayName: string | null
+    email: string | null
   }>
   userInfo?: Pick<UserInfo, 'email' | 'displayName' | 'uid'>
-  user?: Pick<User, 'organization' | 'invitationCode'>
+  user?: Pick<User, 'organization' | 'invitationCode' | 'clinician'>
   onSubmit: (data: PatientFormSchema) => Promise<void>
 }
 
 export const PatientForm = ({
-  organizations,
   user,
   clinicians,
   userInfo,
   onSubmit,
 }: PatientFormProps) => {
   const isEdit = !!user
-  const authUser = useUser()
   const form = useForm({
     formSchema: patientFormSchema,
     defaultValues: {
       email: userInfo?.email ?? '',
       displayName: userInfo?.displayName ?? '',
-      organizationId:
-        authUser.role === Role.owner ?
-          authUser.organization
-        : user?.organization,
       invitationCode: user?.invitationCode ?? '',
+      clinician: user?.clinician ?? '',
     },
   })
 
@@ -92,27 +87,6 @@ export const PatientForm = ({
           render={({ field }) => <Input {...field} />}
         />
       )}
-      {authUser.role === Role.admin && (
-        <Field
-          control={form.control}
-          name="organizationId"
-          label="Organization"
-          render={({ field }) => (
-            <Select onValueChange={field.onChange} {...field}>
-              <SelectTrigger>
-                <SelectValue placeholder="Organization" />
-              </SelectTrigger>
-              <SelectContent>
-                {organizations.map((organization) => (
-                  <SelectItem value={organization.id} key={organization.id}>
-                    {organization.name}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          )}
-        />
-      )}
       <Field
         control={form.control}
         name="clinician"
@@ -125,7 +99,7 @@ export const PatientForm = ({
             <SelectContent>
               {clinicians.map((clinician) => (
                 <SelectItem value={clinician.id} key={clinician.id}>
-                  {clinician.name}
+                  {getUserName(clinician)}
                 </SelectItem>
               ))}
             </SelectContent>

app/(dashboard)/patients/[id]/page.tsx

@@ -5,7 +5,7 @@
 //
 // SPDX-License-Identifier: MIT
 //
-import { deleteField } from '@firebase/firestore'
+import { deleteField, updateDoc } from '@firebase/firestore'
 import { Contact } from 'lucide-react'
 import { revalidatePath } from 'next/cache'
 import { notFound } from 'next/navigation'
@@ -14,14 +14,13 @@ import {
   type PatientFormSchema,
 } from '@/app/(dashboard)/patients/PatientForm'
 import { getFormProps } from '@/app/(dashboard)/patients/utils'
-import { getAuthenticatedOnlyApp, getUserRole } from '@/modules/firebase/guards'
+import { getAuthenticatedOnlyApp } from '@/modules/firebase/guards'
 import { mapAuthData } from '@/modules/firebase/user'
-import { getDocDataOrThrow, updateDocData } from '@/modules/firebase/utils'
+import { getDocDataOrThrow, UserType } from '@/modules/firebase/utils'
 import { routes } from '@/modules/routes'
 import { getUserName } from '@/packages/design-system/src/modules/auth/user'
 import { PageTitle } from '@/packages/design-system/src/molecules/DashboardLayout'
 import { DashboardLayout } from '../../DashboardLayout'
-import { Role } from '@/modules/firebase/role'
 
 interface PatientPageProps {
   params: { id: string }
@@ -32,15 +31,14 @@ const PatientPage = async ({ params }: PatientPageProps) => {
   const userId = params.id
   const allAuthData = await mapAuthData({ userIds: [userId] }, (data, id) => ({
     uid: id,
-    ...data,
+    email: data.auth.email,
+    displayName: data.auth.displayName,
   }))
-  const authUser = allAuthData.at(0)?.auth
-  const userRole = await getUserRole(userId)
-  if (!authUser || userRole.role !== Role.user) {
+  const authUser = allAuthData.at(0)
+  const user = await getDocDataOrThrow(docRefs.user(userId))
+  if (!authUser || user.type !== UserType.patient) {
     notFound()
   }
-  const user = await getDocDataOrThrow(docRefs.user(userId))
-  const patient = await getDocDataOrThrow(docRefs.patient(userId))
 
   const updatePatient = async (form: PatientFormSchema) => {
     'use server'
@@ -51,13 +49,11 @@ const PatientPage = async ({ params }: PatientPageProps) => {
         auth: {
           displayName: form.displayName,
           email: form.email,
-          phoneNumber: null,
-          photoURL: null,
         },
       },
     })
     const userRef = docRefs.user(userId)
-    await updateDocData(userRef, {
+    await updateDoc(userRef, {
       invitationCode: form.invitationCode,
       organization: form.organizationId ?? deleteField(),
     })

app/(dashboard)/patients/actions.tsx

@@ -20,7 +20,6 @@ export const deletePatient = async (payload: { userId: string }) => {
 
 export const deleteInvitation = async (payload: { invitationId: string }) => {
   const { docRefs } = await getAuthenticatedOnlyApp()
-  // TODO: https://github.com/StanfordBDHG/ENGAGE-HF-Firebase/issues/38
   await deleteDoc(docRefs.invitation(payload.invitationId))
   revalidatePath(routes.patients.index)
   return 'success'

app/(dashboard)/patients/invite/page.tsx

@@ -9,6 +9,7 @@ import { Contact } from 'lucide-react'
 import { redirect } from 'next/navigation'
 import { getFormProps } from '@/app/(dashboard)/patients/utils'
 import { getAuthenticatedOnlyApp } from '@/modules/firebase/guards'
+import { getDocDataOrThrow, UserType } from '@/modules/firebase/utils'
 import { routes } from '@/modules/routes'
 import { PageTitle } from '@/packages/design-system/src/molecules/DashboardLayout'
 import { DashboardLayout } from '../../DashboardLayout'
@@ -17,20 +18,18 @@ import { PatientForm, type PatientFormSchema } from '../PatientForm'
 const InvitePatientPage = async () => {
   const invitePatient = async (form: PatientFormSchema) => {
     'use server'
-    const { callables } = await getAuthenticatedOnlyApp()
+    const { callables, docRefs } = await getAuthenticatedOnlyApp()
+    const clinician = await getDocDataOrThrow(docRefs.user(form.clinician))
     await callables.createInvitation({
       auth: {
         displayName: form.displayName,
         email: form.email,
-        phoneNumber: null,
-        photoURL: null,
       },
-      // TODO
-      patient: {
+      user: {
+        type: UserType.patient,
         clinician: form.clinician,
-        dateOfBirth: form.dateOfBirth,
+        organization: clinician.organization,
       },
-      user: { organization: form.organizationId },
     })
     redirect(routes.patients.index)
     // TODO: Confirmation message