Merge branch 'main' into arek/use-publish-action

StanfordBDHG · Jan 27, 2025 · 1ba9fcb · 1ba9fcb
2 parents 2db4813 + 7d1de11
commit 1ba9fcb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -242,8 +242,8 @@ Based on the [Extension](https://hl7.org/fhir/R4B/extensibility.html#Extension)
 |Property|Type|Values|Comments|
 |-|-|-|-|
 |medicationClass|string|-|A `medicationClassId` referring to a medicationClass specified in /medicationClasses/$medicationClassId$. One medication object may contain multiple medicationClass extension properties.|
-|minimumDailyDose|[SimpleQuantity](https://www.hl7.org/fhir/r4b/datatypes.html#SimpleQuantity)|-|Unit: mg/day. Occurs exactly once. Multi-ingredient tablets contain an array of double rather than a double.|
-|targetDailyDose|[SimpleQuantity](https://www.hl7.org/fhir/r4b/datatypes.html#SimpleQuantity)|-|Unit: mg/day. Occurs exactly once. Multi-ingredient tablets contain an array of double rather than a double.|
+|minimumDailyDose|[SimpleQuantity](https://www.hl7.org/fhir/R4B/datatypes.html#SimpleQuantity)|-|Unit: mg/day. Occurs exactly once. Multi-ingredient tablets contain an array of double rather than a double.|
+|targetDailyDose|[SimpleQuantity](https://www.hl7.org/fhir/R4B/datatypes.html#SimpleQuantity)|-|Unit: mg/day. Occurs exactly once. Multi-ingredient tablets contain an array of double rather than a double.|
 
 #### medications/$medicationId$/drugs/$drugId$
 

diff --git a/functions/src/flags.ts b/functions/src/flags.ts
@@ -10,4 +10,5 @@
 
 export namespace Flags {
   export const isEmulator = process.env.FUNCTIONS_EMULATOR === 'true'
+  export const requireInvitationOrganizationToMatchSsoProviderId = false
 }
diff --git a/functions/src/functions/blocking.ts b/functions/src/functions/blocking.ts
@@ -13,6 +13,7 @@ import {
   beforeUserSignedIn,
 } from 'firebase-functions/v2/identity'
 import { serviceAccount } from './helpers.js'
+import { Flags } from '../flags.js'
 import { getServiceFactory } from '../services/factory/getServiceFactory.js'
 
 export const beforeUserCreatedFunction = beforeUserCreated(
@@ -52,6 +53,8 @@ export const beforeUserCreatedFunction = beforeUserCreated(
     }
 
     if (
+      /* eslint-disable-next-line @typescript-eslint/no-unnecessary-condition */
+      Flags.requireInvitationOrganizationToMatchSsoProviderId &&
       invitation.content.user.type !== UserType.admin &&
       invitation.content.user.organization !== organization.id
     )