1953: Avoid non-null assertions for who am i

digitalfabrik · Feb 28, 2025 · a67a04a · a67a04a
1 parent d8923e1
commit a67a04a
Show file tree

Hide file tree

Showing 20 changed files with 55 additions and 46 deletions.
diff --git a/administration/src/KeepAliveToken.tsx b/administration/src/KeepAliveToken.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 
 import { TokenPayload } from './AuthProvider'
-import { WhoAmIContext } from './WhoAmIProvider'
+import { useWhoAmI } from './WhoAmIProvider'
 import { useAppToaster } from './bp-modules/AppToaster'
 import PasswordInput from './bp-modules/PasswordInput'
 import getMessageFromApolloError from './errors/getMessageFromApolloError'
@@ -24,7 +24,7 @@ const KeepAliveToken = ({ authData, onSignOut, onSignIn, children }: Props): Rea
   const { t } = useTranslation('auth')
   const navigate = useNavigate()
   const projectId = useContext(ProjectConfigContext).projectId
-  const email = useContext(WhoAmIContext).me!.email
+  const email = useWhoAmI().me.email
   const [secondsLeft, setSecondsLeft] = useState(computeSecondsLeft(authData))
   useEffect(() => {
     setSecondsLeft(computeSecondsLeft(authData))

diff --git a/administration/src/WhoAmIProvider.tsx b/administration/src/WhoAmIProvider.tsx
@@ -7,14 +7,23 @@ import StandaloneCenter from './bp-modules/StandaloneCenter'
 import { WhoAmIQuery, useWhoAmIQuery } from './generated/graphql'
 import { ProjectConfigContext } from './project-configs/ProjectConfigContext'
 
-export const WhoAmIContext = createContext<{
+type WhoAmIContextType = {
   me: WhoAmIQuery['me'] | null
   refetch: () => void
-}>({
+}
+
+export const WhoAmIContext = createContext<WhoAmIContextType>({
   me: null,
   refetch: () => undefined,
 })
 
+type UseWhoAmIReturn = WhoAmIContextType & { me: WhoAmIQuery['me'] }
+
+export const useWhoAmI = (): UseWhoAmIReturn => {
+  const { me, ...context } = useContext(WhoAmIContext)
+  return { me: me!, ...context }
+}
+
 const WhoAmIProvider = ({ children }: { children: ReactNode }): ReactElement => {
   const { t } = useTranslation('auth')
   const { projectId } = useContext(ProjectConfigContext)

diff --git a/administration/src/bp-modules/NavigationBar.tsx b/administration/src/bp-modules/NavigationBar.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { NavLink } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../WhoAmIProvider'
+import { useWhoAmI } from '../WhoAmIProvider'
 import { Role } from '../generated/graphql'
 import { ProjectConfigContext } from '../project-configs/ProjectConfigContext'
 import UserMenu from './UserMenu'
@@ -24,7 +24,7 @@ type Props = {
 const Navigation = ({ onSignOut }: Props): ReactElement => {
   const { t } = useTranslation('misc')
   const config = useContext(ProjectConfigContext)
-  const { region, role } = useContext(WhoAmIContext).me!
+  const { region, role } = useWhoAmI().me
   const canSeeProjectSettings =
     (role === Role.ProjectAdmin && config.userImportApiEnabled) || role === Role.ExternalVerifiedApiUser
 

diff --git a/administration/src/bp-modules/UserMenu.tsx b/administration/src/bp-modules/UserMenu.tsx
@@ -1,10 +1,10 @@
 import { Button, Divider, Menu, Popover } from '@blueprintjs/core'
-import React, { ReactElement, useContext, useState } from 'react'
+import React, { ReactElement, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NavLink, useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../WhoAmIProvider'
+import { useWhoAmI } from '../WhoAmIProvider'
 import roleToText from './users/utils/roleToText'
 
 type UserMenuProps = {
@@ -41,7 +41,7 @@ const RoleInfo = styled.span`
 `
 
 const UserMenu = ({ onSignOut }: UserMenuProps): ReactElement => {
-  const { role, email } = useContext(WhoAmIContext).me!
+  const { role, email } = useWhoAmI().me
   const { t } = useTranslation('misc')
   const [isOpen, setIsOpen] = useState<boolean>(false)
   const navigate = useNavigate()

diff --git a/administration/src/bp-modules/applications/ApplicationsController.tsx b/administration/src/bp-modules/applications/ApplicationsController.tsx
@@ -1,8 +1,8 @@
 import { NonIdealState } from '@blueprintjs/core'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Region, useGetApplicationsQuery } from '../../generated/graphql'
 import getQueryResult from '../util/getQueryResult'
 import ApplicationsOverview from './ApplicationsOverview'
@@ -21,7 +21,7 @@ const ApplicationsController = ({ region }: { region: Region }) => {
 }
 
 const ControllerWithRegion = (): ReactElement => {
-  const region = useContext(WhoAmIContext).me!.region
+  const region = useWhoAmI().me.region
   const { t } = useTranslation('errors')
 
   if (!region) {

diff --git a/administration/src/bp-modules/cards/AddCardsController.tsx b/administration/src/bp-modules/cards/AddCardsController.tsx
@@ -1,9 +1,9 @@
 import { NonIdealState, Spinner } from '@blueprintjs/core'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Region } from '../../generated/graphql'
 import useBlockNavigation from '../../util/useBlockNavigation'
 import AddCardsForm from './AddCardsForm'
@@ -65,7 +65,7 @@ const InnerAddCardsController = ({ region }: { region: Region }) => {
 }
 
 const AddCardsController = (): ReactElement => {
-  const { region } = useContext(WhoAmIContext).me!
+  const { region } = useWhoAmI().me
   const { t } = useTranslation('cards')
 
   if (!region) {

diff --git a/administration/src/bp-modules/cards/CreateCardsController.tsx b/administration/src/bp-modules/cards/CreateCardsController.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import StandaloneCenter from '../StandaloneCenter'
 import { FREINET_PARAM } from '../constants'
@@ -15,7 +15,7 @@ const Buttons = styled(ButtonGroup)`
 `
 
 const CreateCardsController = (): ReactElement => {
-  const { region } = useContext(WhoAmIContext).me!
+  const { region } = useWhoAmI().me
   const { freinetCSVImportEnabled } = useContext(ProjectConfigContext)
   const { t } = useTranslation('cards')
 

diff --git a/administration/src/bp-modules/cards/ImportCardsController.tsx b/administration/src/bp-modules/cards/ImportCardsController.tsx
@@ -1,9 +1,9 @@
 import { NonIdealState, Spinner } from '@blueprintjs/core'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Region } from '../../generated/graphql'
 import useBlockNavigation from '../../util/useBlockNavigation'
 import GenerationFinished from './CardsCreatedMessage'
@@ -63,7 +63,7 @@ const InnerImportCardsController = ({ region }: { region: Region }): ReactElemen
 }
 
 const ImportCardsController = (): ReactElement => {
-  const { region } = useContext(WhoAmIContext).me!
+  const { region } = useWhoAmI().me
   const { t } = useTranslation('errors')
   if (!region) {
     return <NonIdealState icon='cross' title={t('notAuthorized')} description={t('notAuthorizedToCreateCards')} />

diff --git a/administration/src/bp-modules/home/HomeController.tsx b/administration/src/bp-modules/home/HomeController.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { NavLink } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 
@@ -20,7 +20,7 @@ const Container = styled.div`
 
 const HomeController = (): ReactElement => {
   const { applicationFeature, cardStatistics, cardCreation, userImportApiEnabled } = useContext(ProjectConfigContext)
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   const { t } = useTranslation('home')
 
   return (

diff --git a/administration/src/bp-modules/project-settings/ProjectSettingsController.tsx b/administration/src/bp-modules/project-settings/ProjectSettingsController.tsx
@@ -3,7 +3,7 @@ import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import ApiTokenSettings from './ApiTokenSettings'
@@ -18,7 +18,7 @@ const ProjectSettingsContainer = styled.div`
 
 const ProjectSettingsController = (): ReactElement => {
   const { userImportApiEnabled } = useContext(ProjectConfigContext)
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   const { t } = useTranslation('errors')
 
   if ((role !== Role.ProjectAdmin || !userImportApiEnabled) && role !== Role.ExternalVerifiedApiUser) {

diff --git a/administration/src/bp-modules/regions/RegionController.tsx b/administration/src/bp-modules/regions/RegionController.tsx
@@ -1,9 +1,9 @@
 import { NonIdealState } from '@blueprintjs/core'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import DataPrivacyCard from './DataPrivacyCard'
 import RegionSettingsController from './RegionSettingsController'
@@ -17,7 +17,7 @@ const RegionSettingsContainer = styled.div`
 `
 
 const RegionController = (): ReactElement => {
-  const { region, role } = useContext(WhoAmIContext).me!
+  const { region, role } = useWhoAmI().me
   const { t } = useTranslation('errors')
   if (!region || role !== Role.RegionAdmin) {
     return <NonIdealState icon='cross' title={t('notAuthorized')} description={t('notAuthorizedForRegionSettings')} />

diff --git a/administration/src/bp-modules/regions/data-privacy-policy/DataPrivacyController.tsx b/administration/src/bp-modules/regions/data-privacy-policy/DataPrivacyController.tsx
@@ -1,8 +1,8 @@
 import { NonIdealState } from '@blueprintjs/core'
-import React, { ReactElement, useContext } from 'react'
+import React, { ReactElement } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../../WhoAmIProvider'
+import { useWhoAmI } from '../../../WhoAmIProvider'
 import { Role, useGetDataPolicyQuery } from '../../../generated/graphql'
 import getQueryResult from '../../util/getQueryResult'
 import DataPrivacyOverview from './DataPrivacyOverview'
@@ -24,7 +24,7 @@ const DataPrivacyController = ({ regionId }: { regionId: number }) => {
 }
 
 const DataPrivacyWithRegion = (): ReactElement => {
-  const { region, role } = useContext(WhoAmIContext).me!
+  const { region, role } = useWhoAmI().me
   const { t } = useTranslation('errors')
   if (!region || role !== Role.RegionAdmin) {
     return <NonIdealState icon='cross' title={t('notAuthorized')} description={t('notAuthorizedForDataPrivacy')} />

diff --git a/administration/src/bp-modules/statistics/StatisticsController.tsx b/administration/src/bp-modules/statistics/StatisticsController.tsx
@@ -2,7 +2,7 @@ import { NonIdealState } from '@blueprintjs/core'
 import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import {
   Region,
   Role,
@@ -61,7 +61,7 @@ const ViewRegionStatistics = ({ region }: { region: Region }) => {
   )
 }
 const StatisticsController = (): ReactElement => {
-  const { role, region } = useContext(WhoAmIContext).me!
+  const { role, region } = useWhoAmI().me
   const { cardStatistics } = useContext(ProjectConfigContext)
   const { t } = useTranslation('errors')
 

diff --git a/administration/src/bp-modules/statistics/StatisticsOverview.tsx b/administration/src/bp-modules/statistics/StatisticsOverview.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { CardStatisticsResultModel, Region, Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import downloadDataUri from '../../util/downloadDataUri'
@@ -18,7 +18,7 @@ type StatisticsOverviewProps = {
 }
 
 const StatisticsOverview = ({ statistics, onApplyFilter, region }: StatisticsOverviewProps): ReactElement => {
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   const appToaster = useAppToaster()
   const { cardStatistics } = useContext(ProjectConfigContext)
   const { t } = useTranslation('statistics')

diff --git a/administration/src/bp-modules/stores/StoresController.tsx b/administration/src/bp-modules/stores/StoresController.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import StandaloneCenter from '../StandaloneCenter'
@@ -16,7 +16,7 @@ const Buttons = styled(ButtonGroup)`
 
 const StoresController = (): ReactElement => {
   const navigate = useNavigate()
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   const storesManagement = useContext(ProjectConfigContext).storesManagement
   const { t } = useTranslation('stores')
 

diff --git a/administration/src/bp-modules/stores/StoresImportController.tsx b/administration/src/bp-modules/stores/StoresImportController.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import getMessageFromApolloError from '../../errors/getMessageFromApolloError'
 import { Role, useImportAcceptingStoresMutation } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
@@ -95,7 +95,7 @@ const StoresImport = ({ fields }: StoreImportProps): ReactElement => {
 }
 
 const StoresImportController = (): ReactElement => {
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   const storesManagement = useContext(ProjectConfigContext).storesManagement
   const { t } = useTranslation('errors')
   if (role !== Role.ProjectStoreManager || !storesManagement.enabled) {

diff --git a/administration/src/bp-modules/user-settings/ChangePasswordForm.tsx b/administration/src/bp-modules/user-settings/ChangePasswordForm.tsx
@@ -2,7 +2,7 @@ import { Button, Callout, H2 } from '@blueprintjs/core'
 import React, { ReactElement, useContext, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import getMessageFromApolloError from '../../errors/getMessageFromApolloError'
 import { useChangePasswordMutation } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
@@ -36,7 +36,7 @@ const ChangePasswordForm = (): ReactElement => {
   })
 
   const project = useContext(ProjectConfigContext).projectId
-  const email = useContext(WhoAmIContext).me!.email
+  const email = useWhoAmI().me.email
 
   const isDirty = newPassword !== '' || repeatNewPassword !== ''
 

diff --git a/administration/src/bp-modules/user-settings/UserSettingsController.tsx b/administration/src/bp-modules/user-settings/UserSettingsController.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, useContext } from 'react'
 import styled from 'styled-components'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import ActivityLogCard from './ActivityLogCard'
@@ -18,7 +18,7 @@ const UserSettingsContainer = styled.div`
 
 const UserSettingsController = (): ReactElement => {
   const { applicationFeature, activityLogConfig, projectId } = useContext(ProjectConfigContext)
-  const { role } = useContext(WhoAmIContext).me!
+  const { role } = useWhoAmI().me
   return (
     <UserSettingsContainer>
       {applicationFeature && role !== Role.ProjectAdmin && <NotificationSettings projectId={projectId} />}

diff --git a/administration/src/bp-modules/users/ManageUsersController.tsx b/administration/src/bp-modules/users/ManageUsersController.tsx
@@ -2,7 +2,7 @@ import { Card, H3, NonIdealState } from '@blueprintjs/core'
 import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import {
   Region,
   Role,
@@ -78,7 +78,7 @@ const ManageRegionUsers = ({ region }: { region: Region }) => {
 
 const ManageUsersController = (): ReactElement => {
   const { t } = useTranslation('errors')
-  const { role, region } = useContext(WhoAmIContext).me!
+  const { role, region } = useWhoAmI().me
   if (role === Role.RegionAdmin && region) {
     return <ManageRegionUsers region={region} />
   }

diff --git a/administration/src/bp-modules/users/RoleSelector.tsx b/administration/src/bp-modules/users/RoleSelector.tsx
@@ -2,7 +2,7 @@ import { HTMLSelect } from '@blueprintjs/core'
 import React, { ReactElement, useContext } from 'react'
 import { useTranslation } from 'react-i18next'
 
-import { WhoAmIContext } from '../../WhoAmIProvider'
+import { useWhoAmI } from '../../WhoAmIProvider'
 import { Role } from '../../generated/graphql'
 import { ProjectConfigContext } from '../../project-configs/ProjectConfigContext'
 import roleToText from './utils/roleToText'
@@ -18,7 +18,7 @@ const RoleSelector = ({
 }): ReactElement => {
   const { t } = useTranslation('users')
   const config = useContext(ProjectConfigContext)
-  const { role: currentUserRole } = useContext(WhoAmIContext).me!
+  const { role: currentUserRole } = useWhoAmI().me
 
   return (
     <HTMLSelect fill onChange={e => onChange((e.target.value as Role | null) ?? null)} value={role ?? ''} required>