Remove user from team

Author: ncalteen

badges/coverage.svg

@@ -281,6 +281,9 @@ export async function removeAdmin(
     }
   }
 
+  // Remove from the team.
+  await teams.removeUser(request, user)
+
   await issues.complete(request, payload.issue)
 
   core.info(`Removed Admin from Class Request: #${payload.issue.number}`)
@@ -377,6 +380,9 @@ export async function removeUser(
       repo: repos.generateRepoName(request, user)
     })
 
+  // Remove from the team.
+  await teams.removeUser(request, user)
+
   await issues.complete(request, payload.issue)
 
   core.info(`Removed User from Class Request: #${payload.issue.number}`)

dist/github/teams.d.ts

@@ -345,7 +345,7 @@ export function generateMessage(request: ClassRequest): string {
       email: payload.comment.body.split(' ')[1].split(',')[1]
     }
 
-    return `The following member has been removed: ${user.handle}`
+    return `The following member has been removed: \`${user.handle}\``
   }
 
   throw new Error(`Invalid Action: ${request.action}`)

dist/index.js

@@ -95,6 +95,7 @@ export async function create(request: ClassRequest): Promise<Team> {
  *
  * @param request Class Request
  * @param user User to Add
+ * @param role Role to Assign
  */
 export async function addUser(
   request: ClassRequest,
@@ -118,6 +119,45 @@ export async function addUser(
   core.info(`Added User to Class Team: ${user.handle}`)
 }
 
+/**
+ * Removes a member to the team.
+ *
+ * @param request Class Request
+ * @param user User to Remove
+ */
+export async function removeUser(
+  request: ClassRequest,
+  user: User
+): Promise<void> {
+  core.info(`Removing User from Class Team: ${user.handle}`)
+
+  // Create the authenticated Octokit client.
+  const token: string = core.getInput('github_token', { required: true })
+  const octokit = github.getOctokit(token)
+
+  try {
+    // Check if the user is a member (they must have accepted the invitation).
+    const membership = await octokit.rest.teams.getMembershipForUserInOrg({
+      org: Common.OWNER,
+      team_slug: generateTeamName(request),
+      username: user.handle
+    })
+
+    // Remove the user from the team.
+    if (membership.data.state === 'active')
+      await octokit.rest.teams.removeMembershipForUserInOrg({
+        org: Common.OWNER,
+        team_slug: generateTeamName(request),
+        username: user.handle
+      })
+  } catch (error: any) {
+    // If the user could not be found, they're not in the organization.
+    if (error.status !== 404) throw error
+  }
+
+  core.info(`Removed User from Class Team: ${user.handle}`)
+}
+
 /**
  * Deletes the team.
  *