@things-factory/integration-marketplace 3.8.3 → 3.8.10
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/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js +1 -1
- package/dist-server/graphql/resolvers/marketplace-setting/update-marketplace-setting.js.map +1 -1
- package/dist-server/routers/shopify-install-public-router.js +14 -4
- package/dist-server/routers/shopify-install-public-router.js.map +1 -1
- package/package.json +2 -2
- package/server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts +1 -1
- package/server/routers/shopify-install-public-router.ts +18 -5
|
@@ -10,7 +10,7 @@ exports.updateMarketplaceSetting = {
|
|
|
10
10
|
await Promise.all(marketplaceSettingPatch.map(async (settingPatch) => {
|
|
11
11
|
const marketplaceStore = await marketplaceStoreRepo.findOne(settingPatch === null || settingPatch === void 0 ? void 0 : settingPatch.marketplaceStore.id);
|
|
12
12
|
const marketplaceSetting = await marketplaceSettingRepo.findOne({
|
|
13
|
-
where: { domain, marketplaceStore }
|
|
13
|
+
where: { domain, marketplaceStore, category: settingPatch.category }
|
|
14
14
|
});
|
|
15
15
|
await marketplaceSettingRepo.save(Object.assign(Object.assign(Object.assign({}, marketplaceSetting), settingPatch), { updater: user }));
|
|
16
16
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-marketplace-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts"],"names":[],"mappings":";;;AAAA,gDAAwE;AAE3D,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,uBAAuB,EAAE,EAAE,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAkB,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QAE/D,MAAM,OAAO,CAAC,GAAG,CACf,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;YAC/C,MAAM,gBAAgB,GAAqB,MAAM,oBAAoB,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,CAAC,EAAE,CAAC,CAAA;YAChH,MAAM,kBAAkB,GAAuB,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBAClF,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE;
|
|
1
|
+
{"version":3,"file":"update-marketplace-setting.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-setting/update-marketplace-setting.ts"],"names":[],"mappings":";;;AAAA,gDAAwE;AAE3D,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,wBAAwB,CAAC,CAAM,EAAE,EAAE,uBAAuB,EAAE,EAAE,OAAY;QAC9E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,sBAAsB,GAAG,EAAE,CAAC,aAAa,CAAC,6BAAkB,CAAC,CAAA;QACnE,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;QAE/D,MAAM,OAAO,CAAC,GAAG,CACf,uBAAuB,CAAC,GAAG,CAAC,KAAK,EAAC,YAAY,EAAC,EAAE;YAC/C,MAAM,gBAAgB,GAAqB,MAAM,oBAAoB,CAAC,OAAO,CAAC,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,gBAAgB,CAAC,EAAE,CAAC,CAAA;YAChH,MAAM,kBAAkB,GAAuB,MAAM,sBAAsB,CAAC,OAAO,CAAC;gBAClF,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,YAAY,CAAC,QAAQ,EAAE;aACrE,CAAC,CAAA;YAEF,MAAM,sBAAsB,CAAC,IAAI,+CAC5B,kBAAkB,GAClB,YAAY,KACf,OAAO,EAAE,IAAI,IACb,CAAA;QACJ,CAAC,CAAC,CACH,CAAA;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -6,9 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.shopifyInstallPublicRouter = void 0;
|
|
7
7
|
const koa_router_1 = __importDefault(require("koa-router"));
|
|
8
8
|
const node_fetch_1 = __importDefault(require("node-fetch"));
|
|
9
|
+
const typeorm_1 = require("typeorm");
|
|
9
10
|
const env_1 = require("@things-factory/env");
|
|
10
11
|
const shell_1 = require("@things-factory/shell");
|
|
11
12
|
const shopify_1 = require("../controllers/shopify");
|
|
13
|
+
const entities_1 = require("../entities");
|
|
12
14
|
const debug = require('debug')('things-factory:integration-marketplace:shopify-install-public-router');
|
|
13
15
|
exports.shopifyInstallPublicRouter = new koa_router_1.default();
|
|
14
16
|
exports.shopifyInstallPublicRouter.get('/install-shopify', async (context, next) => {
|
|
@@ -98,14 +100,18 @@ exports.shopifyInstallPublicRouter.get('/callback-shopify-install', async (conte
|
|
|
98
100
|
context.redirect((0, shell_1.getUrlFromContext)(context, '/callback-shopify-post-install'));
|
|
99
101
|
});
|
|
100
102
|
exports.shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next) => {
|
|
101
|
-
const shopifyConfig = env_1.config.get('marketplaceIntegrationShopifyPrivate', {});
|
|
102
|
-
const { apiKey, apiSecret } = shopifyConfig;
|
|
103
103
|
const { secure } = context;
|
|
104
104
|
const { shop: shopUrl } = context.query;
|
|
105
105
|
debug('shop', shopUrl);
|
|
106
106
|
if (!shopUrl) {
|
|
107
107
|
context.throw(400, 'shop not found from the request');
|
|
108
108
|
}
|
|
109
|
+
const marketplaceStore = await (0, typeorm_1.getRepository)(entities_1.MarketplaceStore).findOne({
|
|
110
|
+
where: { storeURL: shopUrl }
|
|
111
|
+
});
|
|
112
|
+
if (!marketplaceStore)
|
|
113
|
+
context.throw(400, 'marketplace store not found');
|
|
114
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore;
|
|
109
115
|
const shop = shopUrl.replace('.myshopify.com', '');
|
|
110
116
|
const shopify = new shopify_1.Shopify({ apiKey, apiSecret, shop });
|
|
111
117
|
const redirectUrl = (0, shell_1.getUrlFromContext)(context, '/callback-shopify-install-private');
|
|
@@ -118,8 +124,6 @@ exports.shopifyInstallPublicRouter.get('/install-shopify-private', async (contex
|
|
|
118
124
|
context.redirect(authUrl);
|
|
119
125
|
});
|
|
120
126
|
exports.shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (context, next) => {
|
|
121
|
-
const shopifyConfig = env_1.config.get('marketplaceIntegrationShopifyPrivate', {});
|
|
122
|
-
const { apiKey, apiSecret } = shopifyConfig;
|
|
123
127
|
const { secure } = context;
|
|
124
128
|
const { shop: shopUrl, code, state } = context.query;
|
|
125
129
|
const stateCookie = context.cookies.get('shopify-install-state');
|
|
@@ -130,6 +134,12 @@ exports.shopifyInstallPublicRouter.get('/callback-shopify-install-private', asyn
|
|
|
130
134
|
secure,
|
|
131
135
|
httpOnly: true
|
|
132
136
|
});
|
|
137
|
+
const marketplaceStore = await (0, typeorm_1.getRepository)(entities_1.MarketplaceStore).findOne({
|
|
138
|
+
where: { storeURL: shopUrl }
|
|
139
|
+
});
|
|
140
|
+
if (!marketplaceStore)
|
|
141
|
+
context.throw(400, 'marketplace store not found');
|
|
142
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore;
|
|
133
143
|
const shop = shopUrl.replace('.myshopify.com', '');
|
|
134
144
|
const shopify = new shopify_1.Shopify({ apiKey, apiSecret, shop });
|
|
135
145
|
if (!shopify.isValidSignature(context.query)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shopify-install-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-install-public-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,4DAA8B;AAC9B,6CAA4C;AAC5C,iDAAyD;
|
|
1
|
+
{"version":3,"file":"shopify-install-public-router.js","sourceRoot":"","sources":["../../server/routers/shopify-install-public-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-marketplace",
|
|
3
|
-
"version": "3.8.
|
|
3
|
+
"version": "3.8.10",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"nock": "^13.0.2",
|
|
54
54
|
"should": "^13.2.3"
|
|
55
55
|
},
|
|
56
|
-
"gitHead": "
|
|
56
|
+
"gitHead": "94812199ec2098fe7f9ea7ad362399b09263ebf7"
|
|
57
57
|
}
|
|
@@ -10,7 +10,7 @@ export const updateMarketplaceSetting = {
|
|
|
10
10
|
marketplaceSettingPatch.map(async settingPatch => {
|
|
11
11
|
const marketplaceStore: MarketplaceStore = await marketplaceStoreRepo.findOne(settingPatch?.marketplaceStore.id)
|
|
12
12
|
const marketplaceSetting: MarketplaceSetting = await marketplaceSettingRepo.findOne({
|
|
13
|
-
where: { domain, marketplaceStore }
|
|
13
|
+
where: { domain, marketplaceStore, category: settingPatch.category }
|
|
14
14
|
})
|
|
15
15
|
|
|
16
16
|
await marketplaceSettingRepo.save({
|
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import Router from 'koa-router'
|
|
2
2
|
import fetch from 'node-fetch'
|
|
3
|
+
import { getRepository } from 'typeorm'
|
|
4
|
+
|
|
3
5
|
import { config } from '@things-factory/env'
|
|
4
6
|
import { getUrlFromContext } from '@things-factory/shell'
|
|
7
|
+
|
|
5
8
|
import { Shopify } from '../controllers/shopify'
|
|
9
|
+
import { MarketplaceStore } from '../entities'
|
|
6
10
|
|
|
7
11
|
const debug = require('debug')('things-factory:integration-marketplace:shopify-install-public-router')
|
|
8
12
|
|
|
@@ -121,15 +125,19 @@ shopifyInstallPublicRouter.get('/callback-shopify-install', async (context, next
|
|
|
121
125
|
})
|
|
122
126
|
|
|
123
127
|
shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next) => {
|
|
124
|
-
const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
|
|
125
|
-
const { apiKey, apiSecret } = shopifyConfig
|
|
126
|
-
|
|
127
128
|
const { secure } = context
|
|
128
129
|
const { shop: shopUrl } = context.query
|
|
129
130
|
debug('shop', shopUrl)
|
|
130
131
|
if (!shopUrl) {
|
|
131
132
|
context.throw(400, 'shop not found from the request')
|
|
132
133
|
}
|
|
134
|
+
const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
135
|
+
where: { storeURL: shopUrl }
|
|
136
|
+
})
|
|
137
|
+
|
|
138
|
+
if (!marketplaceStore) context.throw(400, 'marketplace store not found')
|
|
139
|
+
|
|
140
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
|
|
133
141
|
const shop = shopUrl.replace('.myshopify.com', '')
|
|
134
142
|
|
|
135
143
|
const shopify = new Shopify({ apiKey, apiSecret, shop })
|
|
@@ -147,8 +155,6 @@ shopifyInstallPublicRouter.get('/install-shopify-private', async (context, next)
|
|
|
147
155
|
})
|
|
148
156
|
|
|
149
157
|
shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (context, next) => {
|
|
150
|
-
const shopifyConfig = config.get('marketplaceIntegrationShopifyPrivate', {})
|
|
151
|
-
const { apiKey, apiSecret } = shopifyConfig
|
|
152
158
|
const { secure } = context
|
|
153
159
|
const { shop: shopUrl, code, state } = context.query
|
|
154
160
|
const stateCookie = context.cookies.get('shopify-install-state')
|
|
@@ -162,6 +168,13 @@ shopifyInstallPublicRouter.get('/callback-shopify-install-private', async (conte
|
|
|
162
168
|
httpOnly: true
|
|
163
169
|
})
|
|
164
170
|
|
|
171
|
+
const marketplaceStore: MarketplaceStore = await getRepository(MarketplaceStore).findOne({
|
|
172
|
+
where: { storeURL: shopUrl }
|
|
173
|
+
})
|
|
174
|
+
|
|
175
|
+
if (!marketplaceStore) context.throw(400, 'marketplace store not found')
|
|
176
|
+
|
|
177
|
+
const { accessKey: apiKey, accessSecret: apiSecret } = marketplaceStore
|
|
165
178
|
const shop = shopUrl.replace('.myshopify.com', '')
|
|
166
179
|
|
|
167
180
|
const shopify = new Shopify({ apiKey, apiSecret, shop })
|