@things-factory/integration-marketplace 8.0.6 → 8.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-marketplace",
-  "version": "8.0.6",
+  "version": "8.0.8",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,17 +26,17 @@
   },
   "dependencies": {
     "@operato/data-grist": "^8.0.0",
-    "@things-factory/apptool-ui": "^8.0.5",
-    "@things-factory/auth-ui": "^8.0.5",
-    "@things-factory/biz-base": "^8.0.6",
-    "@things-factory/code-ui": "^8.0.5",
-    "@things-factory/context-ui": "^8.0.2",
-    "@things-factory/i18n-base": "^8.0.5",
-    "@things-factory/integration-lmd": "^8.0.6",
-    "@things-factory/integration-ui": "^8.0.5",
-    "@things-factory/more-ui": "^8.0.2",
-    "@things-factory/resource-ui": "^8.0.5",
-    "@things-factory/setting-ui": "^8.0.5",
+    "@things-factory/apptool-ui": "^8.0.8",
+    "@things-factory/auth-ui": "^8.0.8",
+    "@things-factory/biz-base": "^8.0.8",
+    "@things-factory/code-ui": "^8.0.8",
+    "@things-factory/context-ui": "^8.0.8",
+    "@things-factory/i18n-base": "^8.0.8",
+    "@things-factory/integration-lmd": "^8.0.8",
+    "@things-factory/integration-ui": "^8.0.8",
+    "@things-factory/more-ui": "^8.0.8",
+    "@things-factory/resource-ui": "^8.0.8",
+    "@things-factory/setting-ui": "^8.0.8",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -50,5 +50,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "89abb01bba2376bc5f074e0bc0088e32188d0396"
+  "gitHead": "2f53ec5833616a278c1f5fc057a5ce50f309cebd"
 }

package/server/routers/magento-private-router.ts

@@ -11,7 +11,7 @@ import { STORE_STATUS } from '../graphql/constants'
 
 const debug = require('debug')('things-factory:integration-marketplace:magento-private-router')
 
-const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
+const isPathBaseDomain = !config.get('subdomain')
 
 export const magentoPrivateRouter = new Router()
 
@@ -24,7 +24,7 @@ export type MagentoAccessInfo = {
 }
 
 magentoPrivateRouter.get(
-  `${isPathBaseDomain ? '/domain/:domain' : ''}/callback-magento-pre-install`,
+  `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-magento-pre-install`,
   async (context, next) => {
     const { domain, user } = context.state
 
@@ -184,7 +184,7 @@ magentoPrivateRouter.get(
 
     var message = 'success to activate'
     context.redirect(
-      `${getRedirectSubdomainPath(context, domain.subdomain)}marketplace-store-magento/${
+      `${getRedirectSubdomainPath(context, domain)}marketplace-store-magento/${
         marketplaceStore.id
       }/connect-callback?status=${marketplaceStore.status}&message=${message}`
     )

package/server/routers/shopify-install-private-router.ts

@@ -7,14 +7,14 @@ import { getRedirectSubdomainPath, getRepository } from '@things-factory/shell'
 import { MarketplaceSetting, MarketplaceStore } from '../entities'
 import { STORE_STATUS } from '../graphql/constants'
 
-const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
+const isPathBaseDomain = !config.get('subdomain')
 
 const debug = require('debug')('things-factory:integration-marketplace:shopify-install-private-router')
 
 export const shopifyInstallPrivateRouter = new Router()
 
 shopifyInstallPrivateRouter.get(
-  `${isPathBaseDomain ? '/domain/:domain' : ''}/callback-shopify-post-install`,
+  `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-shopify-post-install`,
   async (context, next) => {
     const { secure } = context
     const { domain, user } = context.state
@@ -87,7 +87,7 @@ shopifyInstallPrivateRouter.get(
 
     var message = 'success to activate'
     context.redirect(
-      `${getRedirectSubdomainPath(context, domain.subdomain)}marketplace-store-shopify/${
+      `${getRedirectSubdomainPath(context, domain)}marketplace-store-shopify/${
         marketplaceStore.id
       }/connect-callback?status=${marketplaceStore.status}&message=${message}`
     )

package/server/routers/shopify-private-router.ts

@@ -11,14 +11,14 @@ import { STORE_STATUS } from '../graphql/constants'
 
 const shopifyConfig = config.get('marketplaceIntegrationShopify', {})
 const { apiKey, apiSecret } = shopifyConfig
-const isPathBaseDomain = !config.get('subdomain') && !config.get('useVirtualHostBasedDomain')
+const isPathBaseDomain = !config.get('subdomain')
 
 const debug = require('debug')('things-factory:integration-marketplace:shopify-private-router')
 
 export const shopifyPrivateRouter = new Router()
 
 shopifyPrivateRouter.get(
-  `${isPathBaseDomain ? '/domain/:domain' : ''}/callback-shopify-install`,
+  `${isPathBaseDomain ? '/:domainType/:domain' : ''}/callback-shopify-install`,
   async (context, next) => {
     // https://example.org/callback-shopify-install?shop={shop}&hmac=da9d83c171400a41f8db91a950508985&timestamp=1409617544
     const { hmac, timestamp } = context.query

package/server/routers/shopify-public-router.ts

@@ -95,7 +95,7 @@ shopifyPublicRouter.get('/callback-shopify', async (context, next) => {
 
     var message = 'success to activate'
     context.redirect(
-      `${getRedirectSubdomainPath(context, store.domain.subdomain)}marketplace-store-shopify/${
+      `${getRedirectSubdomainPath(context, store.domain)}marketplace-store-shopify/${
         store.id
       }/connect-callback?status=${store.status}&message=${message}`
     )
@@ -104,7 +104,7 @@ shopifyPublicRouter.get('/callback-shopify', async (context, next) => {
 
     if (store) {
       context.redirect(
-        `${getRedirectSubdomainPath(context, store.domain.subdomain)}marketplace-store-shopify/${
+        `${getRedirectSubdomainPath(context, store.domain)}marketplace-store-shopify/${
           store.id
         }/connect-callback?status=${store.status}&message=${message}`
       )