stash pop merge conflicts

Author: eeen17

src/api/functions/entraId.ts

@@ -366,7 +366,7 @@ export async function listGroupMembers(
  * @throws {EntraUserError} If fetching the user profile fails.
  * @returns {Promise<UserProfileDataBase>} The user's profile information.
  */
-export async function getUserProfile(
+export async function getUserProflile(
   token: string,
   email: string,
 ): Promise<UserProfileDataBase> {

src/api/index.ts

@@ -26,6 +26,7 @@ import mobileWalletRoute from "./routes/mobileWallet.js";
 import stripeRoutes from "./routes/stripe.js";
 import membershipPlugin from "./routes/membership.js";
 import path from "path"; // eslint-disable-line import/no-nodejs-modules
+import sigleadRoutes from "./routes/siglead.js";
 
 dotenv.config();
 
@@ -133,6 +134,7 @@ async function init(prettyPrint: boolean = false) {
       api.register(ticketsPlugin, { prefix: "/tickets" });
       api.register(mobileWalletRoute, { prefix: "/mobileWallet" });
       api.register(stripeRoutes, { prefix: "/stripe" });
+      api.register(sigleadRoutes, { prefix: "/siglead" });
       if (app.runEnvironment === "dev") {
         api.register(vendingPlugin, { prefix: "/vending" });
       }

src/api/routes/siglead.ts

@@ -1,4 +1,4 @@
-import { FastifyPluginAsync } from "fastify";
+import { FastifyInstance, FastifyPluginAsync } from "fastify";
 import { allAppRoles, AppRoles } from "../../common/roles.js";
 import { zodToJsonSchema } from "zod-to-json-schema";
 import {
@@ -38,48 +38,42 @@ import {
   AUTH_DECISION_CACHE_SECONDS,
   getGroupRoles,
 } from "../functions/authorization.js";
+import { OrganizationList } from "common/orgs.js";
+import { z } from "zod";
+
+const OrganizationListEnum = z.enum(OrganizationList as [string, ...string[]]);
+export type Org = z.infer<typeof OrganizationListEnum>;
+
+type Member = { name: string; email: string };
+type OrgMembersResponse = { org: Org; members: Member[] };
+
+// const groupMappings = getRunEnvironmentConfig().KnownGroupMappings;
+// const groupOptions = Object.entries(groupMappings).map(([key, value]) => ({
+//   label: userGroupMappings[key as keyof KnownGroups] || key,
+//   value: `${key}_${value}`, // to ensure that the same group for multiple roles still renders
+// }));
 
 const sigleadRoutes: FastifyPluginAsync = async (fastify, _options) => {
   fastify.get<{
-    Querystring: { groupId: string };
-  }>(
-    "/groups/:groupId/roles",
-    {
-      schema: {
-        querystring: {
-          type: "object",
-          properties: {
-            groupId: {
-              type: "string",
-            },
-          },
-        },
+    Reply: OrgMembersResponse[];
+  }>("/groups", async (request, reply) => {
+    const entraIdToken = await getEntraIdToken(
+      {
+        smClient: fastify.secretsManagerClient,
+        dynamoClient: fastify.dynamoClient,
       },
-      onRequest: async (request, reply) => {
-        await fastify.authorize(request, reply, [AppRoles.IAM_ADMIN]);
-      },
-    },
-    async (request, reply) => {
-      try {
-        const groupId = (request.params as Record<string, string>).groupId;
-        const roles = await getGroupRoles(
-          fastify.dynamoClient,
-          fastify,
-          groupId,
-        );
-        return reply.send(roles);
-      } catch (e: unknown) {
-        if (e instanceof BaseError) {
-          throw e;
-        }
+      fastify.environmentConfig.AadValidClientId,
+    );
+
+    const data = await Promise.all(
+      OrganizationList.map(async (org) => {
+        const members: Member[] = await listGroupMembers(entraIdToken, org);
+        return { org, members } as OrgMembersResponse;
+      }),
+    );
 
-        request.log.error(e);
-        throw new DatabaseFetchError({
-          message: "An error occurred finding the group role mapping.",
-        });
-      }
-    },
-  );
+    reply.status(200).send(data);
+  });
 
   // fastify.patch<{ Body: ProfilePatchRequest }>(
   //   "/profile",

src/common/roles.ts

@@ -2,15 +2,18 @@
 export const runEnvironments = ["dev", "prod"] as const;
 export type RunEnvironment = (typeof runEnvironments)[number];
 export enum AppRoles {
-  EVENTS_MANAGER = "manage:events",
-  SIGLEAD_MANAGER = "manage:siglead",
-  TICKETS_SCANNER = "scan:tickets",
-  TICKETS_MANAGER = "manage:tickets",
-  IAM_ADMIN = "admin:iam",
-  IAM_INVITE_ONLY = "invite:iam",
-  STRIPE_LINK_CREATOR = "create:stripeLink",
-  BYPASS_OBJECT_LEVEL_AUTH = "bypass:ola",
+  EVENTS_MANAGER = "manage:events", 
+  SIGLEAD_MANAGER = "manage:siglead", 
+  TICKETS_SCANNER = "scan:tickets", 
+  TICKETS_MANAGER = "manage:tickets", 
+  IAM_ADMIN = "admin:iam", 
+  IAM_INVITE_ONLY = "invite:iam", 
+  STRIPE_LINK_CREATOR = "create:stripeLink", 
+  BYPASS_OBJECT_LEVEL_AUTH = "bypass:ola", 
 }
 export const allAppRoles = Object.values(AppRoles).filter(
-  (value) => typeof value === "string",
+  (value) => typeof value === "string", 
 );
+
+
+