@vtex/faststore-plugin-buyer-portal 1.1.106 → 1.1.108

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vtex/faststore-plugin-buyer-portal",
-	"version": "1.1.106",
+	"version": "1.1.108",
 	"description": "A plugin for faststore with buyer portal",
 	"main": "index.js",
 	"scripts": {

package/src/features/custom-fields/layouts/CustomFieldsLayout/CustomFieldsLayout.tsx

@@ -43,6 +43,7 @@ export const CustomFieldsLayout = ({
     currentContract: contract,
     clientContext,
   } = useBuyerPortal();
+
   const searchParams = useSearchParams();
   const [currentSelectedContent, setCurrentSelectedContent] =
     useState<CustomFieldData>();

package/src/features/shared/clients/Auth.ts

@@ -0,0 +1,25 @@
+import { getApiUrl } from "../../shared/utils";
+
+import { Client } from "./Client";
+
+type AuthContextProps = {
+  cookie: string;
+};
+
+export default class AuthClient extends Client {
+  constructor() {
+    super(getApiUrl());
+  }
+
+  validateAccess(context: AuthContextProps) {
+    return this.get<boolean>("granted", {
+      headers: {
+        Cookie: context.cookie,
+        "Content-Type": "text/plain",
+      },
+    });
+  }
+}
+
+const authClient = new AuthClient();
+export { authClient };

package/src/features/shared/clients/Client.ts

@@ -1,8 +1,8 @@
-import { toQueryParams } from "../utils";
 import {
   getAuthFromCookie,
   getCookieWithoutSessionObjects,
 } from "../utils/cookie";
+import { toQueryParams } from "../utils/toQueryParams";
 
 interface RequestConfig<Input = unknown> {
   url: string;
@@ -87,6 +87,7 @@ class Client {
           ? getCookieWithoutSessionObjects(headers.Cookie ?? "")
           : {}),
         ...(headers.Cookie ? getAuthFromCookie(headers.Cookie ?? "") : {}),
+        ...headers,
       },
       ...(cache ? { cache, next: { revalidate: 300 } } : {}),
     };
@@ -106,6 +107,15 @@ class Client {
         responseData = await response.json();
       }
 
+      if (contentType?.includes("text/plain")) {
+        const text = await response.text();
+        try {
+          responseData = JSON.parse(text);
+        } catch {
+          responseData = text as unknown as Return;
+        }
+      }
+
       if (!response.ok) {
         console.error(`Request to ${url} failed:`, responseData);
         console.error(response.status, response.statusText);

package/src/features/shared/components/withErrorBoundary/withErrorBoundary.tsx

@@ -2,7 +2,7 @@
 
 import React from "react";
 
-import { ErrorBoundary } from "../ErrorBoundary/ErrorBoundary";
+// import { ErrorBoundary } from "../ErrorBoundary/ErrorBoundary";
 
 type WithErrorBoundaryOptions = {
   fallback?: React.ReactNode;
@@ -15,15 +15,16 @@ type WithErrorBoundaryOptions = {
 
 export function withErrorBoundary<P extends Record<string, unknown>>(
   WrappedComponent: React.ComponentType<P>,
-  options: WithErrorBoundaryOptions = {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _options: WithErrorBoundaryOptions = {}
 ) {
-  const { onError, tags } = options;
+  // const { onError, tags } = options;
 
   const ComponentWithErrorBoundary = (props: P) => {
     return (
-      <ErrorBoundary onError={onError} tags={tags}>
-        <WrappedComponent {...props} />
-      </ErrorBoundary>
+      // <ErrorBoundary onError={onError} tags={tags}>
+      <WrappedComponent {...props} />
+      // </ErrorBoundary>
     );
   };
 

package/src/features/shared/services/index.ts

@@ -6,3 +6,7 @@ export {
   removeFromScopeService,
   type RemoveFromScopeServiceProps,
 } from "./remove-from-scope.service";
+export {
+  validateAccessService,
+  type ValidateAccessServiceProps,
+} from "./validate-access.service";

package/src/features/shared/services/validate-access.service.ts

@@ -0,0 +1,11 @@
+import { authClient } from "../clients/Auth";
+
+export type ValidateAccessServiceProps = {
+  cookie: string;
+};
+
+export const validateAccessService = async ({
+  cookie,
+}: ValidateAccessServiceProps) => {
+  return authClient.validateAccess({ cookie });
+};

package/src/features/shared/types/AuthRouteProps.ts

@@ -0,0 +1,5 @@
+import { ClientContext } from "../utils";
+
+export type AuthRouteProps<T> =
+  | { authorized: true; data: T; clientContext: ClientContext }
+  | { authorized: false };

package/src/features/shared/types/index.ts

@@ -7,3 +7,4 @@ export type {
   PaymentMethodResponse,
   PaymentMethodsReqCommonParams,
 } from "./PaymentMethodsClientTypes";
+export { type AuthRouteProps } from "./AuthRouteProps";

package/src/features/shared/utils/constants.ts

@@ -1,10 +1,10 @@
 export const AUT_COOKIE_KEY = "VtexIdclientAutCookie";
 // PROD URL
-export const API_URL = (checkoutUrl: string, operation?: string) =>
-  `${checkoutUrl}/_v/store-front/${operation}`;
+// export const API_URL = (checkoutUrl: string, operation?: string) =>
+//   `${checkoutUrl}/_v/store-front/${operation}`;
 // DEV URL - CHANGE BEFORE MERGE
-// export const API_URL = (checkoutUrl?: string, operation?: string) =>
-//   `https://everton--b2bfaststoredev.myvtex.com/_v/store-front/${operation}`;
+export const API_URL = (checkoutUrl?: string, operation?: string) =>
+  `https://permission--b2bfaststoredev.myvtex.com/_v/store-front/${operation}`;
 
 export const DEBOUNCE_TIMEOUT = 500;
 

package/src/features/shared/utils/index.ts

@@ -37,3 +37,8 @@ export { isPluginError } from "./isPluginError";
 export { serializeLoaderData } from "./serializeLoaderData";
 export { withLoaderErrorBoundary } from "./withLoaderErrorBoundary";
 export { withClientErrorBoundary } from "./withClientErrorBoundary";
+export { withAuthProvider } from "./withAuthProvider";
+export { withAuth } from "./withAuth";
+export { withBuyerPortal } from "./withBuyerPortal";
+export { withProviders } from "./withProviders";
+export { withAuthLoader } from "./withAuthLoader";

package/src/features/shared/utils/withAuth.tsx

@@ -0,0 +1,31 @@
+import { useEffect, type ComponentType } from "react";
+
+import { useRouter } from "next/router";
+
+import type { AuthRouteProps } from "../types";
+
+/**
+ * HOC that checks only for authorization
+ */
+export const withAuth = <T extends Record<string, unknown>>(
+  Component: ComponentType<T>
+) => {
+  return function AuthenticatedComponent(props: AuthRouteProps<T>) {
+    const router = useRouter();
+
+    useEffect(() => {
+      // If not authorized, reload the page
+      if (!props?.authorized) {
+        router.reload();
+      }
+    }, [props?.authorized, router]);
+
+    // If not authorized, render nothing
+    if (!props?.authorized) {
+      return null;
+    }
+
+    // If authorized, render the component with the data
+    return <Component {...(props.data as T)} />;
+  };
+};

package/src/features/shared/utils/withAuthLoader.ts

@@ -0,0 +1,47 @@
+import { validateAccessService } from "../services";
+
+import { ClientContext, getClientContext } from "./getClientContext";
+
+import type { AuthRouteProps } from "../types";
+import type { LoaderData } from "../types";
+
+/**
+ * Utility function to encapsulate access validation in loaders.
+ * Similar to withAuthProvider but for server-side usage.
+ */
+export const withAuthLoader = async <T>(
+  data: LoaderData,
+  dataLoader: (clientContext: ClientContext) => Promise<T>
+): Promise<AuthRouteProps<T>> => {
+  try {
+    const { cookie, userId, ...clientContext } = await getClientContext(data);
+
+    const hasAccess = await validateAccessService({ cookie });
+
+    if (!hasAccess) {
+      data.res?.writeHead(302, { Location: "/" });
+      data.res?.end();
+
+      return {
+        authorized: false,
+      };
+    }
+
+    const pageData = await dataLoader({ cookie, userId, ...clientContext });
+
+    return {
+      authorized: true,
+      data: pageData,
+      clientContext: { cookie, userId, ...clientContext },
+    };
+  } catch (error) {
+    console.error("Auth validation failed:", error);
+
+    data.res?.writeHead(302, { Location: "/" });
+    data.res?.end();
+
+    return {
+      authorized: false,
+    };
+  }
+};

package/src/features/shared/utils/withAuthProvider.tsx

@@ -0,0 +1,38 @@
+import { useEffect, type ComponentType } from "react";
+
+import { useRouter } from "next/router";
+
+import { BuyerPortalProvider } from "../components";
+
+import type { AuthRouteProps } from "../types";
+import type { ClientContext } from "./getClientContext";
+
+/**
+ * HOC que encapsula lógica de autenticação e provider
+ */
+export const withAuthProvider = <T,>(
+  Component: ComponentType<T & { clientContext: ClientContext }>
+) => {
+  return function WrappedPage(props: AuthRouteProps<T>) {
+    const router = useRouter();
+
+    useEffect(() => {
+      // Se não está autorizado, recarrega a página
+      if (!props?.authorized) {
+        router.reload();
+      }
+    }, [props?.authorized, router]);
+
+    // Se não está autorizado, não renderiza nada
+    if (!props?.authorized) {
+      return null;
+    }
+
+    // Se autorizado, renderiza o componente envolvido no provider
+    return (
+      <BuyerPortalProvider clientContext={props?.clientContext}>
+        <Component {...props.data} clientContext={props?.clientContext} />
+      </BuyerPortalProvider>
+    );
+  };
+};

package/src/features/shared/utils/withBuyerPortal.tsx

@@ -0,0 +1,24 @@
+import { type ComponentType } from "react";
+
+import { BuyerPortalProvider } from "../components";
+
+import type { ClientContext } from "./getClientContext";
+
+/**
+ * HOC que adiciona BuyerPortalProvider e context
+ */
+export const withBuyerPortal = <T extends Record<string, unknown>>(
+  Component: ComponentType<T>
+) => {
+  return function WrappedWithProvider(
+    props: T & { context: { clientContext: ClientContext } }
+  ) {
+    const { context, ...componentProps } = props;
+
+    return (
+      <BuyerPortalProvider {...context}>
+        <Component {...(componentProps as unknown as T)} />
+      </BuyerPortalProvider>
+    );
+  };
+};

package/src/features/shared/utils/withLoaderErrorBoundary.ts

@@ -1,4 +1,4 @@
-import { getClientContext } from "./getClientContext";
+// import { getClientContext } from "./getClientContext";
 import { serializeLoaderData } from "./serializeLoaderData";
 
 import type { LoaderData } from "../types";
@@ -11,77 +11,85 @@ interface WithLoaderErrorBoundaryOptions {
 
 export function withLoaderErrorBoundary<TQuery, TReturn>(
   loaderFn: (data: LoaderData<TQuery>) => Promise<TReturn>,
-  options: WithLoaderErrorBoundaryOptions = {}
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  _options: WithLoaderErrorBoundaryOptions = {}
 ) {
-  const { componentName, onError, redirectToError = true } = options;
-
+  // Bypass: Just call the loader function and serialize the result
   return async (data: LoaderData<TQuery>): Promise<TReturn> => {
-    try {
-      const result = await loaderFn(data);
-      return serializeLoaderData(result);
-    } catch (error) {
-      console.error(`[${componentName || "Loader"}] Error:`, {
-        message: (error as Error).message,
-        query: data.query,
-      });
-
-      if (onError) {
-        onError(error as Error, data.query);
-      }
-
-      if (redirectToError) {
-        let clientContext;
-        try {
-          clientContext = await getClientContext(data);
-        } catch (contextError) {
-          console.error(
-            `[${componentName || "Loader"}] Failed to get client context:`,
-            contextError
-          );
-          clientContext = {
-            cookie: "",
-            customerId: "",
-            userId: "",
-            vtexIdclientAutCookie: "",
-          };
-        }
-
-        // Serialize query to ensure it's JSON-safe (use null instead of undefined)
-        const serializedQuery = data.query
-          ? JSON.parse(JSON.stringify(data.query))
-          : null;
-
-        const errorResponse = {
-          error: {
-            error: {
-              message: (error as Error).message,
-              name: (error as Error).name,
-              stack: (error as Error).stack || null,
-              query: serializedQuery,
-            },
-            tags: {
-              component: componentName || "Unknown",
-              errorType: "loader_error",
-            },
-            extra: {
-              query: serializedQuery,
-            },
-          },
-          hasError: true,
-          context: {
-            clientContext,
-            currentOrgUnit: null,
-            currentContract: null,
-            currentUser: null,
-          },
-          data: null,
-        };
-
-        // Ensure error response is also JSON-serializable
-        return serializeLoaderData(errorResponse) as TReturn;
-      }
-
-      throw error;
-    }
+    const result = await loaderFn(data);
+    return serializeLoaderData(result);
   };
+
+  // Old error handling code - commented out for bypass
+  // const { componentName, onError, redirectToError = true } = options;
+  //
+  // return async (data: LoaderData<TQuery>): Promise<TReturn> => {
+  //   try {
+  //     const result = await loaderFn(data);
+  //     return serializeLoaderData(result);
+  //   } catch (error) {
+  //     console.error(`[${componentName || "Loader"}] Error:`, {
+  //       message: (error as Error).message,
+  //       query: data.query,
+  //     });
+  //
+  //     if (onError) {
+  //       onError(error as Error, data.query);
+  //     }
+  //
+  //     if (redirectToError) {
+  //       let clientContext;
+  //       try {
+  //         clientContext = await getClientContext(data);
+  //       } catch (contextError) {
+  //         console.error(
+  //           `[${componentName || "Loader"}] Failed to get client context:`,
+  //           contextError
+  //         );
+  //         clientContext = {
+  //           cookie: "",
+  //           customerId: "",
+  //           userId: "",
+  //           vtexIdclientAutCookie: "",
+  //         };
+  //       }
+  //
+  //       // Serialize query to ensure it's JSON-safe (use null instead of undefined)
+  //       const serializedQuery = data.query
+  //         ? JSON.parse(JSON.stringify(data.query))
+  //         : null;
+  //
+  //       const errorResponse = {
+  //         error: {
+  //           error: {
+  //             message: (error as Error).message,
+  //             name: (error as Error).name,
+  //             stack: (error as Error).stack || null,
+  //             query: serializedQuery,
+  //           },
+  //           tags: {
+  //             component: componentName || "Unknown",
+  //             errorType: "loader_error",
+  //           },
+  //           extra: {
+  //             query: serializedQuery,
+  //           },
+  //         },
+  //         hasError: true,
+  //         context: {
+  //           clientContext,
+  //           currentOrgUnit: null,
+  //           currentContract: null,
+  //           currentUser: null,
+  //         },
+  //         data: null,
+  //       };
+  //
+  //       // Ensure error response is also JSON-serializable
+  //       return serializeLoaderData(errorResponse) as TReturn;
+  //     }
+  //
+  //     throw error;
+  //   }
+  // };
 }

package/src/features/shared/utils/withProviders.tsx

@@ -0,0 +1,35 @@
+import { type ComponentType } from "react";
+
+import { withAuth } from "./withAuth";
+import { withBuyerPortal } from "./withBuyerPortal";
+
+/**
+ * Type for HOCs that can be applied in sequence
+ * Using any for flexibility in HOC composition
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type ProviderHOC = (Component: ComponentType<any>) => ComponentType<any>;
+
+/**
+ * Default project providers applied to all pages.
+ * Order: right to left (like pipe/compose)
+ */
+const projectProviders: ProviderHOC[] = [withAuth, withBuyerPortal];
+
+/**
+ * HOC that applies all default project providers.
+ * To add new providers, just include them in the projectProviders array.
+ *
+ * @example
+ * export default withProviders(MyComponent);
+ */
+export const withProviders = <T extends Record<string, unknown>>(
+  Component: ComponentType<T>
+): ComponentType<T> => {
+  // Apply providers in sequence (right to left)
+  return projectProviders.reduceRight(
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    (WrappedComponent, provider) => provider(WrappedComponent) as any,
+    Component
+  ) as ComponentType<T>;
+};