Revert onUserWritten changes

functions/src/functions/onUserWritten.ts

@@ -8,30 +8,41 @@
 
 import { type User, userConverter } from '@stanfordbdhg/engagehf-models'
 import { logger } from 'firebase-functions'
-import { onDocumentCreated } from 'firebase-functions/v2/firestore'
+import { onDocumentWritten } from 'firebase-functions/v2/firestore'
 import { DatabaseConverter } from '../services/database/databaseConverter.js'
 import { type Document } from '../services/database/databaseService.js'
 import { getServiceFactory } from '../services/factory/getServiceFactory.js'
 
-export const onUserWritten = onDocumentCreated(
+export const onUserWritten = onDocumentWritten(
   'users/{userId}',
   async (event) => {
-    if (event.data === undefined) return
     const factory = getServiceFactory()
     const userService = factory.user()
     try {
-      const converter = new DatabaseConverter(userConverter.value)
-      const userDoc: Document<User> = {
-        id: event.params.userId,
-        path: event.document,
-        content: converter.fromFirestore(event.data),
-        lastUpdate: new Date(event.time),
+      if (
+        event.data?.before.exists !== true &&
+        event.data?.after.exists === true
+      ) {
+        const converter = new DatabaseConverter(userConverter.value)
+        const userDoc: Document<User> = {
+          id: event.params.userId,
+          path: event.document,
+          content: converter.fromFirestore(event.data.after),
+          lastUpdate: new Date(event.time),
+        }
+        await userService.finishUserEnrollment(userDoc)
       }
-      await userService.finishUserEnrollment(userDoc)
     } catch (error) {
       logger.error(
         `Error finishing enrollment for user with id '${event.params.userId}' on change of user: ${String(error)}`,
       )
     }
+    try {
+      await userService.updateClaims(event.params.userId)
+    } catch (error) {
+      logger.error(
+        `Error processing claims update for userId '${event.params.userId}' on change of user: ${String(error)}`,
+      )
+    }
   },
 )

functions/src/services/user/databaseUserService.ts

@@ -58,6 +58,21 @@ export class DatabaseUserService implements UserService {
     })
   }
 
+  async updateClaims(userId: string): Promise<void> {
+    const user = await this.getUser(userId)
+    if (user === undefined) {
+      logger.error(
+        `DatabaseUserService.updateClaims(${userId}): User not found.`,
+      )
+      throw new https.HttpsError('not-found', 'User not found.')
+    }
+    logger.info(`DatabaseUserService.updateClaims(${userId}): User found.`)
+    await this.auth.setCustomUserClaims(userId, user.content.claims)
+    logger.info(
+      `DatabaseUserService.updateClaims(${userId}): User claims updated.`,
+    )
+  }
+
   // Invitations
 
   async createInvitation(content: Invitation): Promise<{ id: string }> {

functions/src/services/user/userService.mock.ts

@@ -44,6 +44,10 @@ export class MockUserService implements UserService {
     return
   }
 
+  async updateClaims(userId: String): Promise<void> {
+    return
+  }
+
   // Methods - Invitations
 
   async createInvitation(content: Invitation): Promise<{ id: string }> {

functions/src/services/user/userService.ts

@@ -24,6 +24,7 @@ export interface UserService {
 
   getAuth(userId: string): Promise<UserAuth>
   updateAuth(userId: string, auth: UserAuth): Promise<void>
+  updateClaims(userId: String): Promise<void>
 
   // Invitations