@faststore/core 3.64.1 → 3.65.0

package/src/pages/account/profile.tsx

@@ -9,12 +9,14 @@ import { MyAccountLayout } from 'src/components/account'
 import RenderSections from 'src/components/cms/RenderSections'
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
+import { ProfileSection } from 'src/components/account/profile'
 
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 
 import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/profile/after'
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/profile/before'
 import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
+import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { gql } from '@generated/gql'
@@ -24,6 +26,7 @@ import type {
   ServerProfileQueryQueryVariables,
 } from '@generated/graphql'
 import { validateUser } from 'src/sdk/account/validateUser'
+import storeConfig from '../../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -31,10 +34,20 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   ...CUSTOM_COMPONENTS,
 }
 
+type ProfilePagePros = {
+  accountProfile: {
+    name: string | null
+    email: string | null
+    id: string | null
+  }
+} & MyAccountProps
+
 export default function Profile({
   globalSections,
   accountName,
-}: MyAccountProps) {
+  accountProfile,
+  isRepresentative,
+}: ProfilePagePros) {
   return (
     <RenderSections
       globalSections={globalSections.sections}
@@ -42,11 +55,12 @@ export default function Profile({
     >
       <NextSeo noindex nofollow />
 
-      <MyAccountLayout accountName={accountName}>
+      <MyAccountLayout
+        isRepresentative={isRepresentative}
+        accountName={accountName}
+      >
         <BeforeSection />
-        <div>
-          <h1>Profile</h1>
-        </div>
+        <ProfileSection profile={accountProfile} />
         <AfterSection />
       </MyAccountLayout>
     </RenderSections>
@@ -56,6 +70,11 @@ export default function Profile({
 const query = gql(`
   query ServerProfileQuery {
     accountName
+    accountProfile {
+      name
+      email
+      id
+    }
   }
 `)
 
@@ -75,6 +94,11 @@ export const getServerSideProps: GetServerSideProps<
     }
   }
 
+  const isRepresentative = getIsRepresentative({
+    headers: context.req.headers as Record<string, string>,
+    account: storeConfig.api.storeId,
+  })
+
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: context.query,
   })
@@ -126,6 +150,8 @@ export const getServerSideProps: GetServerSideProps<
     props: {
       globalSections: globalSectionsResult,
       accountName: profile.data.accountName,
+      accountProfile: profile.data.accountProfile,
+      isRepresentative,
     },
   }
 }

package/src/pages/account/security.tsx

@@ -16,6 +16,7 @@ import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/security/after'
 import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/security/before'
 import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
+import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { execute } from 'src/server'
@@ -25,6 +26,8 @@ import type {
   ServerSecurityQueryQueryVariables,
 } from '@generated/graphql'
 import { validateUser } from 'src/sdk/account/validateUser'
+import storeConfig from '../../../discovery.config'
+import { SecuritySection } from 'src/components/account/security'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -39,6 +42,7 @@ type SecurityPageProps = {
 export default function Page({
   globalSections,
   accountName,
+  isRepresentative,
 }: SecurityPageProps) {
   return (
     <RenderSections
@@ -47,11 +51,12 @@ export default function Page({
     >
       <NextSeo noindex nofollow />
 
-      <MyAccountLayout accountName={accountName}>
+      <MyAccountLayout
+        isRepresentative={isRepresentative}
+        accountName={accountName}
+      >
         <BeforeSection />
-        <div>
-          <h1>Security</h1>
-        </div>
+        <SecuritySection />
         <AfterSection />
       </MyAccountLayout>
     </RenderSections>
@@ -80,6 +85,11 @@ export const getServerSideProps: GetServerSideProps<
     }
   }
 
+  const isRepresentative = getIsRepresentative({
+    headers: context.req.headers as Record<string, string>,
+    account: storeConfig.api.storeId,
+  })
+
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: context.query,
   })
@@ -131,6 +141,7 @@ export const getServerSideProps: GetServerSideProps<
     props: {
       globalSections: globalSectionsResult,
       accountName: security.data.accountName,
+      isRepresentative,
     },
   }
 }

package/src/pages/account/user-details.tsx

@@ -1,6 +1,3 @@
-/* ######################################### */
-/* Mocked Page until development is finished, it will be removed after */
-
 import { NextSeo } from 'next-seo'
 import type { ComponentType } from 'react'
 import { MyAccountLayout } from 'src/components/account'
@@ -13,17 +10,20 @@ import type { GetServerSideProps } from 'next'
 
 import { getGlobalSectionsData } from 'src/components/cms/GlobalSections'
 
-import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/user-details/after'
-import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/user-details/before'
-import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
-import { injectGlobalSections } from 'src/server/cms/global'
-import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 import { gql } from '@generated/gql'
-import { execute } from 'src/server'
 import type {
   ServerUserDetailsQueryQuery,
   ServerUserDetailsQueryQueryVariables,
 } from '@generated/graphql'
+import MyAccountUserDetails from 'src/components/account/MyAccountUserDetails/MyAccountUserDetails'
+import { default as AfterSection } from 'src/customizations/src/myAccount/extensions/user-details/after'
+import { default as BeforeSection } from 'src/customizations/src/myAccount/extensions/user-details/before'
+import type { MyAccountProps } from 'src/experimental/myAccountSeverSideProps'
+import { getIsRepresentative } from 'src/sdk/account/getIsRepresentative'
+import { execute } from 'src/server'
+import { injectGlobalSections } from 'src/server/cms/global'
+import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+import storeConfig from '../../../discovery.config'
 import { validateUser } from 'src/sdk/account/validateUser'
 
 /* A list of components that can be used in the CMS. */
@@ -32,10 +32,21 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   ...CUSTOM_COMPONENTS,
 }
 
-export default function UserDetails({
+type UserDetailsPagePros = {
+  userDetails: {
+    name: string
+    email: string
+    role: string[]
+    orgUnit: string
+  }
+} & MyAccountProps
+
+export default function Page({
   globalSections,
   accountName,
-}: MyAccountProps) {
+  isRepresentative,
+  userDetails,
+}: UserDetailsPagePros) {
   return (
     <RenderSections
       globalSections={globalSections.sections}
@@ -43,11 +54,12 @@ export default function UserDetails({
     >
       <NextSeo noindex nofollow />
 
-      <MyAccountLayout accountName={accountName}>
+      <MyAccountLayout
+        isRepresentative={isRepresentative}
+        accountName={accountName}
+      >
         <BeforeSection />
-        <div>
-          <h1>User Details</h1>
-        </div>
+        <MyAccountUserDetails userDetails={userDetails} />
         <AfterSection />
       </MyAccountLayout>
     </RenderSections>
@@ -57,6 +69,12 @@ export default function UserDetails({
 const query = gql(`
   query ServerUserDetailsQuery {
     accountName
+    userDetails {
+      name
+      email
+      role
+      orgUnit
+    }
   }
 `)
 
@@ -76,6 +94,11 @@ export const getServerSideProps: GetServerSideProps<
     }
   }
 
+  const isRepresentative = getIsRepresentative({
+    headers: context.req.headers as Record<string, string>,
+    account: storeConfig.api.storeId,
+  })
+
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: context.query,
   })
@@ -101,14 +124,26 @@ export const getServerSideProps: GetServerSideProps<
         variables: {},
         operation: query,
       },
-      { headers: { ...context.req.headers } }
+      {
+        headers: { ...context.req.headers },
+      }
     ),
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
   ])
 
-  if (userDetails.errors) {
+  // If the user is not a representative (b2b), redirect them to the account home page
+  if (!isRepresentative) {
+    return {
+      redirect: {
+        destination: '/account',
+        permanent: false,
+      },
+    }
+  }
+
+  if (userDetails?.errors) {
     const statusCode: number = (userDetails.errors[0] as any)?.extensions
       ?.status
     const destination: string =
@@ -132,6 +167,8 @@ export const getServerSideProps: GetServerSideProps<
     props: {
       globalSections: globalSectionsResult,
       accountName: userDetails.data.accountName,
+      userDetails: userDetails.data?.userDetails ?? {},
+      isRepresentative,
     },
   }
 }

package/src/sdk/account/getIsRepresentative.ts

@@ -0,0 +1,20 @@
+import { parse } from 'cookie'
+import { parseJwt } from 'src/utils/getCookie'
+
+type GetIsRepresentativeParams = {
+  headers?: Record<string, string>
+  account: string
+}
+
+export function getIsRepresentative({
+  headers,
+  account,
+}: GetIsRepresentativeParams): boolean {
+  const authCookie = parse(headers?.cookie ?? '')?.[
+    'VtexIdclientAutCookie_' + account
+  ]
+  const jwt = parseJwt(authCookie)
+
+  const isRepresentative = jwt?.isRepresentative
+  return !!isRepresentative
+}

package/src/sdk/account/getMyAccountRoutes.ts

@@ -10,24 +10,28 @@ interface GetMyAccountRouteParams {
   routes: Route[]
 }
 
+export const USER_DETAILS_ROUTE = '/account/user-details'
+export const ORDERS_ROUTE = '/account/orders'
+export const SECURITY_ROUTE = '/account/security'
+
 // This is the default route list for My Account, we should add then as the feature is implemented
 const DEFAULT_ROUTES: Route[] = [
-  // {
-  //   title: 'Profile',
-  //   route: '/account/profile',
-  // },
+  {
+    title: 'Profile',
+    route: '/account/profile',
+  },
   {
     title: 'Orders',
-    route: '/account/orders',
+    route: ORDERS_ROUTE,
+  },
+  {
+    title: 'User Details',
+    route: USER_DETAILS_ROUTE,
+  },
+  {
+    title: 'Security',
+    route: SECURITY_ROUTE,
   },
-  // {
-  //   title: 'User Details',
-  //   route: '/account/user-details',
-  // },
-  // {
-  //   title: 'Security',
-  //   route: '/account/security',
-  // },
 ]
 
 export function getMyAccountRoutes({ routes }: GetMyAccountRouteParams) {

package/src/sdk/account/useOrderAuthorization.ts

@@ -0,0 +1,79 @@
+import { gql } from '@generated'
+import { useLazyQuery } from '../graphql/useLazyQuery'
+import type {
+  MutationProcessOrderAuthorizationArgs as Variables,
+  ProcessOrderAuthorizationMutationMutation,
+} from '@generated/graphql'
+
+export const mutation = gql(`
+  mutation ProcessOrderAuthorizationMutation($data: IProcessOrderAuthorization!) {
+    processOrderAuthorization(data: $data) {
+      isPendingForOtherAuthorizer
+      ruleForAuthorization {
+        orderAuthorizationId
+        dimensionId
+        rule {
+          id
+          name
+          status
+          doId
+          authorizedEmails
+          priority
+          trigger {
+            condition {
+              conditionType
+              description
+              lessThan
+              greatherThan
+              expression
+            }
+            effect {
+              description
+              effectType
+              funcPath
+            }
+          }
+          timeout
+          notification
+          scoreInterval {
+            accept
+            deny
+          }
+          authorizationData {
+            requireAllApprovals
+            authorizers {
+              id
+              email
+              type
+              authorizationDate
+            }
+          }
+          isUserAuthorized
+          isUserNextAuthorizer
+        }
+      }
+    }
+  }
+`)
+
+export const useOrderAuthorization = () => {
+  const [processOrderAuthorization, { data, error, isValidating: loading }] =
+    useLazyQuery<ProcessOrderAuthorizationMutationMutation, Variables>(
+      mutation,
+      {
+        data: {
+          orderAuthorizationId: '',
+          ruleId: '',
+          dimensionId: '',
+          approved: false,
+        },
+      }
+    )
+
+  return {
+    processOrderAuthorization,
+    data: data?.processOrderAuthorization || null,
+    error,
+    loading,
+  }
+}

package/src/utils/getCookie.ts

@@ -12,3 +12,10 @@ export function getCookie(name: string): string | undefined {
 
   return undefined // Cookie not found
 }
+
+export function parseJwt(token: string) {
+  if (!token) {
+    return null
+  }
+  return JSON.parse(Buffer.from(token.split('.')[1], 'base64').toString())
+}

package/src/utils/userOrderStatus.ts

@@ -12,6 +12,10 @@ export const orderStatusMap = {
   },
 
   // Approval Pending
+  'waiting-for-authorization': {
+    variant: 'warning',
+    label: 'Approval Pending',
+  },
   'waiting-for-confirmation': { variant: 'warning', label: 'Approval Pending' },
 
   // Payment Pending

package/test/server/index.test.ts

@@ -76,6 +76,8 @@ const QUERIES = [
   'productCount',
   'userOrder',
   'listUserOrders',
+  'userDetails',
+  'accountProfile',
   'accountName',
   'validateUser',
 ]
@@ -85,6 +87,7 @@ const MUTATIONS = [
   'validateSession',
   'subscribeToNewsletter',
   'cancelOrder',
+  'processOrderAuthorization',
 ]
 
 describe('FastStore GraphQL Layer', () => {

package/.next/server/chunks/2570.js

@@ -1 +0,0 @@
-"use strict";exports.id=2570,exports.ids=[2570],exports.modules={2562:(e,a,n)=>{n.d(a,{Z:()=>__WEBPACK_DEFAULT_EXPORT__});var r=n(15759),l=n(20997);let __WEBPACK_DEFAULT_EXPORT__=function({status:e,statusFallback:a}){return l.jsx("span",{"data-fs-my-account-badge":!0,"data-fs-my-account-badge-variant":function({status:e}){return r._y[e]?.variant||"neutral"}({status:e}),children:r._y[e]?.label||a||"-"})}},96896:(e,a,n)=>{n.d(a,{p:()=>useFormatPrice});var r=n(70031),l=n(16689);let useFormatPrice=()=>{let{locale:e}=(0,r.kP)();return(0,l.useCallback)((a,n)=>new Intl.NumberFormat(e,{style:"currency",currency:n,minimumFractionDigits:2}).format(a/100),[e])}},15759:(e,a,n)=>{n.d(a,{BX:()=>t,JU:()=>groupOrderStatusByLabel,_y:()=>r,j4:()=>l});let r={created:{variant:"success",label:"Order Placed"},creating:{variant:"success",label:"Order Placed"},"on-order-completed":{variant:"success",label:"Order Placed"},"on-order-completed-ffm":{variant:"success",label:"Order Placed"},"order-accepted":{variant:"success",label:"Order Placed"},"order-created":{variant:"success",label:"Order Placed"},"waiting-for-seller-confirmation":{variant:"success",label:"Order Placed"},"waiting-for-confirmation":{variant:"warning",label:"Approval Pending"},"approving-transaction":{variant:"warning",label:"Payment Pending"},"notify-payment":{variant:"warning",label:"Payment Pending"},"payment-pending":{variant:"warning",label:"Payment Pending"},"payment-approved":{variant:"success",label:"Payment Approved"},"approve-payment":{variant:"success",label:"Payment Approved"},"payment-denied":{variant:"neutral",label:"Payment Denied"},"authorize-fulfillment":{variant:"success",label:"Ready for Delivery"},handling:{variant:"success",label:"Ready for Delivery"},invoice:{variant:"success",label:"Ready for Delivery"},"invoice-after-cancellation-deny":{variant:"success",label:"Ready for Delivery"},invoicing:{variant:"success",label:"Ready for Delivery"},packing:{variant:"success",label:"Ready for Delivery"},picking:{variant:"success",label:"Ready for Delivery"},"ready-for-handling":{variant:"success",label:"Ready for Delivery"},"ready-for-invoicing":{variant:"success",label:"Ready for Delivery"},"ready-for-packing":{variant:"success",label:"Ready for Delivery"},"ready-for-picking":{variant:"success",label:"Ready for Delivery"},"release-to-fulfillment":{variant:"success",label:"Ready for Delivery"},"start-handling":{variant:"success",label:"Ready for Delivery"},"waiting-ffmt-authorization":{variant:"success",label:"Ready for Delivery"},"waiting-for-fulfillment":{variant:"success",label:"Ready for Delivery"},"window-to-cancel":{variant:"success",label:"Ready for Delivery"},invoiced:{variant:"success",label:"Invoiced"},"accepting-cancel":{variant:"neutral",label:"Cancellation Requested"},cancel:{variant:"neutral",label:"Cancellation Requested"},canceling:{variant:"neutral",label:"Cancellation Requested"},"cancellation-requested":{variant:"neutral",label:"Cancellation Requested"},"cancellation-requested-with-ack":{variant:"neutral",label:"Cancellation Requested"},"request-cancel":{variant:"neutral",label:"Cancellation Requested"},"waiting-for-seller-decision":{variant:"neutral",label:"Cancellation Requested"},canceled:{variant:"neutral",label:"Canceled"}},groupOrderStatusByLabel=()=>{let e={};for(let[a,n]of Object.entries(r)){let{label:r}=n,l=r.toLowerCase();e[l]||(e[l]=[]),e[l].push(a)}return e},l=["Order Placed","Approval Pending","Payment Pending","Payment Approved","Payment Denied","Ready for Delivery","Invoiced","Cancellation Requested","Canceled"],t={"order placed":"Order Placed","approval pending":"Approval Pending","payment pending":"Payment Pending","payment approved":"Payment Approved","payment denied":"Payment Denied","ready for delivery":"Ready for Delivery",invoiced:"Invoiced","cancellation requested":"Cancellation Requested",canceled:"Canceled"}}};

package/.next/server/chunks/941.js

@@ -1 +0,0 @@
-"use strict";exports.id=941,exports.ids=[941],exports.modules={90941:(e,t,r)=>{r.r(t),r.d(t,{default:()=>search});var a=r(43412),o=r.n(a);let getBaseDomain=e=>{if(e[0]===e[1])return`.${new URL(o().storeUrl).hostname}`;let t=e.map(e=>{try{let t=new URL(e).hostname,r=o().api.subDomainPrefix||[],a=RegExp(`^(${["www",...r].join("|")})\\.`);return t.replace(a,"")}catch{return""}}),r=t.map(e=>e.split(".").reverse()),a=Math.min(...r.map(e=>e.length)),s=[];for(let e=0;e<a;e++){let t=new Set(r.map(t=>t[e]));if(1===t.size)s.push(r[0][e]);else break}if(s.length<2){let t=`No common domain found for URLs: ${e.join(", ")}`;return console.warn(`${t}. Please check the Production URLs in the discovery.config file.`),""}return"."+s.reverse().join(".")};function ownKeys(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(e);t&&(a=a.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,a)}return r}function _objectSpread(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?ownKeys(Object(r),!0).forEach(function(t){var a;a=r[t],t in e?Object.defineProperty(e,t,{value:a,enumerable:!0,configurable:!0,writable:!0}):e[t]=a}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):ownKeys(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}let randomUUID=()=>"function"==typeof crypto.randomUUID?crypto.randomUUID().replaceAll("-",""):(1e6*Math.random()).toFixed(0),createOrRefreshCookie=(e,t)=>{let r=o().secureSubdomain?getBaseDomain([o().storeUrl,o().secureSubdomain]):`.${new URL(o().storeUrl).hostname}`;return()=>{let a=function(e){let t=decodeURIComponent(document.cookie),r=t.split(";");for(let t of r){let[r,a]=t.trim().split("=");if(r===e)return a}}(e),o=void 0===a;return o&&(a=randomUUID()),document.cookie=`${e}=${a}; max-age=${t}; domain=${r}; path=/;`,a}},s={anonymous:createOrRefreshCookie("vtex-search-anonymous",31536e3),session:createOrRefreshCookie("vtex-search-session",1800)},sendEvent=e=>fetch(`https://sp.vtex.com/event-api/v1/${o().api.storeId}/event`,{method:"POST",body:JSON.stringify(_objectSpread(_objectSpread({},e),{},{userAgent:navigator.userAgent,anonymous:s.anonymous(),session:s.session()})),headers:{"content-type":"application/json"}}),isFullTextSearch=e=>"string"==typeof e.searchParams.get("q")&&/^\/s(\/)?$/g.test(e.pathname);setInterval(()=>sendEvent({type:"session.ping"}),6e4);let search=e=>{switch(e.name){case"search_select_item":{let t=new URL(e.params.url);if(!isFullTextSearch(t))return;for(let r of e.params.items??[]){let e=r.item_id??r.item_variant,a=r.index;e&&a&&sendEvent({type:"search.click",productId:e,position:a,url:t.href,text:t.searchParams.get("q")??"<empty>"})}break}case"intelligent_search_query":sendEvent({type:"search.query",url:e.params.url,text:e.params.term,misspelled:e.params.isTermMisspelled,match:e.params.totalCount,operator:e.params.logicalOperator,locale:e.params.locale});break;case"intelligent_search_autocomplete_query":sendEvent({type:"search.autocomplete.query",url:e.params.url,text:e.params.term,misspelled:e.params.isTermMisspelled,match:e.params.totalCount,operator:e.params.logicalOperator,locale:e.params.locale});break;case"intelligent_search_autocomplete_click":sendEvent(_objectSpread(_objectSpread({text:e.params.term,url:e.params.url??"",productId:e.params.productId??""},e.params.position&&{position:e.params.position}),{},{type:"search.autocomplete.click"}))}}}};