refactor: use string for user id

bigcommerce · Apr 8, 2024 · a7424ad · a7424ad
1 parent 0cc399a
commit a7424ad
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 29 deletions.
diff --git a/.changeset/short-cycles-learn.md b/.changeset/short-cycles-learn.md
@@ -0,0 +1,7 @@
+---
+"@bigcommerce/catalyst-client": patch
+"@bigcommerce/catalyst-core": patch
+"@bigcommerce/create-catalyst": patch
+---
+
+chore: bump next-auth and use string for user id
diff --git a/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx b/apps/core/app/[locale]/(default)/login/_components/change-password-form.tsx
@@ -21,7 +21,7 @@ import { useRouter } from '~/navigation';
 import { submitChangePasswordForm } from '../_actions/submit-change-password-form';
 
 interface Props {
-  customerId: number;
+  customerId: string;
   customerToken: string;
 }
 

diff --git a/apps/core/app/[locale]/(default)/login/page.tsx b/apps/core/app/[locale]/(default)/login/page.tsx
@@ -39,7 +39,7 @@ export default async function Login({ params: { locale }, searchParams }: Props)
       <div className="mx-auto my-6 max-w-4xl">
         <h2 className="mb-8 text-4xl font-black lg:text-5xl">{t('changePasswordHeading')}</h2>
         <NextIntlClientProvider locale={locale} messages={{ Account }}>
-          <ChangePasswordForm customerId={Number(customerId)} customerToken={customerToken} />
+          <ChangePasswordForm customerId={customerId} customerToken={customerToken} />
         </NextIntlClientProvider>
       </div>
     );

diff --git a/apps/core/auth.ts b/apps/core/auth.ts
@@ -12,14 +12,6 @@ export const Credentials = z.object({
   password: z.string().min(1),
 });
 
-declare module 'next-auth' {
-  interface Session {
-    user?: {
-      id?: number;
-    };
-  }
-}
-
 const config = {
   session: {
     strategy: 'jwt',
@@ -29,9 +21,9 @@ const config = {
   },
   callbacks: {
     session({ session, token }) {
-      session.user ||= {};
-
-      session.user.id = token.sub ? parseInt(token.sub, 10) : undefined;
+      if (token.sub) {
+        session.user.id = token.sub;
+      }
 
       return session;
     },
@@ -40,7 +32,7 @@ const config = {
     async signIn({ user }) {
       const cookieCartId = cookies().get('cartId')?.value;
 
-      if (cookieCartId) {
+      if (cookieCartId && user.id) {
         try {
           await assignCartToCustomer(user.id, cookieCartId);
         } catch (error) {
@@ -85,20 +77,16 @@ const config = {
   ],
 } satisfies NextAuthConfig;
 
-const { handlers, auth, signIn, signOut, update } = NextAuth(config);
+const { handlers, auth, signIn, signOut } = NextAuth(config);
 
 const getSessionCustomerId = async () => {
   try {
     const session = await auth();
 
-    if (!session?.user?.id) {
-      return;
-    }
-
-    return session.user.id;
+    return session?.user?.id;
   } catch {
     // No empty
   }
 };
 
-export { handlers, auth, signIn, signOut, update, getSessionCustomerId };
+export { handlers, auth, signIn, signOut, getSessionCustomerId };
diff --git a/apps/core/client/mutations/apply-checkout-coupon.ts b/apps/core/client/mutations/apply-checkout-coupon.ts
@@ -28,7 +28,7 @@ export const applyCheckoutCoupon = async (checkoutEntityId: string, couponCode:
         },
       },
     },
-    customerId: Number(customerId),
+    customerId,
     fetchOptions: { cache: 'no-store' },
   });
 

diff --git a/apps/core/client/mutations/assign-cart-to-customer.ts b/apps/core/client/mutations/assign-cart-to-customer.ts
@@ -24,7 +24,7 @@ export const assignCartToCustomer = async (customerId: string, cartEntityId: Car
         cartEntityId,
       },
     },
-    customerId: Number(customerId),
+    customerId,
     fetchOptions: { cache: 'no-store' },
   });
 

diff --git a/apps/core/client/mutations/unapply-checkout-coupon.ts b/apps/core/client/mutations/unapply-checkout-coupon.ts
@@ -28,7 +28,7 @@ export const unapplyCheckoutCoupon = async (checkoutEntityId: string, couponCode
         },
       },
     },
-    customerId: Number(customerId),
+    customerId,
     fetchOptions: { cache: 'no-store' },
   });
 

diff --git a/apps/core/client/mutations/unassign-cart-from-customer.ts b/apps/core/client/mutations/unassign-cart-from-customer.ts
@@ -32,7 +32,7 @@ export const unassignCartFromCustomer = async (
         cartEntityId,
       },
     },
-    customerId: Number(customerId),
+    customerId,
     fetchOptions: { cache: 'no-store' },
   });
 

diff --git a/packages/client/src/client.ts b/packages/client/src/client.ts
@@ -37,15 +37,15 @@ class Client<FetcherRequestInit extends RequestInit = RequestInit> {
   async fetch<TResult, TVariables extends Record<string, unknown>>(config: {
     document: DocumentDecoration<TResult, TVariables>;
     variables: TVariables;
-    customerId?: number;
+    customerId?: string;
     fetchOptions?: FetcherRequestInit;
   }): Promise<BigCommerceResponse<TResult>>;
 
   // Overload for documents that do not require variables
   async fetch<TResult>(config: {
     document: DocumentDecoration<TResult, Record<string, never>>;
     variables?: undefined;
-    customerId?: number;
+    customerId?: string;
     fetchOptions?: FetcherRequestInit;
   }): Promise<BigCommerceResponse<TResult>>;
 
@@ -57,7 +57,7 @@ class Client<FetcherRequestInit extends RequestInit = RequestInit> {
   }: {
     document: DocumentDecoration<TResult, TVariables>;
     variables?: TVariables;
-    customerId?: number;
+    customerId?: string;
     fetchOptions?: FetcherRequestInit;
   }): Promise<BigCommerceResponse<TResult>> {
     const { cache, headers = {}, ...rest } = fetchOptions;
@@ -70,7 +70,7 @@ class Client<FetcherRequestInit extends RequestInit = RequestInit> {
         'Content-Type': 'application/json',
         Authorization: `Bearer ${this.config.customerImpersonationToken}`,
         'User-Agent': this.backendUserAgent,
-        ...(customerId && { 'X-Bc-Customer-Id': String(customerId) }),
+        ...(customerId && { 'X-Bc-Customer-Id': customerId }),
         ...headers,
       },
       body: JSON.stringify({