@vtex/faststore-plugin-buyer-portal 1.0.41 → 1.0.42

package/package.json

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

package/src/features/users/clients/UsersClient.ts

@@ -6,15 +6,14 @@ class UsersClient extends Client {
     super(getApiUrl());
   }
 
-  getUserById(userId: string, cookie: string) {
+  getUserById(orgUnitId: string, userId: string, cookie: string) {
     return this.get<{
       userId: string;
-      firstName: string;
-      lastName: string;
+      name: string;
       email: string;
       role: string;
       orgUnit: string;
-    }>(`user/${userId}`, {
+    }>(`units/${orgUnitId}/users/${userId}`, {
       headers: {
         Cookie: cookie,
       },
@@ -25,14 +24,13 @@ class UsersClient extends Client {
     return this.get<{
       users: {
         userId: string;
-        firstName: string;
-        lastName: string;
+        name: string;
         email: string;
         role: string;
         orgUnit: string;
       }[];
       total: number;
-    }>(`users/${orgUnitId}`, {
+    }>(`units/${orgUnitId}/users`, {
       headers: {
         Cookie: cookie,
       },
@@ -68,7 +66,7 @@ class UsersClient extends Client {
         name: string;
       }
     >(
-      `users/${orgUnitId}`,
+      `units/${orgUnitId}/users`,
       {
         ...data,
         orgUnitId,
@@ -92,7 +90,7 @@ class UsersClient extends Client {
     const { orgUnitId, ...data } = props;
 
     return this.delete<unknown, { userId: string }>(
-      `users/${orgUnitId}`,
+      `units/${orgUnitId}/users`,
       data,
       {
         headers: {
@@ -117,7 +115,7 @@ class UsersClient extends Client {
         oldUnitId: string;
         newUnitId: string;
       }
-    >("user/reassign", props, {
+    >(`units/${props.oldUnitId}/users/reassign`, props, {
       headers: {
         Cookie: cookie,
       },

package/src/features/users/services/get-user-by-id.service.ts

@@ -2,18 +2,20 @@ import { usersClient } from "../clients/UsersClient";
 import type { UserData } from "../types";
 
 export const getUserByIdService = async ({
+  orgUnitId,
   userId,
   cookie,
 }: {
+  orgUnitId: string;
   userId: string;
   cookie: string;
 }): Promise<UserData | null> => {
   try {
-    const { email, firstName, lastName, orgUnit, role } =
-      await usersClient.getUserById(userId, cookie);
+    const { email, name, orgUnit, role } =
+      await usersClient.getUserById(orgUnitId, userId, cookie);
 
     return {
-      name: `${firstName} ${lastName}`,
+      name: `${name}`,
       userType: role,
       id: userId,
       email,

package/src/features/users/services/get-users-by-org-unit-id.service.ts

@@ -16,7 +16,7 @@ export const getUsersByOrgUnitIdService = async ({
 
   return {
     users: users.map((user) => ({
-      name: user.firstName,
+      name: user.name,
       userType: user.role,
       userId: user.userId,
       email: user.email,

package/src/pages/address-details.tsx

@@ -42,7 +42,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   return {
     data: await getAddressDetailsService(addressId, cookie),

package/src/pages/addresses.tsx

@@ -46,7 +46,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const contract = await getContractDetailsService({
     contractId,

package/src/pages/buying-policies.tsx

@@ -51,7 +51,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const contract = await getContractDetailsService({
     contractId,

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

@@ -41,7 +41,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const contract = await getContractDetailsService({
     contractId,

package/src/pages/credit-cards.tsx

@@ -37,7 +37,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const contract = await getContractDetailsService({
     contractId,

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

@@ -34,7 +34,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const contracts = await getContractsByOrgUnitIdService({
     orgUnitId,

package/src/pages/org-units.tsx

@@ -36,12 +36,14 @@ export async function loader(
   const { cookie, customerId, userId, ...restClientContext } =
     await getClientContext(data);
 
+  const { search, orgUnitId } = data.query;
+
   const currentOrgUnit = await getOrgUnitBasicDataService({
     id: data.query.orgUnitId,
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const clientContext = {
     cookie,
@@ -50,7 +52,6 @@ export async function loader(
     ...restClientContext,
   };
 
-  const { search, orgUnitId } = data.query;
 
   if (search) {
     return {

package/src/pages/profile.tsx

@@ -39,7 +39,7 @@ export async function loader(
     cookie,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   return {
     data: contract,

package/src/pages/user-details.tsx

@@ -36,7 +36,7 @@ export async function loader(
 
   const { userId, orgUnitId } = data.query;
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   if (!user) {
     data.res?.writeHead(302, { Location: "/buyer-portal" });

package/src/pages/users.tsx

@@ -51,7 +51,7 @@ export async function loader(
     orgUnitId,
   });
 
-  const user = await getUserByIdService({ userId, cookie });
+  const user = await getUserByIdService({ orgUnitId, userId, cookie });
 
   const mappedUsers = users.map((user) => ({
     ...user,