central config and allow accessing events api prod from website staging

Author: devksingh4

src/config.ts

@@ -23,7 +23,7 @@ type EnvironmentConfigType = {
 const genericConfig: GenericConfigType = {
   DynamoTableName: "infra-events-api-records",
   ConfigSecretName: "infra-events-api-config",
-  UpcomingEventThresholdSeconds: 1800 // 30 mins
+  UpcomingEventThresholdSeconds: 1800, // 30 mins
 } as const;
 
 const environmentConfig: EnvironmentConfigType = {
@@ -35,8 +35,11 @@ const environmentConfig: EnvironmentConfigType = {
       "0": [AppRoles.MANAGER], // Dummy Group for development only
     },
     AzureRoleMapping: { AutonomousWriters: [AppRoles.MANAGER] },
-    ValidCorsOrigins: ['http://localhost:3000', /\.acmuiuc\.\.pages\.dev$/, 'https://acmuiuc.pages.dev'],
-    AadValidClientId: '39c28870-94e4-47ee-b4fb-affe0bf96c9f'
+    ValidCorsOrigins: [
+      "http://localhost:3000",
+      /\.acmuiuc\.\.pages\.dev$/,
+    ],
+    AadValidClientId: "39c28870-94e4-47ee-b4fb-affe0bf96c9f",
   },
   prod: {
     GroupRoleMapping: {
@@ -45,8 +48,12 @@ const environmentConfig: EnvironmentConfigType = {
       "ad81254b-4eeb-4c96-8191-3acdce9194b1": [AppRoles.MANAGER], // Exec
     },
     AzureRoleMapping: { AutonomousWriters: [AppRoles.MANAGER] },
-    ValidCorsOrigins: ['https:///acm.illinois.edu', 'https:///www.acm.illinois.edu'],
-    AadValidClientId: '5e08cf0f-53bb-4e09-9df2-e9bdc3467296'
+    ValidCorsOrigins: [
+      "https:///acm.illinois.edu",
+      "https:///www.acm.illinois.edu",
+      /\.acmuiuc\.\.pages\.dev$/,
+    ],
+    AadValidClientId: "5e08cf0f-53bb-4e09-9df2-e9bdc3467296",
   },
 } as const;
 

src/index.ts

@@ -41,6 +41,7 @@ async function init() {
     });
   }
   app.runEnvironment = process.env.RunEnvironment as RunEnvironment;
+  app.environmentConfig = environmentConfig[app.runEnvironment];
   app.addHook("onRequest", (req, _, done) => {
     req.startTime = now();
     req.log.info({ url: req.raw.url }, "received request");

src/plugins/auth.ts

@@ -13,7 +13,7 @@ import {
   UnauthenticatedError,
   UnauthorizedError,
 } from "../errors/index.js";
-import { environmentConfig, genericConfig } from "../config.js";
+import { genericConfig } from "../config.js";
 
 function intersection<T>(setA: Set<T>, setB: Set<T>): Set<T> {
   const _intersection = new Set<T>();
@@ -159,35 +159,31 @@ const authPlugin: FastifyPluginAsync = async (fastify, _options) => {
         request.username = verifiedTokenData.email || verifiedTokenData.sub;
         const userRoles = new Set([] as AppRoles[]);
         const expectedRoles = new Set(validRoles);
-        if (verifiedTokenData.groups) {
+        if (
+          verifiedTokenData.groups &&
+          fastify.environmentConfig.GroupRoleMapping
+        ) {
           for (const group of verifiedTokenData.groups) {
-            if (
-              !environmentConfig[fastify.runEnvironment]["GroupRoleMapping"][
+            if (fastify.environmentConfig["GroupRoleMapping"][group]) {
+              for (const role of fastify.environmentConfig["GroupRoleMapping"][
                 group
-              ]
-            ) {
-              continue;
-            }
-            for (const role of environmentConfig[fastify.runEnvironment][
-              "GroupRoleMapping"
-            ][group]) {
-              userRoles.add(role);
+              ]) {
+                userRoles.add(role);
+              }
             }
           }
         } else {
-          if (verifiedTokenData.roles) {
+          if (
+            verifiedTokenData.roles &&
+            fastify.environmentConfig.AzureRoleMapping
+          ) {
             for (const group of verifiedTokenData.roles) {
-              if (
-                !environmentConfig[fastify.runEnvironment]["AzureRoleMapping"][
-                  group
-                ]
-              ) {
-                continue;
-              }
-              for (const role of environmentConfig[fastify.runEnvironment][
-                "AzureRoleMapping"
-              ][group]) {
-                userRoles.add(role);
+              if (fastify.environmentConfig["AzureRoleMapping"][group]) {
+                for (const role of fastify.environmentConfig[
+                  "AzureRoleMapping"
+                ][group]) {
+                  userRoles.add(role);
+                }
               }
             }
           } else {

src/routes/events.ts

@@ -12,7 +12,7 @@ import { genericConfig } from "../config.js";
 import { marshall, unmarshall } from "@aws-sdk/util-dynamodb";
 import { DatabaseFetchError, DatabaseInsertError } from "../errors/index.js";
 import { randomUUID } from "crypto";
-import moment from 'moment-timezone';
+import moment from "moment-timezone";
 
 // POST
 
@@ -38,10 +38,8 @@ const requestBodySchema = baseBodySchema
     message: "repeats is required when repeatEnds is defined",
   });
 
-
 type EventPostRequest = z.infer<typeof requestBodySchema>;
 
-
 const responseJsonSchema = zodToJsonSchema(
   z.object({
     id: z.string(),
@@ -52,14 +50,7 @@ const responseJsonSchema = zodToJsonSchema(
 // GET
 const getResponseBodySchema = z.array(requestBodySchema);
 const getResponseJsonSchema = zodToJsonSchema(getResponseBodySchema);
-
-
-const getQueryParams = z.object({
-  upcomingOnly: z.boolean().default(false),
-})
-type EventsGetQueryParams =  z.infer<typeof getQueryParams>;
-const getQueryParamsJsonSchema = zodToJsonSchema(getResponseBodySchema);
-
+type EventsGetQueryParams = { upcomingOnly?: boolean };
 
 const dynamoClient = new DynamoDBClient({
   region: process.env.AWS_REGION || "us-east-1",
@@ -108,13 +99,16 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
       }
     },
   );
-  type EventsGetRequest = {Body: undefined, Querystring?: EventsGetQueryParams}
-  fastify.get<EventsGetRequest>( 
+  type EventsGetRequest = {
+    Body: undefined;
+    Querystring?: EventsGetQueryParams;
+  };
+  fastify.get<EventsGetRequest>(
     "/",
     {
       schema: {
         querystring: {
-          upcomingOnly: { type: 'boolean' },
+          upcomingOnly: { type: "boolean" },
         },
         response: { 200: getResponseJsonSchema },
       },
@@ -129,25 +123,34 @@ const eventsPlugin: FastifyPluginAsync = async (fastify, _options) => {
         const currentTimeChicago = moment().tz("America/Chicago");
         let parsedItems = getResponseBodySchema.parse(items);
         if (upcomingOnly) {
-          parsedItems = parsedItems.filter(item => {
+          parsedItems = parsedItems.filter((item) => {
             try {
-              if (!item.repeatEnds || item.repeatEnds === 'never') {
+              if (!item.repeatEnds || item.repeatEnds === "never") {
                 return true;
               }
               if (!item.repeats) {
                 const end = item.end || item.start;
-                const momentEnds = moment.tz(end, "America/Chicago")
+                const momentEnds = moment.tz(end, "America/Chicago");
                 const diffTime = currentTimeChicago.diff(momentEnds);
-                return Boolean(diffTime <= genericConfig.UpcomingEventThresholdSeconds)
+                return Boolean(
+                  diffTime <= genericConfig.UpcomingEventThresholdSeconds,
+                );
               }
-              const momentRepeatEnds = moment.tz(item.repeatEnds, "America/Chicago")
+              const momentRepeatEnds = moment.tz(
+                item.repeatEnds,
+                "America/Chicago",
+              );
               const diffTime = currentTimeChicago.diff(momentRepeatEnds);
-              return Boolean(diffTime <= genericConfig.UpcomingEventThresholdSeconds);
-            } catch (e) {
-              request.log.warn(`Could not compute upcoming event status for event ${item.title}!`)
+              return Boolean(
+                diffTime <= genericConfig.UpcomingEventThresholdSeconds,
+              );
+            } catch (e: unknown) {
+              request.log.warn(
+                `Could not compute upcoming event status for event ${item.title}: ${e instanceof Error ? e.toString() : e}`,
+              );
               return false;
             }
-          })
+          });
         }
         reply.send(parsedItems);
       } catch (e: unknown) {

src/types.d.ts

@@ -18,6 +18,7 @@ declare module "fastify" {
       zodSchema: Zod.ZodTypeAny,
     ) => Promise<void>;
     runEnvironment: RunEnvironment;
+    environmentConfig: ConfigType;
   }
   interface FastifyRequest {
     startTime: number;