Merge branch 'master' into bugfix-2fa-input-ux

canada-ca · Jul 27, 2023 · cbd84d8 · cbd84d8
2 parents 1bb828f + bb2e060
commit cbd84d8
Show file tree

Hide file tree

Showing 4 changed files with 145 additions and 44 deletions.
diff --git a/api/src/affiliation/mutations/request-org-affiliation.js b/api/src/affiliation/mutations/request-org-affiliation.js
@@ -5,6 +5,8 @@ import { t } from '@lingui/macro'
 import { inviteUserToOrgUnion } from '../unions'
 import { logActivity } from '../../audit-logs/mutations/log-activity'
 
+const { SERVICE_ACCOUNT_EMAIL } = process.env
+
 export const requestOrgAffiliation = new mutationWithClientMutationId({
   name: 'RequestOrgAffiliation',
   description: `This mutation allows users to request to join an organization.`,
@@ -146,6 +148,14 @@ export const requestOrgAffiliation = new mutationWithClientMutationId({
       throw new Error(i18n._(t`Unable to request invite. Please try again.`))
     }
 
+    if (typeof SERVICE_ACCOUNT_EMAIL !== 'undefined')
+      orgAdmins.push({
+        userName: SERVICE_ACCOUNT_EMAIL,
+        displayName: 'Service Account',
+        preferredLang: 'en',
+        _key: 'service-account',
+      })
+
     if (orgAdmins.length > 0) {
       const adminLink = `https://${request.get('host')}/admin/organizations`
       // send notification to org admins

diff --git a/app/bases/tracker-api-deployment.yaml b/app/bases/tracker-api-deployment.yaml
@@ -50,7 +50,7 @@ spec:
             - name: database-config
               mountPath: /app
       containers:
-        - image: gcr.io/track-compliance/api-js:master-0d8b7d2-1690200755 # {"$imagepolicy": "flux-system:api"}
+        - image: gcr.io/track-compliance/api-js:master-b60151d-1690482627 # {"$imagepolicy": "flux-system:api"}
           name: api
           ports:
             - containerPort: 4000