WIP: fix Logout and session VTEX

commerce/loaders/product/extensions/list.ts

@@ -12,3 +12,5 @@ export default function ProductsExt(
 ): Promise<Product[] | null> {
   return extend(props);
 }
+
+export const cache = "no-cache";

commerce/loaders/product/extensions/suggestions.ts

@@ -14,3 +14,5 @@ export default function ProductDetailsExt(
 ): Promise<Suggestion | null> {
   return extend(props);
 }
+
+export const cache = "no-cache";

commerce/loaders/product/productListingPage.ts

@@ -13,3 +13,5 @@ export default function ProductDetailsExt(
 ): Promise<ProductListingPage | null> {
   return extend(props);
 }
+
+export const cache = "no-cache";

commerce/loaders/product/products.ts

@@ -13,3 +13,5 @@ export default function ProductsExt(
 ): Promise<Product[] | null> {
   return extend(props);
 }
+
+export const cache = "no-cache";

verified-reviews/loaders/fullReview.ts

@@ -0,0 +1,50 @@
+import { logger } from "@deco/deco/o11y";
+import { AppContext } from "../mod.ts";
+import { createClient, PaginationOptions } from "../utils/client.ts";
+import { VerifiedReviewsFullReview } from "../utils/types.ts";
+
+export type Props = PaginationOptions & {
+  productId: string | string[];
+};
+
+export default async function loader(
+  props: Props,
+  _req: Request,
+  ctx: AppContext,
+): Promise<VerifiedReviewsFullReview> {
+  try {
+    const client = createClient({ ...ctx });
+    if (!client) {
+      return {
+        aggregateRating: undefined,
+        review: [],
+      };
+    }
+
+    const data = await client.fullReview(props);
+    return data;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    logger.error("Error getting full review", message);
+    return {
+      aggregateRating: undefined,
+      review: [],
+    };
+  }
+}
+
+export const cache = "stale-while-revalidate";
+
+export const cacheKey = (props: Props) => {
+  const normalized = {
+    productId: Array.isArray(props.productId)
+      ? [...props.productId].sort().join(",")
+      : props.productId,
+    count: props.count ?? 10,
+    offset: props.offset ?? 0,
+    order: props.order ?? "date_desc",
+    customizeOrder: props.customizeOrder ?? false,
+  };
+
+  return `${normalized.productId}-${normalized.count}-${normalized.offset}-${normalized.order}-${normalized.customizeOrder}`;
+};

verified-reviews/loaders/productDetailsPage.ts

@@ -36,7 +36,7 @@ export default function productDetailsPage(
       ];
     }
 
-    const fullReview = await client.fullReview({
+    const fullReview = await ctx.invoke["verified-reviews"].loaders.fullReview({
       productId: productsToGetReviews,
       count: config?.count,
       offset: config?.offset,
@@ -52,3 +52,5 @@ export default function productDetailsPage(
     };
   };
 }
+
+export const cache = "no-cache";

verified-reviews/loaders/productList.ts

@@ -37,3 +37,5 @@ export default function productList(
     });
   };
 }
+
+export const cache = "no-cache";

verified-reviews/loaders/productListingPage.ts

@@ -45,3 +45,5 @@ export default function productListingPage(
     };
   };
 }
+
+export const cache = "no-cache";

verified-reviews/manifest.gen.ts

@@ -2,19 +2,21 @@
 // This file SHOULD be checked into source version control.
 // This file is automatically updated during development when running `dev.ts`.
 
-import * as $$$0 from "./loaders/productDetailsPage.ts";
-import * as $$$1 from "./loaders/productList.ts";
-import * as $$$2 from "./loaders/productListingPage.ts";
-import * as $$$3 from "./loaders/productReviews.ts";
-import * as $$$4 from "./loaders/storeReview.ts";
+import * as $$$0 from "./loaders/fullReview.ts";
+import * as $$$1 from "./loaders/productDetailsPage.ts";
+import * as $$$2 from "./loaders/productList.ts";
+import * as $$$3 from "./loaders/productListingPage.ts";
+import * as $$$4 from "./loaders/productReviews.ts";
+import * as $$$5 from "./loaders/storeReview.ts";
 
 const manifest = {
   "loaders": {
-    "verified-reviews/loaders/productDetailsPage.ts": $$$0,
-    "verified-reviews/loaders/productList.ts": $$$1,
-    "verified-reviews/loaders/productListingPage.ts": $$$2,
-    "verified-reviews/loaders/productReviews.ts": $$$3,
-    "verified-reviews/loaders/storeReview.ts": $$$4,
+    "verified-reviews/loaders/fullReview.ts": $$$0,
+    "verified-reviews/loaders/productDetailsPage.ts": $$$1,
+    "verified-reviews/loaders/productList.ts": $$$2,
+    "verified-reviews/loaders/productListingPage.ts": $$$3,
+    "verified-reviews/loaders/productReviews.ts": $$$4,
+    "verified-reviews/loaders/storeReview.ts": $$$5,
   },
   "name": "verified-reviews",
   "baseUrl": import.meta.url,

vtex/actions/authentication/accessKeySignIn.ts

@@ -1,7 +1,11 @@
-import { getCookies, getSetCookies } from "std/http/cookie.ts";
+import { getCookies, getSetCookies, setCookie } from "std/http/cookie.ts";
 import { AppContext } from "../../mod.ts";
 import { AuthResponse } from "../../utils/types.ts";
-import setLoginCookies from "../../utils/login/setLoginCookies.ts";
+import {
+  buildCookieJar,
+  proxySetCookie,
+  REFRESH_TOKEN_COOKIE,
+} from "../../utils/cookies.ts";
 
 export interface Props {
   email: string;
@@ -24,6 +28,9 @@ export default async function action(
   }
 
   const cookies = getCookies(req.headers);
+  const startSetCookies = getSetCookies(ctx.response.headers);
+  const { header: cookie } = buildCookieJar(req.headers, startSetCookies);
+
   const VtexSessionToken = cookies?.["VtexSessionToken"] ?? null;
 
   if (!VtexSessionToken) {
@@ -43,6 +50,7 @@ export default async function action(
         headers: {
           "Content-Type": "application/x-www-form-urlencoded",
           "Accept": "application/json",
+          cookie,
         },
       },
     );
@@ -54,8 +62,25 @@ export default async function action(
   }
 
   const data: AuthResponse = await response.json();
-  const setCookies = getSetCookies(response.headers);
-  await setLoginCookies(data, ctx, setCookies);
+  proxySetCookie(response.headers, ctx.response.headers, req.url);
+  const dataRefreshToken = await ctx.invoke.vtex.actions.authentication
+    .refreshToken();
+  await ctx.invoke.vtex.actions.session.validateSession({
+    publicProperties: {
+      refreshAfter: { value: dataRefreshToken.refreshAfter },
+    },
+  });
+
+  // TODO: REMOVE THIS AFTER TESTING AND VALIDATE IF NEEDED REWRITE REFRESH_TOKEN_COOKIE
+  const setCookies = getSetCookies(ctx.response.headers);
+  for (const cookie of setCookies) {
+    if (cookie.name === REFRESH_TOKEN_COOKIE) {
+      setCookie(ctx.response.headers, {
+        ...cookie,
+        path: "/", // default path is /api/vtexid/refreshtoken/webstore, but browser dont send to backend headers
+      });
+    }
+  }
 
   return data;
 }

vtex/actions/authentication/classicSignIn.ts

@@ -1,7 +1,12 @@
 import { AppContext } from "../../mod.ts";
 import { AuthResponse } from "../../utils/types.ts";
-import setLoginCookies from "../../utils/login/setLoginCookies.ts";
-import { getSetCookies } from "std/http/cookie.ts";
+// import setLoginCookies from "../../utils/login/setLoginCookies.ts";
+import { getSetCookies, setCookie } from "std/http/cookie.ts";
+import {
+  buildCookieJar,
+  proxySetCookie,
+  REFRESH_TOKEN_COOKIE,
+} from "../../utils/cookies.ts";
 
 export interface Props {
   email: string;
@@ -14,7 +19,7 @@ export interface Props {
  */
 export default async function action(
   props: Props,
-  _req: Request,
+  req: Request,
   ctx: AppContext,
 ): Promise<AuthResponse> {
   const { vcsDeprecated } = ctx;
@@ -26,6 +31,8 @@ export default async function action(
   const startAuthentication = await ctx.invoke.vtex.actions.authentication
     .startAuthentication({});
 
+  const startSetCookies = getSetCookies(ctx.response.headers);
+  const { header: cookieHeader } = buildCookieJar(req.headers, startSetCookies);
   const authenticationToken = startAuthentication?.authenticationToken;
 
   if (!authenticationToken) {
@@ -39,17 +46,19 @@ export default async function action(
   urlencoded.append("password", props.password);
   urlencoded.append("authenticationToken", authenticationToken);
 
-  const response = await vcsDeprecated
-    ["POST /api/vtexid/pub/authentication/classic/validate"](
-      {},
-      {
-        body: urlencoded,
-        headers: {
-          "Content-Type": "application/x-www-form-urlencoded",
-          "Accept": "application/json",
-        },
+  const response = await vcsDeprecated[
+    "POST /api/vtexid/pub/authentication/classic/validate"
+  ](
+    {},
+    {
+      body: urlencoded,
+      headers: {
+        "Content-Type": "application/x-www-form-urlencoded",
+        Accept: "application/json",
+        cookie: cookieHeader,
       },
-    );
+    },
+  );
 
   if (!response.ok) {
     throw new Error(
@@ -58,8 +67,26 @@ export default async function action(
   }
 
   const data: AuthResponse = await response.json();
-  const setCookies = getSetCookies(response.headers);
-  await setLoginCookies(data, ctx, setCookies);
+  proxySetCookie(response.headers, ctx.response.headers, req.url);
+  // First login was made, but we need to call the refresh token at least once to get the refreshAfter for the first time
+  const dataRefreshToken = await ctx.invoke.vtex.actions.authentication
+    .refreshToken();
+  await ctx.invoke.vtex.actions.session.validateSession({
+    publicProperties: {
+      refreshAfter: { value: dataRefreshToken.refreshAfter },
+    },
+  });
+
+  // TODO: REMOVE THIS AFTER TESTING AND VALIDATE IF NEEDED REWRITE REFRESH_TOKEN_COOKIE
+  const setCookies = getSetCookies(ctx.response.headers);
+  for (const cookie of setCookies) {
+    if (cookie.name === REFRESH_TOKEN_COOKIE) {
+      setCookie(ctx.response.headers, {
+        ...cookie,
+        path: "/", // default path is /api/vtexid/refreshtoken/webstore, but browser dont send to backend headers
+      });
+    }
+  }
 
   return data;
 }

vtex/actions/authentication/logout.ts

@@ -1,34 +1,57 @@
-import { getCookies, setCookie } from "std/http/mod.ts";
-import { AppContext } from "../../mod.ts";
-import { parseCookie } from "../../utils/vtexId.ts";
+// import { getCookies, getSetCookies } from "std/http/cookie.ts";
+import type { AppContext } from "../../mod.ts";
+import { proxySetCookie, REFRESH_TOKEN_COOKIE } from "../../utils/cookies.ts";
+// import { setSegmentBag } from "../../utils/segment.ts";
+import { redirect } from "@deco/deco";
+import { LogoutResponse } from "../../utils/types.ts";
+import { deleteCookie } from "std/http/cookie.ts";
+
+export interface Props {
+  /**
+   * URL to redirect after logout
+   * @default "/"
+   */
+  returnUrl?: string;
+}
 
 /**
- * @title Logout
- * @description Logout the user
+ * @title VTEX Integration - Logout
+ * @description Performs user logout and cleans session data
  */
 export default async function action(
-  _: unknown,
+  { returnUrl = "/" }: Props,
   req: Request,
   ctx: AppContext,
-) {
-  const cookies = getCookies(req.headers);
-  const { payload } = parseCookie(req.headers, ctx.account);
-
-  for (const cookieName in cookies) {
-    if (cookieName.startsWith("VtexIdclientAutCookie")) {
-      setCookie(ctx.response.headers, {
-        name: cookieName,
-        value: "",
-        expires: new Date(0),
-        path: "/",
-      });
-    }
-  }
+): Promise<LogoutResponse> {
+  const { account, vcsDeprecated } = ctx;
+
+  const response = await vcsDeprecated["GET /api/vtexid/pub/logout"]({
+    scope: account,
+  }, {
+    headers: {
+      "cookie": req.headers.get("cookie") || "",
+    },
+  });
 
-  const sessionId = payload?.sess;
-  if (!sessionId) {
-    return;
+  if (!response.ok) {
+    throw new Error(
+      `Logout request failed: ${response.status} ${response.statusText}`,
+    );
   }
 
-  await ctx.invoke.vtex.actions.session.deleteSession({ sessionId });
+  const data = await response.json();
+
+  deleteCookie(ctx.response.headers, REFRESH_TOKEN_COOKIE, {
+    path: "/",
+    domain: new URL(req.url).hostname,
+  });
+
+  proxySetCookie(response.headers, ctx.response.headers, req.url);
+
+  await ctx.invoke.vtex.actions.cart.updateUser();
+  await ctx.invoke.vtex.actions.session
+    .validateSession();
+
+  redirect(returnUrl);
+  return data;
 }