@things-factory/integration-sellercraft 4.3.27 → 4.3.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-sellercraft",
-  "version": "4.3.27",
+  "version": "4.3.28",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -31,7 +31,7 @@
     "@things-factory/context-ui": "^4.3.27",
     "@things-factory/grist-ui": "^4.3.27",
     "@things-factory/i18n-base": "^4.3.27",
-    "@things-factory/integration-marketplace": "^4.3.27",
+    "@things-factory/integration-marketplace": "^4.3.28",
     "@things-factory/integration-ui": "^4.3.27",
     "@things-factory/more-ui": "^4.3.27",
     "@things-factory/resource-ui": "^4.3.27",
@@ -51,5 +51,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "52398bed65c4cf97263cd983c2c518e882ddbcde"
+  "gitHead": "f1af695e2848b49871ca1d4f1661a5620ed428da"
 }

package/server/controllers/sellercraft-channel-integration/sellercraft-channel-integration.ts

@@ -1,5 +1,6 @@
 import fetch from 'node-fetch'
 import { v4 as uuidv4 } from 'uuid'
+import { createPayloadLog } from '@things-factory/integration-base'
 
 const debug = require('debug')('things-factory:integration-sellercraft:sellercraft')
 
@@ -43,11 +44,15 @@ export class SellercraftChannelIntegration {
       body: jsondata
     })
 
+    const result = await response.json()
+    try {
+      createPayloadLog(JSON.parse(jsondata)[0]?.channel_shop_id || requestId, fullPath, jsondata, result, {
+        state: { domain: null }
+      })
+    } catch (e) {}
     if (response.ok) {
-      const result = await response.json()
       return result
     } else {
-      const result = await response.json()
       throw new Error(`(${response.status}) ${result.detail}`)
     }
   }

package/server/routers/sellercraft-router.ts

@@ -3,50 +3,21 @@ import { v4 as uuidv4 } from 'uuid'
 
 import { config } from '@things-factory/env'
 import { StoreAPI } from '@things-factory/integration-marketplace'
+import { getShop } from '../utils/tokencraft-util'
 
-import { PLATFORM, SHIPPING_TYPE } from '../constants'
+import { SHIPPING_TYPE } from '../constants'
 
 const debug = require('debug')('things-factory:integration-sellercraft:sellercraft-router')
 
 export const sellercraftRouter = new Router()
 
 sellercraftRouter.post('/sellercraft/store/update-product-price', async (context, next) => {
-  const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-  const { tokenCraftApiKey: apiKey, tokenCraftUrl } = sellercraftChannelIntegrationConfig
-
-  const xApiKey = context.headers['x-api-key']
-
-  if (apiKey !== xApiKey) context.throw(400, 'api key validation failed')
-
   const requestBody = context.request.body
 
   for (var i = 0; i < requestBody.length; i++) {
-    var store: any = {} // get from tokencraft
+    let mappedStore: any = await getShop(context, requestBody[i].channel_id, requestBody[i].shop_id)
     var result
 
-    // https://staging-tokencraft.sellercraft.co/v1/get-shop?channel_id=4bfb3362-d57c-47f8-8781-007316d179bf&shop_id=dd9cf3b7-114f-4d74-a7e2-7b524ae086f2
-    var fullPath = `${tokenCraftUrl}?channel_id=${requestBody[i].channel_id}&shop_id=${requestBody[i].shop_id}`
-    const response: any = await fetch(fullPath, {
-      method: 'get',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': apiKey
-      }
-    })
-    if (response.ok) {
-      store = await response.json()
-    }
-
-    let mappedStore: any = {
-      accessKey: store.shop?.credential?.consumer_key || '',
-      accessSecret: store.shop?.credential?.consumer_secret || '',
-      storeURL: store.shop?.credential?.store_url,
-      platform: PLATFORM[`${store.shop.org_prefix}`],
-      accessToken: store.shop?.credential?.access_token,
-      channelShopId: store.shop?.channel_shop_id,
-      storeId: store.shop?.credential?.store_url
-    }
-
     try {
       if (requestBody[i].variant.native_variant_id != requestBody[i].native_product_id) {
         const req = {
@@ -83,41 +54,11 @@ sellercraftRouter.post('/sellercraft/store/update-product-price', async (context
 })
 
 sellercraftRouter.post('/sellercraft/store/update-product-stock', async (context, next) => {
-  const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-  const { tokenCraftApiKey: apiKey, tokenCraftUrl } = sellercraftChannelIntegrationConfig
-
-  const xApiKey = context.headers['x-api-key']
-
-  if (apiKey !== xApiKey) context.throw(400, 'api key validation failed')
-
   const requestBody = context.request.body
   for (var i = 0; i < requestBody.length; i++) {
-    var store: any = {} // get from tokencraft
+    let mappedStore: any = await getShop(context, requestBody[i].channel_id, requestBody[i].shop_id)
     var result
 
-    // https://staging-tokencraft.sellercraft.co/v1/get-shop?channel_id=4bfb3362-d57c-47f8-8781-007316d179bf&shop_id=dd9cf3b7-114f-4d74-a7e2-7b524ae086f2
-    var fullPath = `${tokenCraftUrl}?channel_id=${requestBody[i].channel_id}&shop_id=${requestBody[i].shop_id}`
-    const response: any = await fetch(fullPath, {
-      method: 'get',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': apiKey
-      }
-    })
-    if (response.ok) {
-      store = await response.json()
-    }
-
-    let mappedStore: any = {
-      accessKey: store.shop?.credential?.consumer_key || '',
-      accessSecret: store.shop?.credential?.consumer_secret || '',
-      storeURL: store.shop?.credential?.store_url,
-      platform: PLATFORM[`${store.shop.org_prefix}`],
-      accessToken: store.shop?.credential?.access_token,
-      channelShopId: store.shop?.channel_shop_id,
-      storeId: store.shop?.credential?.store_url
-    }
-
     try {
       if (requestBody[i].variant.native_variant_id != requestBody[i].native_product_id) {
         const req = {
@@ -162,39 +103,9 @@ sellercraftRouter.post('/sellercraft/store/update-product-stock', async (context
 
 sellercraftRouter.post('/sellercraft/store/update-order-status', async (context, next) => {
   try {
-    const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-    const { tokenCraftApiKey: apiKey, tokenCraftUrl } = sellercraftChannelIntegrationConfig
-
-    const xApiKey = context.headers['x-api-key']
-
-    if (apiKey !== xApiKey) context.throw(400, 'api key validation failed')
-
     const requestBody = context.request.body
     var result: any = {}
-    var store: any = {}
-
-    // https://staging-tokencraft.sellercraft.co/v1/get-shop?channel_id=4bfb3362-d57c-47f8-8781-007316d179bf&shop_id=dd9cf3b7-114f-4d74-a7e2-7b524ae086f2
-    var fullPath = `${tokenCraftUrl}?channel_id=${requestBody.channel_id}&shop_id=${requestBody.shop_id}`
-    const response: any = await fetch(fullPath, {
-      method: 'get',
-      headers: {
-        'Content-Type': 'application/json',
-        'x-api-key': apiKey
-      }
-    })
-    if (response.ok) {
-      store = await response.json()
-    }
-
-    let mappedStore: any = {
-      accessKey: store.shop?.credential?.consumer_key || '',
-      accessSecret: store.shop?.credential?.consumer_secret || '',
-      storeURL: store.shop?.credential?.store_url,
-      platform: PLATFORM[`${store.shop.org_prefix}`],
-      accessToken: store.shop?.credential?.access_token,
-      channelShopId: store.shop?.channel_shop_id,
-      storeId: store.shop?.credential?.store_url
-    }
+    let mappedStore: any = await getShop(context, requestBody.channel_id, requestBody.shop_id)
 
     const reqBody = {
       orderId: requestBody.native_order_id,
@@ -302,37 +213,8 @@ sellercraftRouter.post('/sellercraft/store/update-order-status', async (context,
 })
 
 sellercraftRouter.post('/sellercraft/store/update-product-attribute', async (context, next) => {
-  const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-  const { tokenCraftApiKey: apiKey, tokenCraftUrl } = sellercraftChannelIntegrationConfig
-
-  const xApiKey = context.headers['x-api-key']
-
-  if (apiKey !== xApiKey) context.throw(400, 'api key validation failed')
-
   const requestBody = context.request.body
-  var store: any = {}
-
-  // https://staging-tokencraft.sellercraft.co/v1/get-shop?channel_id=4bfb3362-d57c-47f8-8781-007316d179bf&shop_id=dd9cf3b7-114f-4d74-a7e2-7b524ae086f2
-  var fullPath = `${tokenCraftUrl}?channel_id=${requestBody.channel_id}&shop_id=${requestBody.shop_id}`
-  const response: any = await fetch(fullPath, {
-    method: 'get',
-    headers: {
-      'Content-Type': 'application/json',
-      'x-api-key': apiKey
-    }
-  })
-  if (response.ok) {
-    store = await response.json()
-  }
-
-  let mappedStore: any = {
-    accessKey: store.shop?.credential?.consumer_key || '',
-    accessSecret: store.shop?.credential?.consumer_secret || '',
-    storeURL: store.shop?.credential?.store_url,
-    platform: PLATFORM[`${store.shop.org_prefix}`],
-    accessToken: store.shop?.credential?.access_token,
-    channelShopId: store.shop?.channel_shop_id
-  }
+  let mappedStore: any = await getShop(context, requestBody.channel_id, requestBody.shop_id)
 
   let { product_sku: productSku, native_product_id: itemId, variants } = requestBody
 

package/server/service/marketplace-channel/marketplace-channel-order-mutation.ts

@@ -7,6 +7,7 @@ import { StoreAPI } from '@things-factory/integration-marketplace'
 import { SHIPPING_TYPE } from '../../constants'
 import { SellercraftChannelIntegrationAPI } from '../../controllers/sellercraft-channel-integration-api'
 import { MarketplaceChannel } from './marketplace-channel'
+import { getShops } from '../../utils/tokencraft-util'
 
 @Resolver()
 export class MarketplaceChannelOrderMutation {
@@ -19,27 +20,13 @@ export class MarketplaceChannelOrderMutation {
     @Arg('toUpdatedDate', { nullable: true }) toUpdatedDate?: string
   ): Promise<boolean> {
     const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-    const { tokenCraftApiKey: apiKey, getShopsTokenCraftUrl } = sellercraftChannelIntegrationConfig
 
     const channels: MarketplaceChannel[] = await getRepository(MarketplaceChannel).find({ where: { isActive: true } })
 
     for (var i = 0; i < channels.length; i++) {
       try {
         const channel: MarketplaceChannel = channels[i]
-        var channelsFullPath = getShopsTokenCraftUrl + '?channel_id=' + channel.channelId
-        const channelResponse: any = await fetch(channelsFullPath, {
-          method: 'get',
-          headers: {
-            'Content-Type': 'application/json',
-            'x-api-key': apiKey
-          }
-        })
-
-        if (!channelResponse.ok) {
-          throw new Error(channelResponse)
-        }
-        var shopsResponse = await channelResponse.json()
-        var shops = shopsResponse.shops
+        let shops: any = await getShops(channel.channelId)
 
         for (var j = 0; j < shops.length; j++) {
           try {

package/server/service/marketplace-channel/marketplace-channel-product-mutation.ts

@@ -6,6 +6,7 @@ import { StoreAPI } from '@things-factory/integration-marketplace'
 
 import { SellercraftChannelIntegrationAPI } from '../../controllers/sellercraft-channel-integration-api'
 import { MarketplaceChannel } from './marketplace-channel'
+import { getShops } from '../../utils/tokencraft-util'
 
 @Resolver()
 export class MarketplaceChannelProductMutation {
@@ -16,26 +17,12 @@ export class MarketplaceChannelProductMutation {
     @Arg('toUpdatedDate', { nullable: true }) toUpdatedDate?: string
   ): Promise<boolean> {
     const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
-    const { tokenCraftApiKey: apiKey, getShopsTokenCraftUrl } = sellercraftChannelIntegrationConfig
 
     const channels: MarketplaceChannel[] = await getRepository(MarketplaceChannel).find({ where: { isActive: true } })
 
     for (var i = 0; i < channels.length; i++) {
       try {
-        var channelsFullPath = getShopsTokenCraftUrl + '?channel_id=' + channels[i].channelId
-        const channelResponse: any = await fetch(channelsFullPath, {
-          method: 'get',
-          headers: {
-            'Content-Type': 'application/json',
-            'x-api-key': apiKey
-          }
-        })
-
-        if (!channelResponse.ok) {
-          throw new Error(channelResponse)
-        }
-        var shopsResponse = await channelResponse.json()
-        var shops = shopsResponse.shops
+        let shops: any = await getShops(channels[i].channelId)
 
         for (var j = 0; j < shops.length; j++) {
           try {

package/server/utils/tokencraft-util.ts

@@ -0,0 +1,60 @@
+import { config } from '@things-factory/env'
+import { PLATFORM } from '../constants'
+import { createPayloadLog } from '@things-factory/integration-base'
+
+export async function getShop(context: any, channelId: string, shopId: string) {
+  const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
+  const { tokenCraftApiKey: apiKey, tokenCraftUrl } = sellercraftChannelIntegrationConfig
+  const xApiKey = context.headers['x-api-key']
+
+  if (apiKey !== xApiKey) context.throw(400, 'api key validation failed')
+
+  var fullPath = `${tokenCraftUrl}?channel_id=${channelId}&shop_id=${shopId}`
+  const response: any = await fetch(fullPath, {
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-api-key': apiKey
+    }
+  })
+  if (response.ok) {
+    let store = await response.json()
+    let mappedStore: any = {
+      accessKey: store.shop?.credential?.consumer_key || '',
+      accessSecret: store.shop?.credential?.consumer_secret || '',
+      storeURL: store.shop?.credential?.store_url,
+      platform: PLATFORM[`${store.shop.org_prefix}`],
+      accessToken: store.shop?.credential?.access_token,
+      channelShopId: store.shop?.channel_shop_id,
+      storeId: store.shop?.credential?.store_url
+    }
+    return mappedStore
+  } else {
+    createPayloadLog(shopId, tokenCraftUrl, `channel_id=${channelId}&shop_id=${shopId}`, response?.statusText || 500, {
+      state: { domain: null }
+    })
+  }
+}
+
+export async function getShops(channelId: string) {
+  const sellercraftChannelIntegrationConfig = config.get('sellercraftChannelIntegrationConfig', {})
+  const { tokenCraftApiKey: apiKey, getShopsTokenCraftUrl } = sellercraftChannelIntegrationConfig
+
+  var channelsFullPath = getShopsTokenCraftUrl + '?channel_id=' + channelId
+  const channelResponse: any = await fetch(channelsFullPath, {
+    method: 'get',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-api-key': apiKey
+    }
+  })
+
+  if (!channelResponse.ok) {
+      createPayloadLog(channelId, getShopsTokenCraftUrl, `channel_id=${channelId}`, channelResponse?.statusText || 500, {
+        state: { domain: null }
+      })
+    throw new Error(channelResponse)
+}
+  var shopsResponse = await channelResponse.json()
+  return shopsResponse.shops
+}