Use numerical org ID when assigning github teams

Author: devksingh4

src/api/functions/github.ts

@@ -101,7 +101,7 @@ async function resolveTeamIdToSlug({
   logger,
 }: {
   octokit: Octokit;
-  orgId: string;
+  orgId: number;
   teamId: number;
   logger: ValidLoggers;
 }): Promise<string> {
@@ -212,12 +212,14 @@ export async function assignIdpGroupsToTeam({
   groupsToSync,
   logger,
   orgId,
+  orgName,
 }: {
   githubToken: string;
   teamId: number;
   groupsToSync: string[];
   logger: ValidLoggers;
-  orgId: string;
+  orgId: number;
+  orgName: string;
 }) {
   try {
     const octokit = new Octokit({
@@ -267,7 +269,7 @@ export async function assignIdpGroupsToTeam({
     for (const groupId of groupsToSync) {
       const idpGroup = await findIdpGroupWithRetry({
         octokit,
-        orgId,
+        orgId: orgName,
         groupId,
         logger,
         maxRetries: 5,

src/api/routes/organizations.ts

@@ -631,7 +631,8 @@ const organizationsPlugin: FastifyPluginAsync = async (fastify, _options) => {
           teamId: githubTeamId,
           logger: request.log,
           groupsToSync: [entraGroupId].filter((x): x is string => !!x),
-          orgId: fastify.environmentConfig.GithubOrgName,
+          orgId: fastify.environmentConfig.GithubOrgId,
+          orgName: fastify.environmentConfig.GithubOrgName,
         });
       } else {
         request.log.info(

src/common/config.ts

@@ -33,6 +33,7 @@ export type ConfigType = {
   GithubOrgName: string;
   ExecGithubTeam: number;
   GithubIdpSyncEnabled: boolean
+  GithubOrgId: number;
 };
 
 export type GenericConfigType = {
@@ -136,6 +137,7 @@ const environmentConfig: EnvironmentConfigType = {
     GroupSuffix: "[NonProd]",
     GroupEmailSuffix: "nonprod",
     GithubOrgName: "acm-uiuc-testing",
+    GithubOrgId: 235748315,
     ExecGithubTeam: 14420860,
     GithubIdpSyncEnabled: false
   },
@@ -167,6 +169,7 @@ const environmentConfig: EnvironmentConfigType = {
     GroupSuffix: "",
     GroupEmailSuffix: "",
     GithubOrgName: "acm-uiuc",
+    GithubOrgId: 425738,
     ExecGithubTeam: 12025214,
     GithubIdpSyncEnabled: true
   },