@faststore/api 4.0.1-dev.2 → 4.1.0-dev.0

package/dist/src/platforms/vtex/resolvers/query.d.ts

@@ -117,8 +117,10 @@ export declare const Query: {
         isValid: boolean;
     }>;
     userDetails: (_: unknown, __: unknown, ctx: GraphqlContext) => Promise<{
+        username: string;
         name: string;
         email: string;
+        phone: string;
         role: string[];
         orgUnit: string;
     }>;

package/dist/src/platforms/vtex/resolvers/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,+BAA+B,CAAA;AAQtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAkB9C,eAAO,MAAM,KAAK;iBAEX,OAAO,eACG,gBAAgB,OACxB,cAAc;oBA+EhB,OAAO,YACA,mBAAmB,OACxB,cAAc;gBAShB,OAAO,6EAQP,eAAe,OACb,cAAc;;;;qBAuDhB,OAAO,gCACoB,oBAAoB,OAC7C,cAAc;;;;;;;;;;;;;kBAkChB,OAAO,kBACM,iBAAiB,OAC5B,cAAc;wBA0BhB,OAAO,gCACoB,uBAAuB,OAChD,cAAc;;;;;;;;;;;;;;;;;;uBAa6B,MAAM;;;;;kBA2CnD,OAAO,kCACsB,iBAAiB,OAC5C,cAAc;;;;;;;;;;;;;;;;;kBAkBhB,OAAO,4BACgB,iBAAiB,OACtC,cAAc;;;iBAqBhB,OAAO,yDAC6C,gBAAgB,OAClE,cAAc;;;;iBAqBhB,OAAO,UACF,gBAAgB,OACnB,cAAc;;;sBAyBhB,OAAO,YACA,qBAAqB,OAC1B,cAAc;mBAahB,OAAO,eACG,kBAAkB,OAC1B,cAAc;;;;;;;;;;;;;;;;;;;;;;;wBAqGhB,OAAO,WACD,uBAAuB,OAC3B,cAAc;;;;;;;;;;;;;;;sBAwBG,OAAO,MAAM,OAAO,QAAQ,cAAc;;;qBAQ3C,OAAO,MAAM,OAAO,OAAO,cAAc;;;;;;wBAmBtC,OAAO,MAAM,OAAO,OAAO,cAAc;;;;;sBAmD9D,OAAO,sBACU,qBAAqB,OACpC,cAAc;CAYtB,CAAA"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../../src/platforms/vtex/resolvers/query.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,6BAA6B,EAC7B,uBAAuB,EACvB,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,qBAAqB,EACrB,gBAAgB,EAChB,qBAAqB,EACrB,iBAAiB,EACjB,gBAAgB,EAChB,iBAAiB,EACjB,eAAe,EACf,gBAAgB,EAChB,iBAAiB,EACjB,kBAAkB,EAEnB,MAAM,+BAA+B,CAAA;AAQtC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAA;AAC1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAkB9C,eAAO,MAAM,KAAK;iBAEX,OAAO,eACG,gBAAgB,OACxB,cAAc;oBA+EhB,OAAO,YACA,mBAAmB,OACxB,cAAc;gBAShB,OAAO,6EAQP,eAAe,OACb,cAAc;;;;qBAuDhB,OAAO,gCACoB,oBAAoB,OAC7C,cAAc;;;;;;;;;;;;;kBAkChB,OAAO,kBACM,iBAAiB,OAC5B,cAAc;wBA0BhB,OAAO,gCACoB,uBAAuB,OAChD,cAAc;;;;;;;;;;;;;;;;;;uBAa6B,MAAM;;;;;kBA2CnD,OAAO,kCACsB,iBAAiB,OAC5C,cAAc;;;;;;;;;;;;;;;;;kBAkBhB,OAAO,4BACgB,iBAAiB,OACtC,cAAc;;;iBAqBhB,OAAO,yDAC6C,gBAAgB,OAClE,cAAc;;;;iBAqBhB,OAAO,UACF,gBAAgB,OACnB,cAAc;;;sBAyBhB,OAAO,YACA,qBAAqB,OAC1B,cAAc;mBAahB,OAAO,eACG,kBAAkB,OAC1B,cAAc;;;;;;;;;;;;;;;;;;;;;;;wBAqGhB,OAAO,WACD,uBAAuB,OAC3B,cAAc;;;;;;;;;;;;;;;sBAwBG,OAAO,MAAM,OAAO,QAAQ,cAAc;;;qBAQ3C,OAAO,MAAM,OAAO,OAAO,cAAc;;;;;;;;wBAqCtC,OAAO,MAAM,OAAO,OAAO,cAAc;;;;;sBAmD9D,OAAO,sBACU,qBAAqB,OACpC,cAAc;CAYtB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/api",
-  "version": "4.0.1-dev.2",
+  "version": "4.1.0-dev.0",
   "license": "MIT",
   "main": "dist/cjs/index.js",
   "typings": "dist/src/index.d.ts",
@@ -55,7 +55,7 @@
     "@envelop/graphql-jit": "catalog:",
     "@envelop/parser-cache": "catalog:",
     "@envelop/validation-cache": "catalog:",
-    "@faststore/diagnostics": "^4.0.1-dev.2",
+    "@faststore/diagnostics": "^4.1.0-dev.0",
     "@graphql-codegen/cli": "catalog:",
     "@graphql-codegen/typescript": "catalog:",
     "@parcel/watcher": "^2.5.1",
@@ -78,5 +78,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "78469e62248563c911ba449ea69fc1edacf7277e"
+  "gitHead": "e356beb2c1bfd3b06bc2a383c01d5957d18c8f34"
 }

package/src/__generated__/schema.ts

@@ -1749,8 +1749,12 @@ export type StoreUserDetails = {
   name?: Maybe<Scalars['String']['output']>;
   /** User's organizational unit. */
   orgUnit?: Maybe<Scalars['String']['output']>;
+  /** User's phone number. */
+  phone?: Maybe<Scalars['String']['output']>;
   /** User's role. */
   role?: Maybe<Array<Maybe<Scalars['String']['output']>>>;
+  /** User's username (login). May differ from email when Alternative Login is enabled. */
+  username?: Maybe<Scalars['String']['output']>;
 };
 
 export type UserOrder = {

package/src/platforms/vtex/clients/commerce/index.ts

@@ -453,7 +453,7 @@ export const VtexCommerce = (
 
       params.set(
         'items',
-        'profile.id,profile.email,profile.firstName,profile.lastName,shopper.firstName,shopper.lastName,shopper.organizationManager,store.channel,store.countryCode,store.cultureInfo,store.currencyCode,store.currencySymbol,authentication.customerId,authentication.storeUserId,authentication.storeUserEmail,authentication.unitId,authentication.unitName,checkout.regionId,public.postalCode'
+        'profile.id,profile.email,profile.firstName,profile.lastName,profile.phone,shopper.firstName,shopper.lastName,shopper.organizationManager,store.channel,store.countryCode,store.cultureInfo,store.currencyCode,store.currencySymbol,authentication.customerId,authentication.storeUserId,authentication.storeUserEmail,authentication.unitId,authentication.unitName,checkout.regionId,public.postalCode'
       )
 
       const headers: HeadersInit = withCookie({
@@ -704,6 +704,23 @@ export const VtexCommerce = (
           {}
         )
       },
+      getUserRoles: ({
+        userId,
+      }: { userId: string }): Promise<{
+        Email: string
+        Roles: Array<{ Id: number; Name: string }>
+      }> => {
+        const headers: HeadersInit = withAutCookie(forwardedHost, account)
+
+        return fetchAPI(
+          `${base}/api/license-manager/storefront/users/${userId}/roles`,
+          {
+            method: 'GET',
+            headers,
+          },
+          {}
+        )
+      },
     },
     masterData: {
       getContractById: ({

package/src/platforms/vtex/clients/commerce/types/Session.ts

@@ -37,6 +37,7 @@ export interface Profile {
   email?: Value
   firstName?: Value
   lastName?: Value
+  phone?: Value
 }
 
 export interface Shopper {

package/src/platforms/vtex/resolvers/query.ts

@@ -571,18 +571,36 @@ export const Query = {
   // only b2b users
   userDetails: async (_: unknown, __: unknown, ctx: GraphqlContext) => {
     const {
+      account,
+      headers,
       clients: { commerce },
     } = ctx
 
-    const sessionData = await commerce.session('').catch(() => null)
+    const jwt = parseJwt(getAuthCookie(headers?.cookie ?? '', account))
+    const userId = jwt?.userId ?? ''
+
+    const [sessionData, shopperResult, lmRoles] = await Promise.all([
+      commerce.session('').catch(() => null),
+      userId
+        ? commerce.masterData.getShopperById({ userId }).catch(() => null)
+        : Promise.resolve(null),
+      userId
+        ? commerce.licenseManager.getUserRoles({ userId }).catch(() => null)
+        : Promise.resolve(null),
+    ])
 
-    const shopper = sessionData?.namespaces.shopper ?? null
+    const shopper = shopperResult?.[0]
     const authentication = sessionData?.namespaces.authentication ?? null
 
+    const fullName =
+      `${(shopper?.firstName ?? '').trim()} ${(shopper?.lastName ?? '').trim()}`.trim()
+
     return {
-      name: shopper?.firstName?.value ?? '',
-      email: authentication?.storeUserEmail.value ?? '',
-      role: ['Admin'], // TODO change when implemented roles,
+      username: authentication?.storeUserEmail?.value ?? '',
+      name: fullName,
+      email: authentication?.storeUserEmail?.value ?? '',
+      phone: shopper?.phone ?? '',
+      role: lmRoles?.Roles?.map((r) => r.Name) ?? [],
       orgUnit: authentication?.unitName?.value ?? '',
     }
   },

package/src/platforms/vtex/typeDefs/query.graphql

@@ -517,6 +517,10 @@ type SellerInfo {
 User details information.
 """
 type StoreUserDetails {
+  """
+  User's username (login). May differ from email when Alternative Login is enabled.
+  """
+  username: String
   """
   User's name.
   """
@@ -526,6 +530,10 @@ type StoreUserDetails {
   """
   email: String
   """
+  User's phone number.
+  """
+  phone: String
+  """
   User's role.
   """
   role: [String]