Service Account Setup

functions/package.json

@@ -25,11 +25,11 @@
   },
   "main": "lib/index.js",
   "dependencies": {
-    "@stanfordbdhg/engagehf-models": "file:models",
     "@resvg/resvg-js": "^2.6.2",
+    "@stanfordbdhg/engagehf-models": "file:models",
     "d3": "^7.9.0",
     "firebase-admin": "^12.0",
-    "firebase-functions": "^5.0.1",
+    "firebase-functions": "^5.1.1",
     "jsdom": "^24.1.0",
     "jspdf": "^2.5.1",
     "jspdf-autotable": "^3.8.2",

functions/src/functions/helpers.ts

@@ -18,54 +18,17 @@ import {
 } from 'firebase-functions/v2/https'
 import { z } from 'zod'
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable @typescript-eslint/no-redundant-type-constituents */
-
-export function validatedOnCall<
-  Schema extends z.ZodTypeAny,
-  Return = any | Promise<any>,
->(
+export function validatedOnCall<Schema extends z.ZodTypeAny, Return>(
   name: string,
   schema: Schema,
   handler: (request: CallableRequest<z.output<Schema>>) => Return,
+  options: CallableOptions = {
+    invoker: 'public',
+    serviceAccount: `cloudfunctionsserviceaccount@${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`,
+  },
 ): CallableFunction<
   z.input<Schema>,
   Return extends Promise<unknown> ? Return : Promise<Return>
-> {
-  return onCall((request) => {
-    try {
-      logger.debug(
-        `onCall(${name}) from user '${request.auth?.uid}' with ${JSON.stringify(request.data)}`,
-      )
-      request.data = schema.parse(request.data) as z.output<Schema>
-      return handler(request)
-    } catch (error) {
-      logger.debug(
-        `onCall(${name}) from user '${request.auth?.uid}' failed with ${String(error)}.`,
-      )
-      if (error instanceof z.ZodError) {
-        throw new https.HttpsError(
-          'invalid-argument',
-          'Invalid request data',
-          error.errors,
-        )
-      }
-      throw error
-    }
-  })
-}
-
-export function validatedOnCallWithOptions<
-  Schema extends z.ZodTypeAny,
-  Return = any | Promise<any>,
->(
-  name: string,
-  schema: Schema,
-  options: CallableOptions,
-  handler: (request: CallableRequest<z.output<Schema>>) => Return,
-): CallableFunction<
-  z.output<Schema>,
-  Return extends Promise<unknown> ? Return : Promise<Return>
 > {
   return onCall(options, (request) => {
     try {
@@ -98,37 +61,10 @@ export function validatedOnRequest<Schema extends z.ZodTypeAny>(
     data: z.output<Schema>,
     response: Response,
   ) => void | Promise<void>,
-): https.HttpsFunction {
-  return onRequest(async (request, response) => {
-    try {
-      logger.debug(`onRequest(${name}) with ${JSON.stringify(request.body)}`)
-      const data = schema.parse(request.body) as z.output<Schema>
-      await handler(request, data, response)
-      return
-    } catch (error) {
-      logger.debug(`onRequest(${name}) failed with ${String(error)}.`)
-      if (error instanceof z.ZodError) {
-        response.status(400).send({
-          code: 'invalid-argument',
-          message: 'Invalid request data',
-          details: error.errors,
-        })
-        return
-      }
-      throw error
-    }
-  })
-}
-
-export function validatedOnRequestWithOptions<Schema extends z.ZodTypeAny>(
-  name: string,
-  schema: Schema,
-  options: https.HttpsOptions,
-  handler: (
-    request: Request,
-    data: z.output<Schema>,
-    response: Response,
-  ) => void | Promise<void>,
+  options: https.HttpsOptions = {
+    invoker: 'public',
+    serviceAccount: `cloudfunctionsserviceaccount@${process.env.GCLOUD_PROJECT}.iam.gserviceaccount.com`,
+  },
 ): https.HttpsFunction {
   return onRequest(options, async (request, response) => {
     try {

functions/src/healthSummary/generate.test.ts

@@ -23,7 +23,9 @@ describe('generateHealthSummary', () => {
         .split('\n')
         .filter(
           (line) =>
-            !line.startsWith('/CreationDate ') && !line.startsWith('/ID '),
+            !line.startsWith('/CreationDate ') &&
+            !line.startsWith('/ID ') &&
+            !line.startsWith('/Producer '),
         )
         .join('\n')
     }