@vtex/faststore-plugin-buyer-portal 1.1.107 → 1.1.109

package/src/pages/org-unit-details.tsx

@@ -1,21 +1,19 @@
 import { getContractsByOrgUnitIdService } from "../features/contracts/services";
 import { OrgUnitsDetailsLayout } from "../features/org-units/layouts";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type OrgUnitDetailsPageData = {
@@ -24,7 +22,9 @@ export type OrgUnitDetailsPageData = {
     contracts: ContractData[];
     user: UserData | null;
   };
-  clientContext: ClientContext;
+  context: {
+    clientContext: ClientContext;
+  };
   hasError?: boolean;
   error?: {
     error: {
@@ -45,35 +45,37 @@ type OrgUnitDetailsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitDetailsPageQuery>
-): Promise<OrgUnitDetailsPageData> => {
-  const { orgUnitId } = data.query ?? {};
+): Promise<AuthRouteProps<OrgUnitDetailsPageData>> => {
+  const { orgUnitId } = data.query;
 
   if (!orgUnitId) {
     throw new Error(`Missing required query param: orgUnitId=${orgUnitId}`);
   }
 
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const orgUnit = await getOrgUnitBasicDataService({
+      id: orgUnitId,
+      cookie,
+    });
 
-  const orgUnit = await getOrgUnitBasicDataService({
-    id: orgUnitId,
-    cookie,
-  });
+    const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+    const contracts = await getContractsByOrgUnitIdService({
+      orgUnitId,
+      cookie,
+    });
 
-  const contracts = await getContractsByOrgUnitIdService({
-    orgUnitId,
-    cookie,
+    return {
+      data: {
+        contracts,
+        orgUnit,
+        user,
+      },
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+      },
+    };
   });
-
-  return {
-    data: {
-      contracts,
-      orgUnit,
-      user,
-    },
-    clientContext: { cookie, userId, ...clientContext },
-  };
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -83,24 +85,25 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 
 const OrgUnitDetailsPage = ({
   data,
-  clientContext,
   hasError,
   error,
 }: OrgUnitDetailsPageData) => {
   return (
-    <BuyerPortalProvider clientContext={clientContext}>
+    <>
       {hasError ? (
         <ErrorTabsLayout error={error} />
       ) : (
         <OrgUnitsDetailsLayout data={data} />
       )}
-    </BuyerPortalProvider>
+    </>
   );
 };
 
-export default withErrorBoundary(OrgUnitDetailsPage, {
-  tags: {
-    component: "OrgUnitDetailsPage",
-    errorType: "org_unit_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(OrgUnitDetailsPage, {
+    tags: {
+      component: "OrgUnitDetailsPage",
+      errorType: "org_unit_details_error",
+    },
+  })
+);

package/src/pages/org-units.tsx

@@ -5,16 +5,14 @@ import {
   getOrgUnitByIdService,
   searchOrgUnitsByNameService,
 } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
@@ -22,7 +20,7 @@ import type {
   OrgUnitBasicData,
   OrgUnitSearchResponse,
 } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type OrgUnitsPageData = {
@@ -44,80 +42,82 @@ type OrgUnitsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitsPageQuery>
-): Promise<OrgUnitsPageData> => {
-  const { cookie, customerId, userId, ...restClientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<OrgUnitsPageData>> => {
   const { search, orgUnitId } = data.query;
 
-  const currentOrgUnit = await getOrgUnitBasicDataService({
-    id: data.query.orgUnitId,
-    cookie,
-  });
-
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+  return withAuthLoader(
+    data,
+    async ({ cookie, customerId, userId, ...restClientContext }) => {
+      const currentOrgUnit = await getOrgUnitBasicDataService({
+        id: data.query.orgUnitId,
+        cookie,
+      });
 
-  const clientContext = {
-    cookie,
-    customerId,
-    userId,
-    ...restClientContext,
-  };
+      const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
-  if (search) {
-    return {
-      data: await searchOrgUnitsByNameService({
-        name: search,
-        contractId: customerId,
+      const clientContext = {
         cookie,
-      }),
-      search,
-      context: {
-        clientContext,
-        currentOrgUnit,
-        currentUser: user,
-      },
-    };
-  }
-
-  const orgUnit = await getOrgUnitByIdService({
-    id: orgUnitId,
-    cookie,
-  });
-
-  if (orgUnit) {
-    const orgUnitChildren = await getChildrenOrgUnitsService(
-      orgUnitId,
-      orgUnit.name,
-      cookie
-    );
-
-    return {
-      data: {
-        organizationalUnits: orgUnitChildren.nodes ?? [],
-        total: orgUnitChildren.totalChildrenQuantity ?? 0,
-      },
-      search: "",
-      context: {
-        clientContext,
-        currentOrgUnit,
-        currentUser: user,
-      },
-    };
-  }
-
-  data.res?.writeHead(302, { Location: "/pvt/organization-account" });
-  data.res?.end();
-
-  return {
-    data: { organizationalUnits: [], total: 0 },
-    search: "",
-    context: {
-      clientContext,
-      currentOrgUnit,
-      currentUser: user,
-    },
-  };
+        customerId,
+        userId,
+        ...restClientContext,
+      };
+
+      if (search) {
+        return {
+          data: await searchOrgUnitsByNameService({
+            name: search,
+            contractId: customerId,
+            cookie,
+          }),
+          search,
+          context: {
+            clientContext,
+            currentOrgUnit,
+            currentUser: user,
+          },
+        };
+      }
+
+      const orgUnit = await getOrgUnitByIdService({
+        id: orgUnitId,
+        cookie,
+      });
+
+      if (orgUnit) {
+        const orgUnitChildren = await getChildrenOrgUnitsService(
+          orgUnitId,
+          orgUnit.name,
+          cookie
+        );
+
+        return {
+          data: {
+            organizationalUnits: orgUnitChildren.nodes ?? [],
+            total: orgUnitChildren.totalChildrenQuantity ?? 0,
+          },
+          search: "",
+          context: {
+            clientContext,
+            currentOrgUnit,
+            currentUser: user,
+          },
+        };
+      }
+
+      data.res?.writeHead(302, { Location: "/pvt/organization-account" });
+      data.res?.end();
+
+      return {
+        data: { organizationalUnits: [], total: 0 },
+        search: "",
+        context: {
+          clientContext,
+          currentOrgUnit,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -125,27 +125,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const OrgUnitsPage = ({
-  data,
-  search,
-  context,
-  hasError,
-  error,
-}: OrgUnitsPageData) => {
+const OrgUnitsPage = ({ data, search, hasError, error }: OrgUnitsPageData) => {
   return (
-    <BuyerPortalProvider {...context}>
+    <>
       {hasError ? (
         <ErrorTabsLayout error={error} />
       ) : (
         <OrgUnitsLayout data={data} search={search} />
       )}
-    </BuyerPortalProvider>
+    </>
   );
 };
 
-export default withErrorBoundary(OrgUnitsPage, {
-  tags: {
-    component: "OrgUnitsPage",
-    errorType: "org_units_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(OrgUnitsPage, {
+    tags: {
+      component: "OrgUnitsPage",
+      errorType: "org_units_error",
+    },
+  })
+);

package/src/pages/payment-methods.tsx

@@ -5,23 +5,21 @@ import {
   getPaymentMethodsByUnitIdService,
   GetPaymentMethodsByUnitIdServiceProps,
 } from "../features/payment-methods/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
 import type { PaymentMethodData } from "../features/payment-methods/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type PaymentMethodsPageData = {
@@ -44,40 +42,40 @@ export type PaymentMethodsPageQuery = GetPaymentMethodsByUnitIdServiceProps & {
 
 const loaderFunction = async (
   data: LoaderData<PaymentMethodsPageQuery>
-): Promise<PaymentMethodsPageData> => {
+): Promise<AuthRouteProps<PaymentMethodsPageData>> => {
   const { contractId, orgUnitId, search } = data.query;
 
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const currentOrgUnit = await getOrgUnitBasicDataService({
+      id: orgUnitId,
+      cookie,
+    });
 
-  const currentOrgUnit = await getOrgUnitBasicDataService({
-    id: orgUnitId,
-    cookie,
-  });
+    const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+    const contract = await getContractDetailsService({
+      contractId,
+      cookie,
+      unitId: orgUnitId,
+    });
 
-  const contract = await getContractDetailsService({
-    contractId,
-    cookie,
-    unitId: orgUnitId,
-  });
+    const paymentMethods = await getPaymentMethodsByUnitIdService({
+      customerId: contractId,
+      unitId: currentOrgUnit.id,
+      cookie,
+    });
 
-  const paymentMethods = await getPaymentMethodsByUnitIdService({
-    customerId: contractId,
-    unitId: currentOrgUnit.id,
-    cookie,
+    return {
+      data: paymentMethods,
+      search: search ?? "",
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+        currentOrgUnit,
+        currentUser: user,
+        currentContract: contract,
+      },
+    };
   });
-
-  return {
-    data: paymentMethods,
-    search: search ?? "",
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-      currentContract: contract,
-    },
-  };
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -87,22 +85,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 
 const PaymentMethodsPage = ({
   data,
-  context,
   hasError,
   error,
 }: PaymentMethodsPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <PaymentMethodsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(PaymentMethodsPage, {
-  tags: {
-    component: "PaymentMethodsPage",
-    errorType: "payment_methods_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(PaymentMethodsPage, {
+    tags: {
+      component: "PaymentMethodsPage",
+      errorType: "payment_methods_error",
+    },
+  })
+);

package/src/pages/po-numbers.tsx

@@ -1,22 +1,20 @@
 import { getContractDetailsService } from "../features/contracts/services";
 import { CustomFieldsLayout } from "../features/custom-fields/layouts";
 import { getOrgUnitBasicDataService } from "../features/org-units/services";
-import {
-  BuyerPortalProvider,
-  withErrorBoundary,
-} from "../features/shared/components";
+import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import { ErrorTabsLayout } from "../features/shared/layouts/ErrorTabsLayout/ErrorTabsLayout";
 import {
   ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
 import type { ContractData } from "../features/contracts/types";
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 export type PONumbersPageData = {
@@ -40,35 +38,37 @@ type OrgUnitsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitsPageQuery>
-): Promise<PONumbersPageData> => {
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<PONumbersPageData>> => {
   const { contractId, orgUnitId } = data.query;
 
-  const [orgUnit, contract, user] = await Promise.all([
-    getOrgUnitBasicDataService({
-      id: orgUnitId,
-      cookie,
-    }),
-    getContractDetailsService({
-      contractId,
-      unitId: orgUnitId,
-      cookie,
-    }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-  ]);
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      const [orgUnit, contract, user] = await Promise.all([
+        getOrgUnitBasicDataService({
+          id: orgUnitId,
+          cookie,
+        }),
+        getContractDetailsService({
+          contractId,
+          unitId: orgUnitId,
+          cookie,
+        }),
+        getUserByIdService({ orgUnitId, userId, cookie }),
+      ]);
 
-  return {
-    data: contract,
-    context: {
-      search: "",
-      clientContext: { customerId, cookie, userId, ...clientContext },
-      currentOrgUnit: orgUnit,
-      currentContract: contract,
-      currentUser: user,
-    },
-  };
+      return {
+        data: contract,
+        context: {
+          search: "",
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -76,26 +76,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const PONumbersPage = ({
-  data,
-  context,
-  hasError,
-  error,
-}: PONumbersPageData) => {
+const PONumbersPage = ({ data, hasError, error }: PONumbersPageData) => {
   return (
-    <BuyerPortalProvider {...context}>
+    <>
       {hasError ? (
         <ErrorTabsLayout error={error} />
       ) : (
         <CustomFieldsLayout data={data} customFieldsLabel="PO Number" />
       )}
-    </BuyerPortalProvider>
+    </>
   );
 };
 
-export default withErrorBoundary(PONumbersPage, {
-  tags: {
-    component: "PONumbersPage",
-    errorType: "po_numbers_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(PONumbersPage, {
+    tags: {
+      component: "PONumbersPage",
+      errorType: "po_numbers_error",
+    },
+  })
+);