fix membership provisioning bug

Author: devksingh4

src/api/functions/general.ts

@@ -0,0 +1,20 @@
+export function pollUntilNoError<T>(
+  fn: () => Promise<T>,
+  timeout: number,
+  interval: number = 1000
+): Promise<T> {
+  const start = Date.now();
+
+  return new Promise((resolve, reject) => {
+    const attempt = async () => {
+      try {
+        const result = await fn();
+        return resolve(result);
+      } catch (err) {
+        if (Date.now() - start >= timeout) return reject(err);
+        setTimeout(attempt, interval);
+      }
+    };
+    attempt();
+  });
+}

src/api/functions/membership.ts

@@ -6,9 +6,10 @@ import {
 } from "@aws-sdk/client-dynamodb";
 import { marshall } from "@aws-sdk/util-dynamodb";
 import { genericConfig } from "common/config.js";
-import { isUserInGroup, modifyGroup } from "./entraId.js";
+import { addToTenant, isUserInGroup, modifyGroup, resolveEmailToOid } from "./entraId.js";
 import { EntraGroupError } from "common/errors/index.js";
 import { EntraGroupActions } from "common/types/iam.js";
+import { pollUntilNoError, sleep } from "./general.js";
 
 export async function checkExternalMembership(
   netId: string,
@@ -134,9 +135,14 @@ export async function setPaidMembership({
       return { updated: false };
     }
   }
+  const email = `${netId}@illinois.edu`;
+  await addToTenant(entraToken, email);
+  // Poll every 4 seconds for up to 30 seconds to see if the email was added to the tenant.
+  // If this still errors, SQS will retry, and if that still errors we'll find it in the DLQ
+  await pollUntilNoError(() => resolveEmailToOid(entraToken, email), 30000, 4000);
   await modifyGroup(
     entraToken,
-    `${netId}@illinois.edu`,
+    email,
     paidMemberGroup,
     EntraGroupActions.ADD,
     dynamoClient,