@things-factory/integration-marketplace 8.0.8 → 8.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/integration-marketplace",
3
- "version": "8.0.8",
3
+ "version": "8.0.15",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -26,17 +26,17 @@
26
26
  },
27
27
  "dependencies": {
28
28
  "@operato/data-grist": "^8.0.0",
29
- "@things-factory/apptool-ui": "^8.0.8",
30
- "@things-factory/auth-ui": "^8.0.8",
31
- "@things-factory/biz-base": "^8.0.8",
32
- "@things-factory/code-ui": "^8.0.8",
33
- "@things-factory/context-ui": "^8.0.8",
34
- "@things-factory/i18n-base": "^8.0.8",
35
- "@things-factory/integration-lmd": "^8.0.8",
36
- "@things-factory/integration-ui": "^8.0.8",
37
- "@things-factory/more-ui": "^8.0.8",
38
- "@things-factory/resource-ui": "^8.0.8",
39
- "@things-factory/setting-ui": "^8.0.8",
29
+ "@things-factory/apptool-ui": "^8.0.15",
30
+ "@things-factory/auth-ui": "^8.0.15",
31
+ "@things-factory/biz-base": "^8.0.15",
32
+ "@things-factory/code-ui": "^8.0.15",
33
+ "@things-factory/context-ui": "^8.0.15",
34
+ "@things-factory/i18n-base": "^8.0.15",
35
+ "@things-factory/integration-lmd": "^8.0.15",
36
+ "@things-factory/integration-ui": "^8.0.15",
37
+ "@things-factory/more-ui": "^8.0.15",
38
+ "@things-factory/resource-ui": "^8.0.15",
39
+ "@things-factory/setting-ui": "^8.0.15",
40
40
  "debug": "^4.1.1",
41
41
  "node-fetch": "^2.6.0"
42
42
  },
@@ -50,5 +50,5 @@
50
50
  "nock": "^13.0.2",
51
51
  "should": "^13.2.3"
52
52
  },
53
- "gitHead": "2f53ec5833616a278c1f5fc057a5ce50f309cebd"
53
+ "gitHead": "214b341ededb4ecb5ef4401149d53899fe67af44"
54
54
  }
@@ -3,7 +3,7 @@ import fetch from 'node-fetch'
3
3
  import { v4 as uuidv4 } from 'uuid'
4
4
 
5
5
  import { config } from '@things-factory/env'
6
- import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
6
+ import { getRedirectSubdomainPath, getRoutePrefixForDomainType, getRepository } from '@things-factory/shell'
7
7
 
8
8
  import { Magento } from '../controllers/magento'
9
9
  import { MarketplaceSetting, MarketplaceStore } from '../entities'
@@ -24,7 +24,7 @@ export type MagentoAccessInfo = {
24
24
  }
25
25
 
26
26
  magentoPrivateRouter.get(
27
- `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-magento-pre-install`,
27
+ `${isPathBaseDomain ? `/${getRoutePrefixForDomainType()}/:domain` : ''}/callback-magento-pre-install`,
28
28
  async (context, next) => {
29
29
  const { domain, user } = context.state
30
30
 
@@ -2,7 +2,7 @@ import Router from 'koa-router'
2
2
  import { v4 as uuidv4 } from 'uuid'
3
3
 
4
4
  import { config } from '@things-factory/env'
5
- import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
5
+ import { getRedirectSubdomainPath, getRoutePrefixForDomainType, getRepository } from '@things-factory/shell'
6
6
 
7
7
  import { MarketplaceSetting, MarketplaceStore } from '../entities'
8
8
  import { STORE_STATUS } from '../graphql/constants'
@@ -14,7 +14,7 @@ const debug = require('debug')('things-factory:integration-marketplace:shopify-i
14
14
  export const shopifyInstallPrivateRouter = new Router()
15
15
 
16
16
  shopifyInstallPrivateRouter.get(
17
- `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-shopify-post-install`,
17
+ `${isPathBaseDomain ? `/${getRoutePrefixForDomainType()}/:domain` : ''}/callback-shopify-post-install`,
18
18
  async (context, next) => {
19
19
  const { secure } = context
20
20
  const { domain, user } = context.state
@@ -3,7 +3,7 @@ import { v4 as uuidv4 } from 'uuid'
3
3
 
4
4
  import { VerificationToken, VerificationTokenType } from '@things-factory/auth-base'
5
5
  import { config } from '@things-factory/env'
6
- import { getRepository, getUrlFromContext } from '@things-factory/shell'
6
+ import { getRepository, getRoutePrefixForDomainType, getUrlFromContext } from '@things-factory/shell'
7
7
 
8
8
  import { Shopify } from '../controllers/shopify'
9
9
  import { MarketplaceSetting, MarketplaceStore } from '../entities'
@@ -18,7 +18,7 @@ const debug = require('debug')('things-factory:integration-marketplace:shopify-p
18
18
  export const shopifyPrivateRouter = new Router()
19
19
 
20
20
  shopifyPrivateRouter.get(
21
- `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-shopify-install`,
21
+ `${isPathBaseDomain ? `/${getRoutePrefixForDomainType()}/:domain` : ''}/callback-shopify-install`,
22
22
  async (context, next) => {
23
23
  // https://example.org/callback-shopify-install?shop={shop}&hmac=da9d83c171400a41f8db91a950508985&timestamp=1409617544
24
24
  const { hmac, timestamp } = context.query