chore: create default organization when none is available (#1221)

* fix: fix header design

* chore: add organization service

* chore: create new organization when none exists with fake token

* chore: remove organisation id from ward queries

* fix: fix lint

Author: DasProffi

api-services/authentication/grpc_metadata.ts

@@ -5,8 +5,7 @@ type AuthenticatedGrpcMetadata = {
   Authorization: string,
 }
 
-const defaultOrganization = `3b25c6f5-4705-4074-9fc6-a50c28eba406`
-export const getAuthenticatedGrpcMetadata = (_: string = defaultOrganization): AuthenticatedGrpcMetadata => {
+export const getAuthenticatedGrpcMetadata = (): AuthenticatedGrpcMetadata => {
   const token = KeycloakService.getCurrentTokenAndUpdateInBackground()
   return { Authorization: `Bearer ${token}` }
 }

api-services/authentication/useAuth.tsx

@@ -2,8 +2,8 @@ import type { Dispatch, PropsWithChildren, SetStateAction } from 'react'
 import { createContext, useContext, useEffect, useRef, useState } from 'react'
 import { z } from 'zod'
 import keycloakInstance, { KeycloakService } from '../util/keycloak'
-import { createPersonalOrganization } from '../mutations/users/organization_mutations'
 import { getAPIServiceConfig } from '../config/config'
+import { OrganizationService } from '../service/users/OrganizationService'
 
 const IdTokenClaimsSchema = z.object({
   sub: z.string().uuid(),
@@ -19,20 +19,6 @@ const IdTokenClaimsSchema = z.object({
   }).optional()
 })
 
-export const fakeToken = IdTokenClaimsSchema.default({
-  sub: '18159713-5d4e-4ad5-94ad-fbb6bb147984',
-  email: '[email protected]',
-  email_verified: true,
-  name: 'Max Mustermann',
-  preferred_username: 'max.mustermann',
-  given_name: 'Max',
-  family_name: 'Mustermann',
-  organization: {
-    id: '3b25c6f5-4705-4074-9fc6-a50c28eba406',
-    name: 'helpwave fake'
-  }
-})
-
 const config = getAPIServiceConfig()
 
 const UserFromIdTokenClaims = IdTokenClaimsSchema.transform((obj) => ({
@@ -63,15 +49,15 @@ const tokenToUser = (token: string): User | null => {
 
   // eslint-disable-next-line @typescript-eslint/ban-ts-comment
   // @ts-ignore
-  if (Object.keys(decoded?.organization).length === 0) delete decoded.organization
+  if (decoded.organization && Object.keys(decoded.organization).length === 0) delete decoded.organization
 
   const parsed = UserFromIdTokenClaims.safeParse(decoded)
   return parsed.success ? parsed.data : null
 }
 
 type AuthContextValue = {
   user?: User,
-  setUser?: Dispatch<SetStateAction<User|undefined>>,
+  setUser?: Dispatch<SetStateAction<User | undefined>>,
   token?: string,
   organization?: {
     id: string,
@@ -87,8 +73,10 @@ const defaultAuthContextValue: AuthContextValue = {
   token: undefined,
   organization: undefined,
   organizations: [],
-  signOut: () => {},
-  redirectUserToOrganizationSelection: () => {}
+  signOut: () => {
+  },
+  redirectUserToOrganizationSelection: () => {
+  }
 }
 
 const AuthContext = createContext<AuthContextValue>(defaultAuthContextValue)
@@ -120,11 +108,49 @@ export const ProvideAuth = ({ children }: PropsWithChildren) => {
 
   useEffect(() => {
     if (config.fakeTokenEnable) {
-      const user = tokenToUser(config.fakeToken)
+      const user: User | null = tokenToUser(config.fakeToken)
       if (!user) throw new Error('Invalid fake token')
-      didInit.current = true
-      setUser(user)
-      setToken(config.fakeToken)
+      try {
+        OrganizationService.getForUser().then(organizations => {
+          console.log(`Found ${organizations.length} organizations for fake token user`)
+          if (organizations.length > 0) {
+            const organization = organizations[0]!
+            console.log(`Using ${organization.longName} for user.`, organization)
+            setUser(() => ({
+              ...user,
+              organization: {
+                id: organization.id,
+                name: organization.longName,
+              }
+            }))
+            setToken(config.fakeToken)
+            didInit.current = true
+          } else {
+            console.log('Creating a new organization')
+            OrganizationService.create({
+              id: '',
+              email: '[email protected]',
+              longName: 'Test Organization',
+              shortName: 'Test-Org',
+              avatarURL: 'https://helpwave.de/favicon.ico',
+              isPersonal: false,
+              isVerified: false,
+            }).then(organization => {
+              setUser(() => ({
+                ...user,
+                organization: {
+                  id: organization.id,
+                  name: organization.longName,
+                }
+              }))
+              setToken(config.fakeToken)
+              didInit.current = true
+            })
+          }
+        })
+      } catch (e) {
+        console.error('Use auth with fake token failed', e)
+      }
       return
     }
 
@@ -147,7 +173,7 @@ export const ProvideAuth = ({ children }: PropsWithChildren) => {
 
       if (!user?.organization?.id) {
         console.info('after init keycloak, no organization found, creating personal')
-        createPersonalOrganization()
+        OrganizationService.createPersonal()
           .then(() => {
             keycloakInstance?.updateToken(-1)
               .then(() => {

api-services/config/config.ts

@@ -84,7 +84,6 @@ const getAPIServiceConfig = () => {
   const maybeConfig = configSchema.safeParse({
     NODE_ENV: process.env.NODE_ENV,
     NEXT_PUBLIC_API_URL: process.env['NEXT_PUBLIC_API_URL'],
-    NEXT_PUBLIC_OFFLINE_API: process.env['NEXT_PUBLIC_OFFLINE_API'],
     NEXT_PUBLIC_REQUEST_LOGGING: process.env['NEXT_PUBLIC_REQUEST_LOGGING'],
     NEXT_PUBLIC_OAUTH_ISSUER_URL: process.env['NEXT_PUBLIC_OAUTH_ISSUER_URL'],
     NEXT_PUBLIC_OAUTH_REDIRECT_URI: process.env['NEXT_PUBLIC_OAUTH_REDIRECT_URI'],

api-services/environment.d.ts

@@ -2,7 +2,6 @@ declare namespace NodeJS {
   interface ProcessEnv {
     NODE_ENV?: string,
     NEXT_PUBLIC_API_URL?: string,
-    NEXT_PUBLIC_OFFLINE_API?: string,
     NEXT_PUBLIC_REQUEST_LOGGING?: string,
     NEXT_PUBLIC_OAUTH_ISSUER_URL?: string,
     NEXT_PUBLIC_OAUTH_REDIRECT_URI?: string,

api-services/mutations/tasks/ward_mutations.ts

@@ -18,7 +18,7 @@ export const useWardOverviewsQuery = (organisationId?: string) => {
     queryKey: [QueryKeys.wards, organisationId],
     queryFn: async () => {
       const req = new GetWardOverviewsRequest()
-      const res = await APIServices.ward.getWardOverviews(req, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.ward.getWardOverviews(req, getAuthenticatedGrpcMetadata())
 
       const wards: WardOverviewDTO[] = res.getWardsList().map((ward) => ({
         id: ward.getId(),
@@ -34,7 +34,7 @@ export const useWardOverviewsQuery = (organisationId?: string) => {
   })
 }
 
-export const useWardDetailsQuery = (wardId?: string, organizationId?: string) => {
+export const useWardDetailsQuery = (wardId?: string) => {
   return useQuery({
     queryKey: [QueryKeys.wards, wardId],
     enabled: !!wardId,
@@ -45,7 +45,7 @@ export const useWardDetailsQuery = (wardId?: string, organizationId?: string) =>
 
       const req = new GetWardDetailsRequest()
       req.setId(wardId)
-      const res = await APIServices.ward.getWardDetails(req, getAuthenticatedGrpcMetadata(organizationId))
+      const res = await APIServices.ward.getWardDetails(req, getAuthenticatedGrpcMetadata())
 
       return {
         id: res.getId(),
@@ -70,13 +70,13 @@ export const useWardDetailsQuery = (wardId?: string, organizationId?: string) =>
   })
 }
 
-export const useWardQuery = (id: string, organisationId?: string) => useQuery({
+export const useWardQuery = (id: string) => useQuery({
   queryKey: [QueryKeys.wards, id],
   enabled: !!id,
   queryFn: async (): Promise<WardMinimalDTO> => {
     const req = new GetWardRequest()
     req.setId(id)
-    const res = await APIServices.ward.getWard(req, getAuthenticatedGrpcMetadata(organisationId))
+    const res = await APIServices.ward.getWard(req, getAuthenticatedGrpcMetadata())
 
     if (!res.toObject()) {
       console.error('error in Ward query')
@@ -89,14 +89,14 @@ export const useWardQuery = (id: string, organisationId?: string) => useQuery({
   }
 })
 
-export const useWardUpdateMutation = (organisationId?: string, callback: (ward: WardMinimalDTO) => void = noop) => {
+export const useWardUpdateMutation = (callback: (ward: WardMinimalDTO) => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (ward: WardMinimalDTO) => {
       const req = new UpdateWardRequest()
       req.setId(ward.id)
       req.setName(ward.name)
-      await APIServices.ward.updateWard(req, getAuthenticatedGrpcMetadata(organisationId))
+      await APIServices.ward.updateWard(req, getAuthenticatedGrpcMetadata())
 
       callback(ward)
     },
@@ -106,13 +106,13 @@ export const useWardUpdateMutation = (organisationId?: string, callback: (ward:
   })
 }
 
-export const useWardCreateMutation = (organisationId?: string, callback: (ward: WardMinimalDTO) => void = noop) => {
+export const useWardCreateMutation = (callback: (ward: WardMinimalDTO) => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (ward: WardMinimalDTO) => {
       const createWardRequest = new CreateWardRequest()
       createWardRequest.setName(ward.name)
-      const res = await APIServices.ward.createWard(createWardRequest, getAuthenticatedGrpcMetadata(organisationId))
+      const res = await APIServices.ward.createWard(createWardRequest, getAuthenticatedGrpcMetadata())
       const newWard: WardMinimalDTO = {
         ...ward,
         id: res.getId()
@@ -126,13 +126,13 @@ export const useWardCreateMutation = (organisationId?: string, callback: (ward:
   })
 }
 
-export const useWardDeleteMutation = (organisationId?: string, callback: () => void = noop) => {
+export const useWardDeleteMutation = (callback: () => void = noop) => {
   const queryClient = useQueryClient()
   return useMutation({
     mutationFn: async (wardId: string) => {
       const req = new DeleteWardRequest()
       req.setId(wardId)
-      await APIServices.ward.deleteWard(req, getAuthenticatedGrpcMetadata(organisationId))
+      await APIServices.ward.deleteWard(req, getAuthenticatedGrpcMetadata())
 
       callback()
     },