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

package/src/pages/buying-policy-details.tsx

@@ -2,16 +2,14 @@ import { BuyingPolicyDetailsLayout } from "../features/buying-policies/layouts/B
 import { getBuyingPolicyService } from "../features/buying-policies/services";
 import { getContractDetailsService } from "../features/contracts/services";
 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 {
   type ClientContext,
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { getUserByIdService } from "../features/users/services";
 
@@ -19,7 +17,7 @@ import type { GetAddressesServiceProps } from "../features/addresses/services";
 import type { BuyingPolicy } from "../features/buying-policies/types";
 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 BuyingPolicyDetailsPageData = {
@@ -42,42 +40,42 @@ export type BuyingPolicyDetailsPageQuery = GetAddressesServiceProps & {
 
 const loaderFunction = async (
   data: LoaderData<BuyingPolicyDetailsPageQuery>
-): Promise<BuyingPolicyDetailsPageData> => {
+): Promise<AuthRouteProps<BuyingPolicyDetailsPageData>> => {
   const { contractId, orgUnitId, buyingPolicyId } = 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 buyingPolicy = await getBuyingPolicyService({
+      orgUnitId,
+      contractId,
+      buyingPolicyId,
+      cookie,
+    });
 
-  const buyingPolicy = await getBuyingPolicyService({
-    orgUnitId,
-    contractId,
-    buyingPolicyId,
-    cookie,
+    return {
+      data: {
+        buyingPolicy,
+      },
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+        currentOrgUnit,
+        currentUser: user,
+        currentContract: contract,
+      },
+    };
   });
-
-  return {
-    data: {
-      buyingPolicy,
-    },
-    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 BuyingPolicyDetailsPage = ({
   data,
-  context,
   hasError,
   error,
 }: BuyingPolicyDetailsPageData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <BuyingPolicyDetailsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(BuyingPolicyDetailsPage, {
-  tags: {
-    component: "BuyingPolicyDetailsPage",
-    errorType: "buying_policy_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(BuyingPolicyDetailsPage, {
+    tags: {
+      component: "BuyingPolicyDetailsPage",
+      errorType: "buying_policy_details_error",
+    },
+  })
+);

package/src/pages/collections.tsx

@@ -5,21 +5,19 @@ import { ScopeCollection } from "../features/collections/types";
 import { getContractDetailsService } from "../features/contracts/services";
 import { ContractData } from "../features/contracts/types";
 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 {
   type ClientContext,
-  getClientContext,
   getValidPage,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 
 import type { OrgUnitBasicData } from "../features/org-units/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 
 export type CollectionsData = {
   collections: ScopeCollection[];
@@ -45,58 +43,58 @@ export type CollectionsQuery = {
 
 const loaderFunction = async (
   data: LoaderData<CollectionsQuery>
-): Promise<CollectionsData> => {
+): Promise<AuthRouteProps<CollectionsData>> => {
   const { contractId, orgUnitId, search = "", page: pageString } = data.query;
 
   const page = getValidPage(pageString);
 
-  const { cookie, ...clientContext } = await getClientContext(data);
-
-  const [currentOrgUnit, contract] = await Promise.all([
-    getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
-    getContractDetailsService({ contractId, cookie, unitId: orgUnitId }),
-  ]);
-
-  const [enabledCollections, allCollections, contractCollections] =
-    await Promise.all([
-      getCollectionsFromScopeService({
-        cookie,
-        contractId,
-        unitId: orgUnitId,
-        filterByScope: true,
-        name: search,
-        page,
-      }),
-      getCollectionsFromScopeService({
-        cookie,
-        contractId,
-        unitId: orgUnitId,
-        filterByScope: false,
-        page: 1,
-      }),
-      getCollectionsFromContractService({
-        contractId,
-        cookie,
-        unitId: orgUnitId,
-      }),
+  return withAuthLoader(data, async ({ cookie, ...clientContext }) => {
+    const [currentOrgUnit, contract] = await Promise.all([
+      getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
+      getContractDetailsService({ contractId, cookie, unitId: orgUnitId }),
     ]);
 
-  const isContractEmpty =
-    !Array.isArray(contractCollections) || contractCollections?.length === 0;
-  const drawerCollections = allCollections.filter((col) => !col.isEnabled);
+    const [enabledCollections, allCollections, contractCollections] =
+      await Promise.all([
+        getCollectionsFromScopeService({
+          cookie,
+          contractId,
+          unitId: orgUnitId,
+          filterByScope: true,
+          name: search,
+          page,
+        }),
+        getCollectionsFromScopeService({
+          cookie,
+          contractId,
+          unitId: orgUnitId,
+          filterByScope: false,
+          page: 1,
+        }),
+        getCollectionsFromContractService({
+          contractId,
+          cookie,
+          unitId: orgUnitId,
+        }),
+      ]);
 
-  return {
-    collections: enabledCollections,
-    drawerCollections,
-    isContractEmpty,
-    search,
-    page,
-    context: {
-      clientContext: { cookie, ...clientContext },
-      currentContract: contract,
-      currentOrgUnit,
-    },
-  };
+    const isContractEmpty =
+      !Array.isArray(contractCollections) || contractCollections?.length === 0;
+    const drawerCollections = allCollections.filter((col) => !col.isEnabled);
+
+    return {
+      collections: enabledCollections,
+      drawerCollections,
+      isContractEmpty,
+      search,
+      page,
+      context: {
+        clientContext: { cookie, ...clientContext },
+        currentContract: contract,
+        currentOrgUnit,
+      },
+    };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -105,7 +103,6 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
 });
 
 const CollectionsPage = ({
-  context,
   collections,
   drawerCollections,
   isContractEmpty,
@@ -114,7 +111,7 @@ const CollectionsPage = ({
   hasError,
   error,
 }: CollectionsData) => (
-  <BuyerPortalProvider {...context}>
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
@@ -126,12 +123,14 @@ const CollectionsPage = ({
         isContractEmpty={isContractEmpty}
       />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(CollectionsPage, {
-  tags: {
-    component: "CollectionsPage",
-    errorType: "collections_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(CollectionsPage, {
+    tags: {
+      component: "CollectionsPage",
+      errorType: "collections_error",
+    },
+  })
+);

package/src/pages/cost-centers.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 CostCentersPageData = {
@@ -40,41 +38,43 @@ type OrgUnitsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitsPageQuery>
-): Promise<CostCentersPageData> => {
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<CostCentersPageData>> => {
   const { contractId, orgUnitId, search } = data.query;
 
-  if (!contractId || !orgUnitId) {
-    return {
-      data: null,
-      context: {
-        clientContext: { cookie, userId, customerId, ...clientContext },
-        currentContract: null,
-        currentUser: null,
-        currentOrgUnit: null,
-        search: "",
-      },
-    };
-  }
+  return withAuthLoader(
+    data,
+    async ({ customerId, cookie, userId, ...clientContext }) => {
+      if (!contractId || !orgUnitId) {
+        return {
+          data: null,
+          context: {
+            clientContext: { customerId, cookie, userId, ...clientContext },
+            currentContract: null,
+            currentUser: null,
+            currentOrgUnit: null,
+            search: "",
+          },
+        };
+      }
 
-  const [orgUnit, contract, user] = await Promise.all([
-    getOrgUnitBasicDataService({ id: orgUnitId, cookie }),
-    getContractDetailsService({ contractId, unitId: orgUnitId, cookie }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-  ]);
+      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: search ?? "",
-      clientContext: { customerId, cookie, userId, ...clientContext },
-      currentOrgUnit: orgUnit,
-      currentContract: contract,
-      currentUser: user,
-    },
-  };
+      return {
+        data: contract,
+        context: {
+          search: search ?? "",
+          clientContext: { customerId, cookie, userId, ...clientContext },
+          currentOrgUnit: orgUnit,
+          currentContract: contract,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -82,26 +82,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const CostCentersPage = ({
-  data,
-  context,
-  hasError,
-  error,
-}: CostCentersPageData) => {
+const CostCentersPage = ({ data, hasError, error }: CostCentersPageData) => {
   return (
-    <BuyerPortalProvider {...context}>
+    <>
       {hasError ? (
         <ErrorTabsLayout error={error} />
       ) : (
         <CustomFieldsLayout data={data} customFieldsLabel="Cost Center" />
       )}
-    </BuyerPortalProvider>
+    </>
   );
 };
 
-export default withErrorBoundary(CostCentersPage, {
-  tags: {
-    component: "CostCentersPage",
-    errorType: "cost_centers_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(CostCentersPage, {
+    tags: {
+      component: "CostCentersPage",
+      errorType: "cost_centers_error",
+    },
+  })
+);

package/src/pages/credit-cards.tsx

@@ -3,22 +3,20 @@ import { CreditCardLayout } from "../features/credit-cards/layouts";
 import { getCreditCardsListService } from "../features/credit-cards/services";
 import { CreditCardData } from "../features/credit-cards/types";
 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 {
   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 CreditCardPageData = {
@@ -40,38 +38,38 @@ export type CreditCardPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<CreditCardPageQuery>
-): Promise<CreditCardPageData> => {
+): Promise<AuthRouteProps<CreditCardPageData>> => {
   const { contractId, orgUnitId } = data.query;
 
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
-
-  const [currentOrgUnit, user, contract, creditCards] = await Promise.all([
-    getOrgUnitBasicDataService({
-      id: orgUnitId,
-      cookie,
-    }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-    getContractDetailsService({
-      contractId,
-      cookie,
-      unitId: orgUnitId,
-    }),
-    getCreditCardsListService({
-      cookie,
-      unitId: orgUnitId,
-      customerId: contractId,
-    }),
-  ]);
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const [currentOrgUnit, user, contract, creditCards] = await Promise.all([
+      getOrgUnitBasicDataService({
+        id: orgUnitId,
+        cookie,
+      }),
+      getUserByIdService({ orgUnitId, userId, cookie }),
+      getContractDetailsService({
+        contractId,
+        cookie,
+        unitId: orgUnitId,
+      }),
+      getCreditCardsListService({
+        cookie,
+        unitId: orgUnitId,
+        customerId: contractId,
+      }),
+    ]);
 
-  return {
-    data: creditCards,
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-      currentContract: contract,
-    },
-  };
+    return {
+      data: creditCards,
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+        currentOrgUnit,
+        currentUser: user,
+        currentContract: contract,
+      },
+    };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -79,24 +77,21 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const CreditCardsPage = ({
-  data,
-  context,
-  hasError,
-  error,
-}: CreditCardPageData) => (
-  <BuyerPortalProvider {...context}>
+const CreditCardsPage = ({ data, hasError, error }: CreditCardPageData) => (
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <CreditCardLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(CreditCardsPage, {
-  tags: {
-    component: "CreditCardsPage",
-    errorType: "credit_cards_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(CreditCardsPage, {
+    tags: {
+      component: "CreditCardsPage",
+      errorType: "credit_cards_error",
+    },
+  })
+);

package/src/pages/home.tsx

@@ -4,12 +4,13 @@ import { getOrgUnitByUserIdService } from "../features/org-units/services";
 import { withErrorBoundary } from "../features/shared/components";
 import { ErrorBoundaryProps } from "../features/shared/components/ErrorBoundary/types";
 import {
-  getClientContext,
   withLoaderErrorBoundary,
+  withAuthLoader,
+  withProviders,
 } from "../features/shared/utils";
 import { buyerPortalRoutes } from "../features/shared/utils/buyerPortalRoutes";
 
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 
 export type HomePageData = {
   redirected: boolean;
@@ -23,28 +24,30 @@ type HomePageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<HomePageQuery>
-): Promise<HomePageData> => {
-  const { userId, cookie } = await getClientContext(data);
+): Promise<AuthRouteProps<HomePageData>> => {
+  return withAuthLoader(data, async ({ userId, cookie }) => {
+    const userOrgUnit = await getOrgUnitByUserIdService({ userId, cookie });
 
-  const userOrgUnit = await getOrgUnitByUserIdService({ userId, cookie });
+    if (userOrgUnit) {
+      data.res?.writeHead(302, {
+        Location: buyerPortalRoutes.orgUnitDetails({
+          orgUnitId: userOrgUnit.id,
+        }),
+      });
+      data.res?.end();
 
-  if (userOrgUnit) {
-    data.res?.writeHead(302, {
-      Location: buyerPortalRoutes.orgUnitDetails({ orgUnitId: userOrgUnit.id }),
-    });
+      return {
+        redirected: true,
+      };
+    }
+
+    data.res?.writeHead(302, { Location: "/" });
     data.res?.end();
 
     return {
       redirected: true,
     };
-  }
-
-  data.res?.writeHead(302, { Location: "/" });
-  data.res?.end();
-
-  return {
-    redirected: true,
-  };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -57,9 +60,11 @@ const HomePage = () => {
   return null;
 };
 
-export default withErrorBoundary(HomePage, {
-  tags: {
-    component: "HomePage",
-    errorType: "home_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(HomePage, {
+    tags: {
+      component: "HomePage",
+      errorType: "home_error",
+    },
+  })
+);