fix the request username

Author: devksingh4

src/api/plugins/auth.ts

@@ -48,6 +48,7 @@ export type AadToken = {
   sub: string;
   tid: string;
   unique_name: string;
+  upn?: string;
   uti: string;
   ver: string;
   roles?: string[];
@@ -159,7 +160,10 @@ const authPlugin: FastifyPluginAsync = async (fastify, _options) => {
           verifyOptions,
         ) as AadToken;
         request.tokenPayload = verifiedTokenData;
-        request.username = verifiedTokenData.email || verifiedTokenData.sub;
+        request.username =
+          verifiedTokenData.email ||
+          verifiedTokenData.upn?.replace("acm.illinois.edu", "illinois.edu") ||
+          verifiedTokenData.sub;
         const expectedRoles = new Set(validRoles);
         if (verifiedTokenData.groups) {
           const groupRoles = await Promise.allSettled(