fix(SA-675): filter out suspended and archived Google users

- Add query parameter to filter suspended users at API level
- Add secondary filter in formatUserList for archived users
- Include suspended/archived fields in API response
- Add tests for suspended/archived user filtering

Author: gjarzebak95

src/google.ts

@@ -31,7 +31,8 @@ export async function getGithubUsersFromGoogle(): Promise<Set<string>> {
     customer: 'my_customer',
     maxResults: 250,
     projection: 'custom',
-    fields: 'users(customSchemas/Accounts/github(value))',
+    query: 'isSuspended=false',
+    fields: 'users(customSchemas/Accounts/github(value),suspended,archived)',
     customFieldMask: 'Accounts',
   })
 
@@ -43,6 +44,7 @@ export async function getGithubUsersFromGoogle(): Promise<Set<string>> {
 export function formatUserList(users): Set<string> {
   return new Set(
     users
+      .filter((user) => !user.suspended && !user.archived)
       .map((user) => user.customSchemas?.Accounts?.github?.map((account) => account.value?.toLowerCase()))
       .flat()
       .filter(Boolean),

tests/google.spec.ts

@@ -3,19 +3,30 @@ import { google } from 'googleapis'
 import * as mod from '../src/google'
 
 const fakeUsersResponse = [
-  { customSchemas: { Accounts: { github: [{ value: 'chrisns' }] } } },
+  { customSchemas: { Accounts: { github: [{ value: 'chrisns' }] } }, suspended: false, archived: false },
   {
     customSchemas: {
       Accounts: { github: [{ value: 'Foo' }, , { value: 'tar' }] },
     },
+    suspended: false,
+    archived: false,
   },
   {
     customSchemas: {
       Accounts: { github: [{ value: 'foo' }, { value: 'bar' }] },
     },
+    suspended: false,
+    archived: false,
   },
 ]
 
+const fakeUsersResponseWithSuspended = [
+  { customSchemas: { Accounts: { github: [{ value: 'activeuser' }] } }, suspended: false, archived: false },
+  { customSchemas: { Accounts: { github: [{ value: 'suspendeduser' }] } }, suspended: true, archived: false },
+  { customSchemas: { Accounts: { github: [{ value: 'archiveduser' }] } }, suspended: false, archived: true },
+  { customSchemas: { Accounts: { github: [{ value: 'botharchivedandsuspended' }] } }, suspended: true, archived: true },
+]
+
 describe('google integration', () => {
   beforeEach(() => {
     process.env.GOOGLE_EMAIL_ADDRESS = 'hello@example.com'
@@ -49,12 +60,26 @@ describe('google integration', () => {
   it('formatUserList bad', () =>
     expect(
       mod.formatUserList([
-        {},
-        { customSchemas: {} },
-        { customSchemas: { Accounts: {} } },
-        { customSchemas: { Accounts: { github: [] } } },
-        { customSchemas: { Accounts: { github: [{}] } } },
-        { customSchemas: { Accounts: { github: [{ value: 'chrisns' }] } } },
+        { suspended: false, archived: false },
+        { customSchemas: {}, suspended: false, archived: false },
+        { customSchemas: { Accounts: {} }, suspended: false, archived: false },
+        { customSchemas: { Accounts: { github: [] } }, suspended: false, archived: false },
+        { customSchemas: { Accounts: { github: [{}] } }, suspended: false, archived: false },
+        { customSchemas: { Accounts: { github: [{ value: 'chrisns' }] } }, suspended: false, archived: false },
       ]),
     ).toMatchSnapshot())
+
+  it('formatUserList filters out suspended users', () => {
+    const result = mod.formatUserList(fakeUsersResponseWithSuspended)
+    expect(result).toEqual(new Set(['activeuser']))
+  })
+
+  it('formatUserList filters out archived users', () => {
+    const users = [
+      { customSchemas: { Accounts: { github: [{ value: 'active' }] } }, suspended: false, archived: false },
+      { customSchemas: { Accounts: { github: [{ value: 'archived' }] } }, suspended: false, archived: true },
+    ]
+    const result = mod.formatUserList(users)
+    expect(result).toEqual(new Set(['active']))
+  })
 })