fix: fix set-cookie api route issue due to wrong domain name (#284)

Because

- #283 

This commit

- fix set-cookie API route issue due to the wrong domain name (close #283)

integration-test/onboarding.spec.ts

@@ -11,7 +11,7 @@ test("should navigate first time user to the onboarding page", async ({
   );
 });
 
-test("should enable email subscription by defautl", async ({ page }) => {
+test("should enable email subscription by default", async ({ page }) => {
   await page.goto("/onboarding", { waitUntil: "networkidle" });
 
   // Should check email subscription

src/lib/cookie.ts

@@ -6,7 +6,7 @@ export type SetCookiePayload = {
   res: NextApiResponse;
   value: string;
   key: string;
-  hostname: Nullable<string>;
+  domain: Nullable<string>;
   maxAge: number;
   httpOnly: boolean;
 };
@@ -15,7 +15,7 @@ export const setCookie = ({
   res,
   value,
   key,
-  hostname,
+  domain,
   maxAge,
   httpOnly,
 }: SetCookiePayload) => {
@@ -26,7 +26,7 @@ export const setCookie = ({
     secure: process.env.NODE_ENV === "production" ? true : false,
     path: "/",
     sameSite: "lax",
-    domain: hostname ? hostname : undefined,
+    domain: domain ? domain : undefined,
   });
 
   res.setHeader("Set-Cookie", cookie);

src/pages/_app.tsx

@@ -37,22 +37,22 @@ function MyApp({ Component, pageProps }: AppPropsWithLayout) {
   useEffect(() => {
     if (!router.isReady || !trackingToken.data) return;
 
-    if (process.env.NEXT_PUBLIC_DISABLE_USAGE_COLLECTION === "true") {
-      setAmplitudeIsInit(false);
-      return;
-    }
-
     if (trackingToken.data === "redirect-to-onboard") {
       // We should clear the trackingToken to avoid once user had successfully setup user data, when we push them to the
       // pipelines page, because there has no changes related to state, the trackingToken won't be flushed, so it remains
       // redirect-to-onboard, user will be redirected to onboarding page again.
       trackingToken.setData(null);
       router.push("/onboarding");
+      return;
     }
 
     if (process.env.NODE_ENV === "production" && !amplitudeIsInit) {
-      initAmplitude(trackingToken.data);
-      setAmplitudeIsInit(true);
+      if (process.env.NEXT_PUBLIC_DISABLE_USAGE_COLLECTION === "true") {
+        setAmplitudeIsInit(false);
+      } else {
+        initAmplitude(trackingToken.data);
+        setAmplitudeIsInit(true);
+      }
     }
   }, [router.isReady, trackingToken, router.asPath, amplitudeIsInit, router]);
 

src/pages/api/set-user-cookie.ts

@@ -18,14 +18,13 @@ const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   }
 
   try {
-    const hostname = req.headers.host?.split(":")[0];
     const payload: SetCookiePayload = {
       res: res,
       key: "instill-ai-user",
       value: JSON.stringify({
         cookie_token: body.token,
       }),
-      hostname: hostname ?? null,
+      domain: req.headers.origin ? new URL(req.headers.origin).hostname : null,
       maxAge: 60 * 60 * 24 * 2,
       httpOnly: process.env.NODE_ENV === "production" ? true : false,
     };