Add first and last name fields to stripe membership checkout (#195)

Author: devksingh4

src/api/functions/entraId.ts

@@ -431,7 +431,7 @@ export async function patchUserProfile(
   token: string,
   email: string,
   userId: string,
-  data: ProfilePatchRequest,
+  data: Partial<ProfilePatchRequest>,
 ): Promise<void> {
   try {
     const url = `https://graph.microsoft.com/v1.0/users/${userId}`;

src/api/functions/membership.ts

@@ -10,6 +10,7 @@ import {
   addToTenant,
   isUserInGroup,
   modifyGroup,
+  patchUserProfile,
   resolveEmailToOid,
 } from "./entraId.js";
 import { EntraGroupError } from "common/errors/index.js";
@@ -112,6 +113,8 @@ export async function setPaidMembershipInTable(
 
 type SetPaidMembershipInput = {
   netId: string;
+  firstName: string;
+  lastName: string;
   dynamoClient: DynamoDBClient;
   entraToken: string;
   paidMemberGroup: string;
@@ -126,6 +129,8 @@ export async function setPaidMembership({
   dynamoClient,
   entraToken,
   paidMemberGroup,
+  firstName,
+  lastName,
 }: SetPaidMembershipInput): Promise<SetPaidMembershipOutput> {
   const dynamoResult = await setPaidMembershipInTable(
     netId,
@@ -151,13 +156,19 @@ export async function setPaidMembership({
     30000,
     4000,
   );
+  const oid = await resolveEmailToOid(entraToken, email);
   await modifyGroup(
     entraToken,
     email,
     paidMemberGroup,
     EntraGroupActions.ADD,
     dynamoClient,
   );
+  await patchUserProfile(entraToken, email, oid, {
+    displayName: `${firstName} ${lastName}`,
+    givenName: firstName,
+    surname: lastName,
+  });
 
   return { updated: true };
 }

src/api/functions/ses.ts

@@ -14,6 +14,7 @@ export function generateMembershipEmailCommand(
   recipientEmail: string,
   senderEmail: string,
   attachmentBuffer: ArrayBufferLike,
+  firstName?: string,
 ): SendRawEmailCommand {
   const encodedAttachment = encode(attachmentBuffer as ArrayBuffer);
   const boundary = "----BoundaryForEmail";
@@ -81,14 +82,14 @@ export function generateMembershipEmailCommand(
     <img src="https://static.acm.illinois.edu/banner-blue.png" style="height: 100px; width: 210px; align-self: center;"/>
     <br />
     <div class="wrap">
-        <h2 style="text-align: center;">Welcome</h2>
+        <h2 style="text-align: center;">Welcome${firstName && `, ${firstName}`}!</h2>
         <p>
             Thank you for becoming a member of ACM @ UIUC! Attached is your membership pass.
             You can add it to your Apple or Google Wallet for easy access.
         </p>
         <p>
             If you have any questions, feel free to contact us at
-            <a href="mailto:infra@acm.illinois.edu">infra@acm.illinois.edu</a>.
+            <a href="mailto:officers@acm.illinois.edu">officers@acm.illinois.edu</a>.
         </p>
         <p>
             We also encourage you to check out our resources page, where you can find the benefits associated with your membership.
@@ -101,7 +102,7 @@ export function generateMembershipEmailCommand(
     <div class="footer">
         <p>
             <a href="https://acm.illinois.edu">ACM @ UIUC Homepage</a>
-            <a href="mailto:admin@acm.illinois.edu">Email ACM @ UIUC</a>
+            <a href="mailto:officers@acm.illinois.edu">Email ACM @ UIUC</a>
         </p>
     </div>
 </body>

src/api/functions/stripe.ts

@@ -18,6 +18,7 @@ export type StripeCheckoutSessionCreateParams = {
   items: { price: string; quantity: number }[];
   initiator: string;
   allowPromotionCodes: boolean;
+  customFields?: Stripe.Checkout.SessionCreateParams.CustomField[];
 };
 
 /**
@@ -73,6 +74,7 @@ export const createCheckoutSession = async ({
   items,
   initiator,
   allowPromotionCodes,
+  customFields,
 }: StripeCheckoutSessionCreateParams): Promise<string> => {
   const stripe = new Stripe(stripeApiKey);
   const payload: Stripe.Checkout.SessionCreateParams = {
@@ -89,6 +91,7 @@ export const createCheckoutSession = async ({
       initiator,
     },
     allow_promotion_codes: allowPromotionCodes,
+    custom_fields: customFields,
   };
   const session = await stripe.checkout.sessions.create(payload);
   if (!session.url) {

src/api/routes/membership.ts

@@ -173,7 +173,24 @@ const membershipPlugin: FastifyPluginAsync = async (fastify, _options) => {
                 quantity: 1,
               },
             ],
-
+            customFields: [
+              {
+                key: "firstName",
+                label: {
+                  type: "custom",
+                  custom: "Student First Name",
+                },
+                type: "text",
+              },
+              {
+                key: "lastName",
+                label: {
+                  type: "custom",
+                  custom: "Student Last Name",
+                },
+                type: "text",
+              },
+            ],
             initiator: "purchase-membership",
             allowPromotionCodes: true,
           }),
@@ -343,12 +360,30 @@ const membershipPlugin: FastifyPluginAsync = async (fastify, _options) => {
             event.data.object.metadata.initiator === "purchase-membership"
           ) {
             const customerEmail = event.data.object.customer_email;
+            const firstName = event.data.object.custom_fields.filter(
+              (x) => x.key === "firstName",
+            )[0].text?.value;
+            const lastName = event.data.object.custom_fields.filter(
+              (x) => x.key === "lastName",
+            )[0].text?.value;
             if (!customerEmail) {
               request.log.info("No customer email found.");
               return reply
                 .code(200)
                 .send({ handled: false, requestId: request.id });
             }
+            if (!firstName) {
+              request.log.info("First name not found.");
+              return reply
+                .code(200)
+                .send({ handled: false, requestId: request.id });
+            }
+            if (!lastName) {
+              request.log.info("Last name not found.");
+              return reply
+                .code(200)
+                .send({ handled: false, requestId: request.id });
+            }
             const sqsPayload: SQSPayload<AvailableSQSFunctions.ProvisionNewMember> =
               {
                 function: AvailableSQSFunctions.ProvisionNewMember,
@@ -358,6 +393,8 @@ const membershipPlugin: FastifyPluginAsync = async (fastify, _options) => {
                 },
                 payload: {
                   email: customerEmail,
+                  firstName,
+                  lastName,
                 },
               };
             if (!fastify.sqsClient) {

src/api/sqs/handlers/emailMembershipPassHandler.ts

@@ -14,7 +14,7 @@ import { SESClient } from "@aws-sdk/client-ses";
 export const emailMembershipPassHandler: SQSHandlerFunction<
   AvailableSQSFunctions.EmailMembershipPass
 > = async (payload, metadata, logger) => {
-  const email = payload.email;
+  const { email, firstName } = payload;
   const commonConfig = { region: genericConfig.AwsRegion };
   const clients = await getAuthorizedClients(logger, commonConfig);
   const entraIdToken = await getEntraIdToken({
@@ -37,6 +37,7 @@ export const emailMembershipPassHandler: SQSHandlerFunction<
     email,
     `membership@${environmentConfig[runEnvironment].EmailDomain}`,
     pkpass.buffer,
+    firstName,
   );
   if (runEnvironment === "dev" && email === "testinguser@illinois.edu") {
     return;

src/api/sqs/handlers/provisionNewMember.ts

@@ -17,7 +17,7 @@ import { setKey } from "api/functions/redisCache.js";
 export const provisionNewMemberHandler: SQSHandlerFunction<
   AvailableSQSFunctions.ProvisionNewMember
 > = async (payload, metadata, logger) => {
-  const { email } = payload;
+  const { email, firstName, lastName } = payload;
   const commonConfig = { region: genericConfig.AwsRegion };
   const clients = await getAuthorizedClients(logger, commonConfig);
   const entraToken = await getEntraIdToken({
@@ -39,6 +39,8 @@ export const provisionNewMemberHandler: SQSHandlerFunction<
     dynamoClient: clients.dynamoClient,
     entraToken,
     paidMemberGroup: currentEnvironmentConfig.PaidMemberGroupId,
+    firstName,
+    lastName,
   });
   if (updated) {
     const logPromise = createAuditLogEntry({

src/common/types/sqsMessage.ts

@@ -38,16 +38,16 @@ export const sqsPayloadSchemas = {
   ),
   [AvailableSQSFunctions.EmailMembershipPass]: createSQSSchema(
     AvailableSQSFunctions.EmailMembershipPass,
-    z.object({ email: z.string().email() })
+    z.object({ email: z.email(), firstName: z.optional(z.string().min(1)) })
   ),
   [AvailableSQSFunctions.ProvisionNewMember]: createSQSSchema(
     AvailableSQSFunctions.ProvisionNewMember,
-    z.object({ email: z.string().email() })
+    z.object({ email: z.email(), firstName: z.string().min(1), lastName: z.string().min(1) })
   ),
   [AvailableSQSFunctions.SendSaleEmail]: createSQSSchema(
     AvailableSQSFunctions.SendSaleEmail,
     z.object({
-      email: z.string().email(),
+      email: z.email(),
       qrCodeContent: z.string().min(1),
       itemName: z.string().min(1),
       quantity: z.number().min(1),
@@ -58,8 +58,8 @@ export const sqsPayloadSchemas = {
   ),
   [AvailableSQSFunctions.EmailNotifications]: createSQSSchema(
     AvailableSQSFunctions.EmailNotifications, z.object({
-      to: z.array(z.string().email()).min(1),
-      cc: z.optional(z.array(z.string().email()).min(1)),
+      to: z.array(z.email()).min(1),
+      cc: z.optional(z.array(z.email()).min(1)),
       bcc: z.optional(z.array(z.string().email()).min(1)),
       subject: z.string().min(1),
       content: z.string().min(1),