Merge commit 'merge mainscreen conflicts'

Author: eeen17

src/api/functions/entraId.ts

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

src/api/index.ts

@@ -33,6 +33,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";
 import roomRequestRoutes from "./routes/roomRequests.js";
 import logsPlugin from "./routes/logs.js";
 import fastifySwagger from "@fastify/swagger";
@@ -289,6 +290,7 @@ async function init(prettyPrint: boolean = false) {
       api.register(linkryRoutes, { prefix: "/linkry" });
       api.register(mobileWalletRoute, { prefix: "/mobileWallet" });
       api.register(stripeRoutes, { prefix: "/stripe" });
+      api.register(sigleadRoutes, { prefix: "/siglead" });
       api.register(roomRequestRoutes, { prefix: "/roomRequests" });
       api.register(logsPlugin, { prefix: "/logs" });
       api.register(apiKeyRoute, { prefix: "/apiKey" });

src/api/routes/siglead.ts

@@ -0,0 +1,72 @@
+import { FastifyInstance, FastifyPluginAsync } from "fastify";
+import { allAppRoles, AppRoles } from "../../common/roles.js";
+import {
+  addToTenant,
+  getEntraIdToken,
+  listGroupMembers,
+  modifyGroup,
+  patchUserProfile,
+} from "../functions/entraId.js";
+import {
+  BaseError,
+  DatabaseFetchError,
+  DatabaseInsertError,
+  EntraGroupError,
+  EntraInvitationError,
+  InternalServerError,
+  NotFoundError,
+  UnauthorizedError,
+} from "../../common/errors/index.js";
+import { PutItemCommand } from "@aws-sdk/client-dynamodb";
+import { genericConfig } from "../../common/config.js";
+import { marshall } from "@aws-sdk/util-dynamodb";
+import {
+  InviteUserPostRequest,
+  invitePostRequestSchema,
+  GroupMappingCreatePostRequest,
+  groupMappingCreatePostSchema,
+  entraActionResponseSchema,
+  groupModificationPatchSchema,
+  GroupModificationPatchRequest,
+  EntraGroupActions,
+  entraGroupMembershipListResponse,
+  ProfilePatchRequest,
+  entraProfilePatchRequest,
+} from "../../common/types/iam.js";
+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 sigleadRoutes: FastifyPluginAsync = async (fastify, _options) => {
+  fastify.get<{
+    Reply: OrgMembersResponse[];
+  }>("/groups", async (request, reply) => {
+    const entraIdToken = await getEntraIdToken(
+      {
+        smClient: fastify.secretsManagerClient,
+        dynamoClient: fastify.dynamoClient,
+      },
+      fastify.environmentConfig.AadValidClientId,
+    );
+
+    const data = await Promise.all(
+      OrganizationList.map(async (org) => {
+        const members: Member[] = await listGroupMembers(entraIdToken, org);
+        return { org, members } as OrgMembersResponse;
+      }),
+    );
+
+    reply.status(200).send(data);
+  });
+};
+
+export default sigleadRoutes;

src/common/roles.ts

@@ -18,5 +18,8 @@ export enum AppRoles {
   MANAGE_ORG_API_KEYS = "manage:orgApiKey"
 }
 export const allAppRoles = Object.values(AppRoles).filter(
-  (value) => typeof value === "string",
+  (value) => typeof value === "string", 
 );
+
+
+  

src/ui/components/AppShell/index.tsx

@@ -18,10 +18,10 @@ import {
   IconPizza,
   IconTicket,
   IconLock,
-  IconUsers,
   IconDoor,
   IconHistory,
   IconKey,
+  IconUsers,
 } from "@tabler/icons-react";
 import { ReactNode } from "react";
 import { useNavigate } from "react-router-dom";