Remove former members from each GitHub Team

rmacklin · Apr 1, 2020 · e036a44 · e036a44
1 parent dada76f
commit e036a44
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 15 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -3641,14 +3641,7 @@ function synchronizeTeamData(client, org, authenticatedUser, teams) {
             if (existingTeam) {
                 core.debug(`Existing team members for team slug ${teamSlug}:`);
                 core.debug(JSON.stringify(existingMembers));
-                for (const username of existingMembers) {
-                    if (!desiredMembers.includes(username)) {
-                        core.debug(`Removing ${username} from ${teamSlug}`);
-                    }
-                    else {
-                        core.debug(`Keeping ${username} in ${teamSlug}`);
-                    }
-                }
+                yield removeFormerTeamMembers(client, org, teamSlug, existingMembers, desiredMembers);
             }
             else {
                 core.debug(`No team was found in ${org} with slug ${teamSlug}. Creating one.`);
@@ -3658,6 +3651,19 @@ function synchronizeTeamData(client, org, authenticatedUser, teams) {
         }
     });
 }
+function removeFormerTeamMembers(client, org, teamSlug, existingMembers, desiredMembers) {
+    return __awaiter(this, void 0, void 0, function* () {
+        for (const username of existingMembers) {
+            if (!desiredMembers.includes(username)) {
+                core.debug(`Removing ${username} from ${teamSlug}`);
+                yield client.teams.removeMembershipInOrg({ org, team_slug: teamSlug, username });
+            }
+            else {
+                core.debug(`Keeping ${username} in ${teamSlug}`);
+            }
+        }
+    });
+}
 function addNewTeamMembers(client, org, teamSlug, existingMembers, desiredMembers) {
     return __awaiter(this, void 0, void 0, function* () {
         for (const username of desiredMembers) {

diff --git a/src/main.ts b/src/main.ts
@@ -46,13 +46,7 @@ async function synchronizeTeamData(
       core.debug(`Existing team members for team slug ${teamSlug}:`)
       core.debug(JSON.stringify(existingMembers))
 
-      for (const username of existingMembers) {
-        if (!desiredMembers.includes(username)) {
-          core.debug(`Removing ${username} from ${teamSlug}`)
-        } else {
-          core.debug(`Keeping ${username} in ${teamSlug}`)
-        }
-      }
+      await removeFormerTeamMembers(client, org, teamSlug, existingMembers, desiredMembers)
     } else {
       core.debug(`No team was found in ${org} with slug ${teamSlug}. Creating one.`)
       await createTeamWithNoMembers(client, org, teamName, teamSlug, authenticatedUser)
@@ -62,6 +56,23 @@ async function synchronizeTeamData(
   }
 }
 
+async function removeFormerTeamMembers(
+  client: github.GitHub,
+  org: string,
+  teamSlug: string,
+  existingMembers: string[],
+  desiredMembers: string[]
+): Promise<void> {
+  for (const username of existingMembers) {
+    if (!desiredMembers.includes(username)) {
+      core.debug(`Removing ${username} from ${teamSlug}`)
+      await client.teams.removeMembershipInOrg({org, team_slug: teamSlug, username})
+    } else {
+      core.debug(`Keeping ${username} in ${teamSlug}`)
+    }
+  }
+}
+
 async function addNewTeamMembers(
   client: github.GitHub,
   org: string,