refactor(auth): separate first and last name fields on user session (#2711)

* refactor(auth): separate first and last name fields on user session

* Update .changeset/thin-things-repair.md

Co-authored-by: Jorge Moya <[email protected]>

---------

Co-authored-by: Matthew Volk <[email protected]>
Co-authored-by: Jorge Moya <[email protected]>

Author: 3 people

.changeset/thin-things-repair.md

@@ -0,0 +1,5 @@
+---
+"@bigcommerce/catalyst-core": minor
+---
+
+Separate first and last name fields on user session object.

core/auth/index.ts

@@ -127,7 +127,8 @@ async function loginWithPassword(credentials: unknown): Promise<User | null> {
   await clearAnonymousSession();
 
   return {
-    name: `${result.customer.firstName} ${result.customer.lastName}`,
+    firstName: result.customer.firstName,
+    lastName: result.customer.lastName,
     email: result.customer.email,
     customerAccessToken: result.customerAccessToken.value,
     cartId: result.cart?.entityId,
@@ -163,7 +164,8 @@ async function loginWithJwt(credentials: unknown): Promise<User | null> {
   await clearAnonymousSession();
 
   return {
-    name: `${result.customer.firstName} ${result.customer.lastName}`,
+    firstName: result.customer.firstName,
+    lastName: result.customer.lastName,
     email: result.customer.email,
     customerAccessToken: result.customerAccessToken.value,
     impersonatorId,
@@ -206,6 +208,24 @@ const config = {
         };
       }
 
+      // user can actually be undefined
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      if (user?.firstName !== undefined) {
+        token.user = {
+          ...token.user,
+          firstName: user.firstName,
+        };
+      }
+
+      // user can actually be undefined
+      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+      if (user?.lastName !== undefined) {
+        token.user = {
+          ...token.user,
+          lastName: user.lastName,
+        };
+      }
+
       if (trigger === 'update') {
         const parsedSession = SessionUpdate.safeParse(session);
 
@@ -228,6 +248,14 @@ const config = {
         session.user.cartId = token.user.cartId;
       }
 
+      if (token.user?.firstName !== undefined) {
+        session.user.firstName = token.user.firstName;
+      }
+
+      if (token.user?.lastName !== undefined) {
+        session.user.lastName = token.user.lastName;
+      }
+
       return session;
     },
   },

core/auth/types.ts

@@ -6,7 +6,8 @@ declare module 'next-auth' {
   }
 
   interface User {
-    name?: string | null;
+    firstName?: string | null;
+    lastName?: string | null;
     email?: string | null;
     cartId?: string | null;
     customerAccessToken?: string;