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

package/src/pages/releases.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 ReleasesPageData = {
@@ -40,35 +38,37 @@ type OrgUnitsPageQuery = {
 
 const loaderFunction = async (
   data: LoaderData<OrgUnitsPageQuery>
-): Promise<ReleasesPageData> => {
-  const { customerId, cookie, userId, ...clientContext } =
-    await getClientContext(data);
-
+): Promise<AuthRouteProps<ReleasesPageData>> => {
   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,21 +76,23 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const ReleasesPage = ({ data, context, hasError, error }: ReleasesPageData) => {
+const ReleasesPage = ({ data, hasError, error }: ReleasesPageData) => {
   return (
-    <BuyerPortalProvider {...context}>
+    <>
       {hasError ? (
         <ErrorTabsLayout error={error} />
       ) : (
         <CustomFieldsLayout data={data} customFieldsLabel="Release" />
       )}
-    </BuyerPortalProvider>
+    </>
   );
 };
 
-export default withErrorBoundary(ReleasesPage, {
-  tags: {
-    component: "ReleasesPage",
-    errorType: "releases_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(ReleasesPage, {
+    tags: {
+      component: "ReleasesPage",
+      errorType: "releases_error",
+    },
+  })
+);

package/src/pages/role-details.tsx

@@ -2,21 +2,19 @@ import { getOrgUnitBasicDataService } from "../features/org-units/services";
 import { RoleDetailsLayout } from "../features/roles/layout";
 import { getRolesAndPermissionsService } from "../features/roles/services";
 import { RolePermission } from "../features/roles/types";
-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 { 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 RoleDetailsPageData = {
@@ -35,36 +33,52 @@ export type RoleDetailsPageData = {
 
 const loaderFunction = async (
   data: LoaderData
-): Promise<RoleDetailsPageData> => {
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
-
+): Promise<AuthRouteProps<RoleDetailsPageData>> => {
   const { orgUnitId, roleName } = data.query;
 
-  const rolesAndPermissions = await getRolesAndPermissionsService({
-    customerId: clientContext.customerId,
-    unitId: orgUnitId,
-    cookie,
-  });
-
-  const roles = Object.keys(rolesAndPermissions);
-
-  const cleanRoleName = String(roleName).replace(/-/g, " ").toLocaleLowerCase();
-
-  const currentRole =
-    roles.find((role) => role.toLocaleLowerCase() === cleanRoleName) ?? "";
-
-  const currentOrgUnit = await getOrgUnitBasicDataService({
-    id: orgUnitId,
-    cookie,
-  });
-
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const rolesAndPermissions = await getRolesAndPermissionsService({
+      customerId: clientContext.customerId,
+      unitId: orgUnitId,
+      cookie,
+    });
+
+    const roles = Object.keys(rolesAndPermissions);
+
+    const cleanRoleName = String(roleName)
+      .replace(/-/g, " ")
+      .toLocaleLowerCase();
+
+    const currentRole =
+      roles.find((role) => role.toLocaleLowerCase() === cleanRoleName) ?? "";
+
+    const currentOrgUnit = await getOrgUnitBasicDataService({
+      id: orgUnitId,
+      cookie,
+    });
+
+    const user = await getUserByIdService({ orgUnitId, userId, cookie });
+
+    if (!currentRole) {
+      return {
+        data: {
+          roleName: "Not Found",
+          roles: [],
+        },
+        context: {
+          clientContext: { cookie, userId, ...clientContext },
+          currentOrgUnit,
+          currentUser: user,
+        },
+      };
+    }
+
+    const role = rolesAndPermissions[currentRole];
 
-  if (!currentRole) {
     return {
       data: {
-        roleName: "Not Found",
-        roles: [],
+        roleName: currentRole,
+        roles: role,
       },
       context: {
         clientContext: { cookie, userId, ...clientContext },
@@ -72,21 +86,7 @@ const loaderFunction = async (
         currentUser: user,
       },
     };
-  }
-
-  const role = rolesAndPermissions[currentRole];
-
-  return {
-    data: {
-      roleName: currentRole,
-      roles: role,
-    },
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-    },
-  };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -94,24 +94,21 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const RoleDetailsPage = ({
-  data,
-  context,
-  hasError,
-  error,
-}: RoleDetailsPageData) => (
-  <BuyerPortalProvider {...context}>
+const RoleDetailsPage = ({ data, hasError, error }: RoleDetailsPageData) => (
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <RoleDetailsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(RoleDetailsPage, {
-  tags: {
-    component: "RoleDetailsPage",
-    errorType: "role_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(RoleDetailsPage, {
+    tags: {
+      component: "RoleDetailsPage",
+      errorType: "role_details_error",
+    },
+  })
+);

package/src/pages/roles.tsx

@@ -2,21 +2,19 @@ import { getOrgUnitBasicDataService } from "../features/org-units/services";
 import { RolesLayout } from "../features/roles/layout";
 import { getRolesAndPermissionsService } from "../features/roles/services";
 import { RolePermission } from "../features/roles/types";
-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 { 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 RolesPageData = {
@@ -32,33 +30,36 @@ export type RolesPageData = {
   error?: ErrorBoundaryProps;
 };
 
-const loaderFunction = async (data: LoaderData): Promise<RolesPageData> => {
-  const { cookie, userId, ...clientContext } = await getClientContext(data);
+const loaderFunction = async (
+  data: LoaderData
+): Promise<AuthRouteProps<RolesPageData>> => {
   const { orgUnitId } = data.query;
 
-  const [rolesAndPermissions, currentOrgUnit, user] = await Promise.all([
-    getRolesAndPermissionsService({
-      unitId: orgUnitId,
-      customerId: clientContext.customerId,
-      cookie,
-    }),
-    getOrgUnitBasicDataService({
-      id: orgUnitId,
-      cookie,
-    }),
-    getUserByIdService({ orgUnitId, userId, cookie }),
-  ]);
+  return withAuthLoader(data, async ({ cookie, userId, ...clientContext }) => {
+    const [rolesAndPermissions, currentOrgUnit, user] = await Promise.all([
+      getRolesAndPermissionsService({
+        unitId: orgUnitId,
+        customerId: clientContext.customerId,
+        cookie,
+      }),
+      getOrgUnitBasicDataService({
+        id: orgUnitId,
+        cookie,
+      }),
+      getUserByIdService({ orgUnitId, userId, cookie }),
+    ]);
 
-  return {
-    data: {
-      rolesAndPermissions,
-    },
-    context: {
-      clientContext: { cookie, userId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-    },
-  };
+    return {
+      data: {
+        rolesAndPermissions,
+      },
+      context: {
+        clientContext: { cookie, userId, ...clientContext },
+        currentOrgUnit,
+        currentUser: user,
+      },
+    };
+  });
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -66,15 +67,17 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const RolesPage = ({ data, context, hasError, error }: RolesPageData) => (
-  <BuyerPortalProvider {...context}>
+const RolesPage = ({ data, hasError, error }: RolesPageData) => (
+  <>
     {hasError ? <ErrorTabsLayout error={error} /> : <RolesLayout data={data} />}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(RolesPage, {
-  tags: {
-    component: "RolesPage",
-    errorType: "roles_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(RolesPage, {
+    tags: {
+      component: "RolesPage",
+      errorType: "roles_error",
+    },
+  })
+);

package/src/pages/user-details.tsx

@@ -3,23 +3,21 @@ import {
   getOrgUnitByUserIdService,
 } from "../features/org-units/services";
 import { getRolesIdsService } from "../features/roles/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 { UserDetailsLayout } from "../features/users/layouts";
 import { getUserByIdService } from "../features/users/services/get-user-by-id.service";
 
 import type { OrgUnitBasicData } from "../features/org-units/types";
 import type { RoleData } from "../features/roles/types";
-import type { LoaderData } from "../features/shared/types";
+import type { AuthRouteProps, LoaderData } from "../features/shared/types";
 import type { UserData } from "../features/users/types";
 
 type UserDetailsPageQuery = {
@@ -44,49 +42,54 @@ export type UserDetailsPageData = {
 
 const loaderFunction = async (
   data: LoaderData<UserDetailsPageQuery>
-): Promise<UserDetailsPageData> => {
-  const { cookie, customerId, ...clientContext } = await getClientContext(data);
-
+): Promise<AuthRouteProps<UserDetailsPageData>> => {
   const { userId, orgUnitId } = data.query;
 
-  const user = await getUserByIdService({ orgUnitId, userId, cookie });
+  return withAuthLoader(
+    data,
+    async ({ cookie, customerId, ...clientContext }) => {
+      const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
-  if (!user) {
-    data.res?.writeHead(302, { Location: "/pvt/organization-account" });
-    data.res?.end();
-  }
+      if (!user) {
+        data.res?.writeHead(302, { Location: "/pvt/organization-account" });
+        data.res?.end();
+      }
 
-  const [currentOrgUnit, orgUnitFromUser, rolesOptions] = await Promise.all([
-    getOrgUnitBasicDataService({
-      id: orgUnitId,
-      cookie,
-    }),
-    getOrgUnitByUserIdService({
-      userId,
-      cookie,
-    }),
-    getRolesIdsService({
-      unitId: orgUnitId,
-      customerId,
-      cookie,
-    }),
-  ]);
+      const [currentOrgUnit, orgUnitFromUser, rolesOptions] = await Promise.all(
+        [
+          getOrgUnitBasicDataService({
+            id: orgUnitId,
+            cookie,
+          }),
+          getOrgUnitByUserIdService({
+            userId,
+            cookie,
+          }),
+          getRolesIdsService({
+            unitId: orgUnitId,
+            customerId,
+            cookie,
+          }),
+        ]
+      );
 
-  return {
-    data: {
-      user,
-      orgUnit: {
-        id: orgUnitFromUser?.id ?? "",
-        name: orgUnitFromUser?.name ?? "",
-      },
-      rolesOptions,
-    },
-    context: {
-      clientContext: { cookie, customerId, ...clientContext },
-      currentOrgUnit,
-      currentUser: user,
-    },
-  };
+      return {
+        data: {
+          user,
+          orgUnit: {
+            id: orgUnitFromUser?.id ?? "",
+            name: orgUnitFromUser?.name ?? "",
+          },
+          rolesOptions,
+        },
+        context: {
+          clientContext: { cookie, customerId, ...clientContext },
+          currentOrgUnit,
+          currentUser: user,
+        },
+      };
+    }
+  );
 };
 
 export const loader = withLoaderErrorBoundary(loaderFunction, {
@@ -94,24 +97,21 @@ export const loader = withLoaderErrorBoundary(loaderFunction, {
   redirectToError: true,
 });
 
-const UserDetailsPage = ({
-  data,
-  context,
-  hasError,
-  error,
-}: UserDetailsPageData) => (
-  <BuyerPortalProvider {...context}>
+const UserDetailsPage = ({ data, hasError, error }: UserDetailsPageData) => (
+  <>
     {hasError ? (
       <ErrorTabsLayout error={error} />
     ) : (
       <UserDetailsLayout data={data} />
     )}
-  </BuyerPortalProvider>
+  </>
 );
 
-export default withErrorBoundary(UserDetailsPage, {
-  tags: {
-    component: "UserDetailsPage",
-    errorType: "user_details_error",
-  },
-});
+export default withProviders(
+  withErrorBoundary(UserDetailsPage, {
+    tags: {
+      component: "UserDetailsPage",
+      errorType: "user_details_error",
+    },
+  })
+);