Refactor/user selection level

src/actions/mail/read.ts

@@ -7,7 +7,7 @@ import { readMailAliases } from '@/services/mail/alias/read'
 import { readMailingLists } from '@/services/mail/list/read'
 import { readMailAddressExternal } from '@/services/mail/mailAddressExternal/read'
 import { getUser } from '@/auth/getUser'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserContactInfoFiltered } from '@/services/users/Types'
 import type { MailListTypes } from '@/services/mail/Types'
 import type { MailingList, MailAlias, MailAddressExternal } from '@prisma/client'
 import type { ActionReturn } from '@/actions/Types'
@@ -35,7 +35,7 @@ export async function readMailOptions(): Promise<ActionReturn<{
     alias: MailAlias[],
     mailingList: MailingList[],
     mailaddressExternal: MailAddressExternal[],
-    users: UserFiltered[],
+    users: UserContactInfoFiltered[],
 }>> {
     const { authorized, status } = await getUser({
         requiredPermissions: [

src/app/(auth)/register-email/EmailregistrationForm.tsx

@@ -4,12 +4,12 @@ import Form from '@/components/Form/Form'
 import TextInput from '@/components/UI/TextInput'
 import { useSearchParams, useRouter } from 'next/navigation'
 import { useState } from 'react'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserContactInfoFiltered } from '@/services/users/Types'
 
 export default function EmailRegistrationForm({
-    user
+    user,
 }: {
-    user: UserFiltered
+    user: UserContactInfoFiltered,
 }) {
     const searchParams = useSearchParams()
     const callbackUrl = searchParams.get('callbackUrl') || '/users/me'

src/app/admin/mail/[filter]/[id]/MailFlow.tsx

@@ -14,7 +14,7 @@ import type { MailFlowObject, MailListTypes } from '@/services/mail/Types'
 
 type DestroyFunction = null | ((id: number) => Promise<ActionReturn<null>>)
 
-export default async function MailFlow({
+export default function MailFlow({
     filter,
     id,
     data,

src/app/admin/mail/[filter]/[id]/mailList.tsx

@@ -8,7 +8,7 @@ import { useState } from 'react'
 import type { ActionReturn } from '@/actions/Types'
 import type { MailListTypes, ViaArrayType } from '@/services/mail/Types'
 import type { Group, MailAddressExternal, MailAlias, MailingList } from '@prisma/client'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 
 const typeDisplayName: Record<MailListTypes, string> = {
     alias: 'Alias',
@@ -22,7 +22,7 @@ type TypeConversion = {
     alias: (MailAlias & ViaArrayType),
     mailingList: (MailingList & ViaArrayType),
     group: (Group & ViaArrayType),
-    user: (UserFiltered & ViaArrayType),
+    user: (UserNameFiltered & ViaArrayType),
     mailaddressExternal: (MailAddressExternal & ViaArrayType),
 }
 

src/app/layout.tsx

@@ -1,4 +1,5 @@
 import styles from './layout.module.scss'
+import { unwrapActionReturn } from './redirectToErrorPage'
 import { SessionProvider } from '@/auth/useUser'
 import MobileNavBar from '@/components/NavBar/MobileNavBar'
 import NavBar from '@/components/NavBar/NavBar'
@@ -8,14 +9,13 @@ import EditModeProvider from '@/contexts/EditMode'
 import PopUpProvider from '@/contexts/PopUp'
 import DefaultPermissionsProvider from '@/contexts/DefaultPermissions'
 import { readDefaultPermissionsAction } from '@/actions/permissionRoles/read'
+import { readUserProfileAction } from '@/actions/users/read'
 import { Inter } from 'next/font/google'
 import '@/styles/globals.scss'
 import { config } from '@fortawesome/fontawesome-svg-core'
 import '@fortawesome/fontawesome-svg-core/styles.css'
 import { getServerSession } from 'next-auth'
 import type { ReactNode } from 'react'
-import { readUserProfileAction } from '@/actions/users/read'
-import { unwrapActionReturn } from './redirectToErrorPage'
 
 config.autoAddCss = false
 
@@ -24,7 +24,6 @@ const inter = Inter({ subsets: ['latin'] })
 export const metadata = {
     title: 'projectnext',
     description: '',
-    charset: 'utf-8',
 }
 
 type PropTypes = {

src/app/users/[username]/(user-admin)/notifications/notificationSettings.tsx

@@ -10,7 +10,7 @@ import { updateSubscriptionsAction } from '@/actions/notifications/subscription/
 import { SUCCESS_FEEDBACK_TIME } from '@/components/Form/ConfigVars'
 import { v4 as uuid } from 'uuid'
 import { useState } from 'react'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 import type { MinimizedSubscription, Subscription } from '@/services/notifications/subscription/Types'
 import type { NotificationBranch } from './Types'
 import type { ErrorMessage } from '@/services/error'
@@ -131,17 +131,16 @@ function prepareDataForDelivery(tree: NotificationBranch) {
     return ret
 }
 
-type PropTypes = {
-    channels: ExpandedNotificationChannel[],
-    subscriptions: Subscription[],
-    user: UserFiltered
-}
 
 export default function NotificationSettings({
     channels,
     subscriptions,
-    user
-}: PropTypes) {
+    user,
+}: {
+    channels: ExpandedNotificationChannel[],
+    subscriptions: Subscription[],
+    user: UserNameFiltered,
+}) {
     const [channelTree, setChannelTree] = useState(
         generateChannelTree(channels, subscriptions)
     )

src/auth/Session.ts

@@ -6,13 +6,13 @@ import { decodeApiKey } from '@/services/api-keys/apiKeyEncoder'
 import { ServerError } from '@/services/error'
 import { getServerSession as getSessionNextAuth } from 'next-auth'
 import type { Permission } from '@prisma/client'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserAuthFiltered } from '@/services/users/Types'
 import type { MembershipFiltered } from '@/services/groups/memberships/Types'
 
 export type UserGuaranteeOption = 'HAS_USER' | 'NO_USER'
 
 export type SessionType<UserGuarantee extends UserGuaranteeOption> = {
-    user: UserGuarantee extends 'HAS_USER' ? UserFiltered : (
+    user: UserGuarantee extends 'HAS_USER' ? UserAuthFiltered : (
         UserGuarantee extends 'NO_USER' ? null : never
     ),
     permissions: Permission[],

src/auth/VevenAdapter.ts

@@ -4,7 +4,7 @@ import { createFeideAccount } from '@/services/auth/feideAccounts/create'
 import { readUserOrNullOfFeideAccount } from '@/services/auth/feideAccounts/read'
 import { UserMethods } from '@/services/users/methods'
 import { UserConfig } from '@/services/users/config'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserAuthFiltered } from '@/services/users/Types'
 import type { PrismaClient } from '@prisma/client'
 import type { Adapter, AdapterUser, AdapterAccount } from 'next-auth/adapters'
 
@@ -15,7 +15,7 @@ import type { Adapter, AdapterUser, AdapterAccount } from 'next-auth/adapters'
  * @param user - User of the type used in veven.
  * @returns User object of the type `AdapterUser`.
  */
-function convertToAdapterUser(user: UserFiltered): AdapterUser {
+function convertToAdapterUser(user: UserAuthFiltered): AdapterUser {
     return {
         ...user,
         id: String(user.id),
@@ -96,7 +96,7 @@ export default function VevenAdapter(prisma: PrismaClient): Adapter {
                     username,
                     emailVerified: null,
                 },
-                select: UserConfig.filterSelection,
+                select: UserConfig.filterAuthSelection,
             })
 
             return convertToAdapterUser(createdUser)
@@ -133,7 +133,7 @@ export default function VevenAdapter(prisma: PrismaClient): Adapter {
                 },
                 include: {
                     user: {
-                        select: UserConfig.filterSelection,
+                        select: UserConfig.filterAuthSelection,
                     },
                 },
             })
@@ -165,7 +165,7 @@ export default function VevenAdapter(prisma: PrismaClient): Adapter {
                     firstname: user.firstname,
                     lastname: user.lastname,
                 },
-                select: UserConfig.filterSelection,
+                select: UserConfig.filterAuthSelection,
             })
 
             return convertToAdapterUser(updatedUser)

src/auth/getUser.ts

@@ -7,7 +7,7 @@ import { notFound, redirect } from 'next/navigation'
 import type { Matrix } from '@/utils/checkMatrix'
 import type { Permission } from '@prisma/client'
 import type { MembershipFiltered } from '@/services/groups/memberships/Types'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserAuthFiltered } from '@/services/users/Types'
 
 type GetUserArgsType<ShouldRedirect extends boolean = false, UserRequired extends boolean = false> = {
     requiredPermissions?: Matrix<Permission>,
@@ -18,7 +18,7 @@ type GetUserArgsType<ShouldRedirect extends boolean = false, UserRequired extend
 }
 
 type AuthorizedGetUserReturnType<UserRequired extends boolean = false> = ({
-    user: UserFiltered,
+    user: UserAuthFiltered,
     status: 'AUTHORIZED',
 } | (
     UserRequired extends true ? never : {
@@ -35,7 +35,7 @@ type UnAuthorizedGetUserReturnType = ({
     user: null,
     status: 'UNAUTHENTICATED',
 } | {
-    user: UserFiltered,
+    user: UserAuthFiltered,
     status: 'UNAUTHORIZED',
 }) & {
     authorized: false,

src/auth/useUser.ts

@@ -6,7 +6,7 @@ import { useSession } from 'next-auth/react'
 import { usePathname, useRouter } from 'next/navigation'
 import { useContext, useEffect, useState } from 'react'
 import type { Permission } from '@prisma/client'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserAuthFiltered } from '@/services/users/Types'
 import type { Matrix } from '@/utils/checkMatrix'
 import type { MembershipFiltered } from '@/services/groups/memberships/Types'
 
@@ -23,7 +23,7 @@ type UseUserArgsType<ShouldRedirect extends boolean = false, UserRequired extend
 }
 
 type AuthorizedUseUserReturnType<UserRequired extends boolean = false> = ({
-    user: UserFiltered,
+    user: UserAuthFiltered,
     authorized: true,
     status: 'AUTHORIZED',
 } | (
@@ -50,7 +50,7 @@ type UseUserReturnType<UserRequired extends boolean = false> = (
     authorized: false,
     status: 'UNAUTHENTICATED',
 } | {
-    user: UserFiltered,
+    user: UserAuthFiltered,
     authorized: false,
     status: 'UNAUTHORIZED',
 }) & {

src/contexts/UserSelection.tsx

@@ -1,27 +1,27 @@
 'use client'
 import { createContext, useEffect, useRef, useState } from 'react'
 import type { ReactNode } from 'react'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 
 type PropTypes = {
     children: ReactNode
-    initialUser?: UserFiltered | null
+    initialUser?: UserNameFiltered | null
 }
 
 /**
  * Context designed to be used with UserPagingContext and UserList.
  * If UserList is rendered inside IserSelectionProvider, it will display a checkbox next to each user.
  */
 export const UserSelectionContext = createContext<{
-    user: UserFiltered | null
-    setUser: (user: UserFiltered | null) => void
-    onSelection: (handler: (user: UserFiltered | null) => void) => void
+    user: UserNameFiltered | null
+    setUser: (user: UserNameFiltered | null) => void
+    onSelection: (handler: (user: UserNameFiltered | null) => void) => void
         } | null>(null)
 
-type Handler = (user: UserFiltered | null) => void
+type Handler = (user: UserNameFiltered | null) => void
 
 export default function UserSelectionProvider({ children, initialUser }: PropTypes) {
-    const [user, setUser] = useState<UserFiltered | null>(initialUser ? initialUser : null)
+    const [user, setUser] = useState<UserNameFiltered | null>(initialUser ? initialUser : null)
     const onSelection = useRef<Handler>(() => {})
     useEffect(() => {
         onSelection.current(user)

src/contexts/UsersSelection.tsx

@@ -2,7 +2,7 @@
 
 import { createContext, useState } from 'react'
 import type { ReactNode } from 'react'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 
 type PropTypes = {
     children: ReactNode
@@ -13,31 +13,31 @@ type PropTypes = {
  * If UserList is rendered inside IserSelectionProvider, it will display a checkbox next to each user.
  */
 export const UsersSelectionContext = createContext<{
-    users: UserFiltered[]
-    addUser: (user: UserFiltered) => void
-    removeUser: (user: UserFiltered) => void
-    toggle: (user: UserFiltered) => void
-    includes: (user: UserFiltered) => boolean
+    users: UserNameFiltered[]
+    addUser: (user: UserNameFiltered) => void
+    removeUser: (user: UserNameFiltered) => void
+    toggle: (user: UserNameFiltered) => void
+    includes: (user: UserNameFiltered) => boolean
         } | null>(null)
 
 export default function UsesrSelectionProvider({ children }: PropTypes) {
-    const [users, setUsers] = useState<UserFiltered[]>([])
+    const [users, setUsers] = useState<UserNameFiltered[]>([])
 
-    const addUser = (user: UserFiltered) => {
+    const addUser = (user: UserNameFiltered) => {
         setUsers([...users, user])
     }
-    const removeUser = (user: UserFiltered) => {
+    const removeUser = (user: UserNameFiltered) => {
         setUsers(users.filter(u => u !== user))
     }
-    const toggle = (user: UserFiltered) => {
+    const toggle = (user: UserNameFiltered) => {
         if (users.includes(user)) {
             removeUser(user)
         } else {
             addUser(user)
         }
     }
 
-    const includes = (user: UserFiltered) => users.includes(user)
+    const includes = (user: UserNameFiltered) => users.includes(user)
 
     return <UsersSelectionContext.Provider value={{ users, addUser, removeUser, toggle, includes }}>
         {children}

src/services/admission/Types.ts

@@ -1,6 +1,6 @@
 import type { AdmissionTrial } from '@prisma/client'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 
 export type ExpandedAdmissionTrail = AdmissionTrial & {
-    user: UserFiltered
+    user: UserNameFiltered
 }

src/services/admission/methods.ts

@@ -43,7 +43,7 @@ export namespace AdmissionMethods {
                 },
                 include: {
                     user: {
-                        select: UserConfig.filterSelection
+                        select: UserConfig.filterNameSelection,
                     }
                 }
             })

src/services/auth/methods.ts

@@ -49,7 +49,7 @@ export namespace AuthMethods {
                     emailVerified: new Date(),
                     email,
                 },
-                select: UserConfig.filterSelection
+                select: UserConfig.filterAuthSelection,
             })
         }
     })

src/services/mail/Types.ts

@@ -1,6 +1,6 @@
 
 import type { Group, MailAddressExternal, MailAlias, MailingList } from '@prisma/client'
-import type { UserFiltered } from '@/services/users/Types'
+import type { UserNameFiltered } from '@/services/users/Types'
 
 
 export const MailListTypeArray = ['alias', 'mailingList', 'group', 'user', 'mailaddressExternal'] as const
@@ -20,6 +20,6 @@ export type MailFlowObject = {
     alias: MailAlias[] & ViaArrayType,
     mailingList: MailingList[] & ViaArrayType,
     group: Group[] & ViaArrayType,
-    user: UserFiltered[] & ViaArrayType,
+    user: UserNameFiltered[] & ViaArrayType,
     mailaddressExternal: MailAddressExternal[] & ViaArrayType,
 }