@things-factory/integration-lmd 4.3.344 → 4.3.358
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/client/pages/integration-lmd-detail.js +2 -8
- package/dist-server/controllers/lmd-middleware/apis/create-parcel.js +3 -1
- package/dist-server/controllers/lmd-middleware/apis/create-parcel.js.map +1 -1
- package/dist-server/index.js +2 -1
- package/dist-server/index.js.map +1 -1
- package/dist-server/service/index.js +2 -1
- package/dist-server/service/index.js.map +1 -1
- package/dist-server/service/last-mile-delivery/index.js +2 -1
- package/dist-server/service/last-mile-delivery/index.js.map +1 -1
- package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js +80 -25
- package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js.map +1 -1
- package/dist-server/service/last-mile-delivery/last-mile-delivery.js +1 -0
- package/dist-server/service/last-mile-delivery/last-mile-delivery.js.map +1 -1
- package/package.json +2 -2
- package/server/controllers/lmd-middleware/apis/create-parcel.ts +3 -1
- package/server/index.ts +1 -1
- package/server/service/index.ts +1 -1
- package/server/service/last-mile-delivery/index.ts +1 -1
- package/server/service/last-mile-delivery/last-mile-delivery-mutation.ts +137 -68
- package/server/service/last-mile-delivery/last-mile-delivery.ts +1 -0
|
@@ -190,6 +190,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
190
190
|
{ name: 'Airspeed', value: 'AIRSPEED' },
|
|
191
191
|
{ name: 'Poslaju', value: 'POSLAJU' },
|
|
192
192
|
{ name: 'Ninja Van', value: 'NINJA_VAN' },
|
|
193
|
+
{ name: 'EMS', value: 'EMS' },
|
|
193
194
|
{ name: 'Sapx', value: 'SAPX' },
|
|
194
195
|
{ name: 'Viettel Post', value: 'VIETTEL_POST' },
|
|
195
196
|
{ name: 'DHL Express', value: 'DHL_EXPRESS' },
|
|
@@ -459,7 +460,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
459
460
|
|
|
460
461
|
_authenticate(e) {
|
|
461
462
|
let lmdId =this.___data.id
|
|
462
|
-
//location.href = `https://3ec2-118-101-69-107.ngrok-free.app/ninjavan-connect-callback?code=1234&state=${lmdId}`
|
|
463
463
|
location.href = this.getNinjavanAuthUrl(lmdId)
|
|
464
464
|
}
|
|
465
465
|
|
|
@@ -580,13 +580,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
580
580
|
|
|
581
581
|
_validateForm() {
|
|
582
582
|
if (!this._lmdSettingForm.checkValidity()) throw new Error(i18next.t('text.lmd_setting_form_invalid'))
|
|
583
|
-
|
|
584
|
-
const accNum= this._lmdSettingForm.accountNumber.value;
|
|
585
|
-
if (accNum !== null && accNum !== "" && isNaN(parseInt(accNum))) {
|
|
586
|
-
throw new Error(i18next.t('text.account_number_invalid'));
|
|
587
|
-
}
|
|
588
|
-
// if (this._draftOrderData?.container && !this.containerNo.value)
|
|
589
|
-
// throw new Error(i18next.t('text.container_no_is_empty'))
|
|
583
|
+
|
|
590
584
|
}
|
|
591
585
|
|
|
592
586
|
_getFormInfo() {
|
|
@@ -46,10 +46,12 @@ function createParcel() {
|
|
|
46
46
|
items: p === null || p === void 0 ? void 0 : p.items,
|
|
47
47
|
staging: (p === null || p === void 0 ? void 0 : p.staging) ? p.staging : false,
|
|
48
48
|
order_no: (p === null || p === void 0 ? void 0 : p.orderNo) || '',
|
|
49
|
+
account_name: (p === null || p === void 0 ? void 0 : p.accountName) || '',
|
|
49
50
|
order_date: (p === null || p === void 0 ? void 0 : p.orderDate) || '',
|
|
50
51
|
remark: (p === null || p === void 0 ? void 0 : p.remark) || '',
|
|
51
52
|
cod: (p === null || p === void 0 ? void 0 : p.cod) ? p.cod : false,
|
|
52
|
-
prefix: (p === null || p === void 0 ? void 0 : p.prefix) || ''
|
|
53
|
+
prefix: (p === null || p === void 0 ? void 0 : p.prefix) || '',
|
|
54
|
+
paid_amount: (p === null || p === void 0 ? void 0 : p.paidAmount) || 0
|
|
53
55
|
};
|
|
54
56
|
});
|
|
55
57
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-parcel.js","sourceRoot":"","sources":["../../../../server/controllers/lmd-middleware/apis/create-parcel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"create-parcel.js","sourceRoot":"","sources":["../../../../server/controllers/lmd-middleware/apis/create-parcel.ts"],"names":[],"mappings":"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"}
|
package/dist-server/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = void 0;
|
|
17
|
+
exports.getAccessTokenEfmx = exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = void 0;
|
|
18
18
|
__exportStar(require("./migrations"), exports);
|
|
19
19
|
__exportStar(require("./service"), exports);
|
|
20
20
|
__exportStar(require("./middlewares"), exports);
|
|
@@ -24,6 +24,7 @@ __exportStar(require("./controllers/lmd-middleware"), exports);
|
|
|
24
24
|
var last_mile_delivery_mutation_1 = require("./service/last-mile-delivery/last-mile-delivery-mutation");
|
|
25
25
|
Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
|
|
26
26
|
Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
|
|
27
|
+
Object.defineProperty(exports, "getAccessTokenEfmx", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.getAccessTokenEfmx; } });
|
|
27
28
|
require("./routes");
|
|
28
29
|
process.on('bootstrap-module-start', async ({ app, config, client }) => { });
|
|
29
30
|
//# sourceMappingURL=index.js.map
|
package/dist-server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,4CAAyB;AACzB,gDAA6B;AAE7B,sDAAmC;AACnC,wDAAqC;AACrC,+DAA4C;AAE5C,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../server/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,4CAAyB;AACzB,gDAA6B;AAE7B,sDAAmC;AACnC,wDAAqC;AACrC,+DAA4C;AAE5C,wGAAoJ;AAA3I,0IAAA,2BAA2B,OAAA;AAAC,yIAAA,0BAA0B,OAAA;AAAC,iIAAA,kBAAkB,OAAA;AAElF,oBAAiB;AAEjB,OAAO,CAAC,EAAE,CAAC,wBAA+B,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE,GAAE,CAAC,CAAC,CAAA"}
|
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.schema = exports.entities = void 0;
|
|
17
|
+
exports.getAccessTokenEfmx = exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.schema = exports.entities = void 0;
|
|
18
18
|
/* EXPORT ENTITY TYPES */
|
|
19
19
|
__exportStar(require("./last-mile-delivery-bizplace/last-mile-delivery-bizplace"), exports);
|
|
20
20
|
__exportStar(require("./last-mile-delivery-setting/last-mile-delivery-setting"), exports);
|
|
@@ -44,4 +44,5 @@ exports.schema = {
|
|
|
44
44
|
var last_mile_delivery_mutation_1 = require("./last-mile-delivery/last-mile-delivery-mutation");
|
|
45
45
|
Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
|
|
46
46
|
Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
|
|
47
|
+
Object.defineProperty(exports, "getAccessTokenEfmx", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.getAccessTokenEfmx; } });
|
|
47
48
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,4FAAyE;AACzE,0FAAuE;AACvE,0EAAuD;AACvD,oEAAiD;AAEjD,mCAAmC;AACnC,+EAA4I;AAC5I,6EAAyI;AACzI,6DAAmH;AACnH,uDAA4G;AAE/F,QAAA,QAAQ,GAAG;IACtB,cAAc;IACf,GAAG,sCAAgC;IACnC,GAAG,qCAA+B;IAClC,GAAG,6BAAwB;IAC3B,GAAG,0BAAsB;CACzB,CAAA;AAGY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACxB,GAAG,uCAAiC;QACpC,GAAG,sCAAgC;QACnC,GAAG,8BAAyB;QAC5B,GAAG,2BAAuB;KACzB;CACF,CAAA;AAED,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yBAAyB;AACzB,4FAAyE;AACzE,0FAAuE;AACvE,0EAAuD;AACvD,oEAAiD;AAEjD,mCAAmC;AACnC,+EAA4I;AAC5I,6EAAyI;AACzI,6DAAmH;AACnH,uDAA4G;AAE/F,QAAA,QAAQ,GAAG;IACtB,cAAc;IACf,GAAG,sCAAgC;IACnC,GAAG,qCAA+B;IAClC,GAAG,6BAAwB;IAC3B,GAAG,0BAAsB;CACzB,CAAA;AAGY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACxB,GAAG,uCAAiC;QACpC,GAAG,sCAAgC;QACnC,GAAG,8BAAyB;QAC5B,GAAG,2BAAuB;KACzB;CACF,CAAA;AAED,gGAA6I;AAApI,0IAAA,2BAA2B,OAAA;AAAC,yIAAA,0BAA0B,OAAA;AAAE,iIAAA,kBAAkB,OAAA"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.resolvers = exports.entities = void 0;
|
|
3
|
+
exports.getAccessTokenEfmx = exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.resolvers = exports.entities = void 0;
|
|
4
4
|
const last_mile_delivery_1 = require("./last-mile-delivery");
|
|
5
5
|
const last_mile_delivery_query_1 = require("./last-mile-delivery-query");
|
|
6
6
|
const last_mile_delivery_mutation_1 = require("./last-mile-delivery-mutation");
|
|
@@ -9,4 +9,5 @@ exports.resolvers = [last_mile_delivery_query_1.LastMileDeliveryQuery, last_mile
|
|
|
9
9
|
var last_mile_delivery_mutation_2 = require("./last-mile-delivery-mutation");
|
|
10
10
|
Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.generateAccessTokenNinjavan; } });
|
|
11
11
|
Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.refreshAccessTokenNinjavan; } });
|
|
12
|
+
Object.defineProperty(exports, "getAccessTokenEfmx", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.getAccessTokenEfmx; } });
|
|
12
13
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/index.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AACvD,yEAAkE;AAClE,+EAAgI;AAEnH,QAAA,QAAQ,GAAG,CAAC,qCAAgB,CAAC,CAAA;AAC7B,QAAA,SAAS,GAAG,CAAC,gDAAqB,EAAE,sDAAwB,CAAC,CAAA;AAE1E,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/index.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AACvD,yEAAkE;AAClE,+EAAgI;AAEnH,QAAA,QAAQ,GAAG,CAAC,qCAAgB,CAAC,CAAA;AAC7B,QAAA,SAAS,GAAG,CAAC,gDAAqB,EAAE,sDAAwB,CAAC,CAAA;AAE1E,6EAA2H;AAAlH,0IAAA,2BAA2B,OAAA;AAAE,yIAAA,0BAA0B,OAAA;AAAE,iIAAA,kBAAkB,OAAA"}
|
|
@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.LastMileDeliveryMutation = void 0;
|
|
15
|
+
exports.getAccessTokenEfmx = exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.LastMileDeliveryMutation = void 0;
|
|
16
16
|
const type_graphql_1 = require("type-graphql");
|
|
17
17
|
const typeorm_1 = require("typeorm");
|
|
18
18
|
const last_mile_delivery_1 = require("./last-mile-delivery");
|
|
@@ -46,7 +46,12 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
|
46
46
|
const lmdBizplaceRepo = tx.getRepository(last_mile_delivery_bizplace_1.LastMileDeliveryBizplace);
|
|
47
47
|
const lastMileDelivery = await lmdRepo.findOne({
|
|
48
48
|
where: { domain, id: patch === null || patch === void 0 ? void 0 : patch.id },
|
|
49
|
-
relations: [
|
|
49
|
+
relations: [
|
|
50
|
+
'lastMileDeliverySettings',
|
|
51
|
+
'lastMileDeliverySettings.geoCountry',
|
|
52
|
+
'lastMileDeliveryBizplaces',
|
|
53
|
+
'lastMileDeliveryBizplaces.bizplace'
|
|
54
|
+
]
|
|
50
55
|
});
|
|
51
56
|
// create record if not exist
|
|
52
57
|
if (!lastMileDelivery) {
|
|
@@ -60,27 +65,21 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
|
60
65
|
throw new Error('no settings have been added - at lease 1 is required');
|
|
61
66
|
}
|
|
62
67
|
lmd = await lmdRepo.save(Object.assign(Object.assign({}, patch), { domain: domain, creator: user, updater: user, status: constants_1.LMD_STATUS.ACTIVE }));
|
|
63
|
-
let
|
|
64
|
-
let clientId = lmd
|
|
65
|
-
let secretKey = lmd
|
|
68
|
+
let id = lmd.id;
|
|
69
|
+
let clientId = lmd.clientId;
|
|
70
|
+
let secretKey = lmd.secretKey;
|
|
66
71
|
if (lmd.platform == 'VIETTEL_POST') {
|
|
67
|
-
await this.getViettelTemporaryToken(
|
|
72
|
+
await this.getViettelTemporaryToken(id, clientId, secretKey, context);
|
|
68
73
|
}
|
|
69
74
|
await settingPatch.forEach(async (lmdSettingData) => {
|
|
70
75
|
delete lmdSettingData.id;
|
|
71
76
|
let excludePostalCode = lmdSettingData.excludePostalCode;
|
|
72
77
|
let includePostalCode = lmdSettingData.includePostalCode;
|
|
73
78
|
if (lmdSettingData.excludePostalCode) {
|
|
74
|
-
lmdSettingData.excludePostalCode = excludePostalCode
|
|
75
|
-
.replaceAll(' ,', ',')
|
|
76
|
-
.replaceAll(', ', ',')
|
|
77
|
-
.trim();
|
|
79
|
+
lmdSettingData.excludePostalCode = excludePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim();
|
|
78
80
|
}
|
|
79
81
|
if (lmdSettingData.includePostalCode) {
|
|
80
|
-
lmdSettingData.includePostalCode = includePostalCode
|
|
81
|
-
.replaceAll(' ,', ',')
|
|
82
|
-
.replaceAll(', ', ',')
|
|
83
|
-
.trim();
|
|
82
|
+
lmdSettingData.includePostalCode = includePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim();
|
|
84
83
|
}
|
|
85
84
|
let lmds = await lmdSettingRepo.save(Object.assign(Object.assign({}, lmdSettingData), { lastMileDelivery: lmd, domain: domain, creator: user, updater: user }));
|
|
86
85
|
lmdSetting.push(lmds);
|
|
@@ -99,16 +98,10 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
|
99
98
|
await lmdSettingRepo.delete(removeLMDS.map(itm => itm.id));
|
|
100
99
|
lmdSetting = await Promise.all(settingPatch.map(async (sp) => {
|
|
101
100
|
if (sp.excludePostalCode) {
|
|
102
|
-
sp.excludePostalCode = sp.excludePostalCode
|
|
103
|
-
.replaceAll(' ,', ',')
|
|
104
|
-
.replaceAll(', ', ',')
|
|
105
|
-
.trim();
|
|
101
|
+
sp.excludePostalCode = sp.excludePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim();
|
|
106
102
|
}
|
|
107
103
|
if (sp.includePostalCode) {
|
|
108
|
-
sp.includePostalCode = sp.includePostalCode
|
|
109
|
-
.replaceAll(' ,', ',')
|
|
110
|
-
.replaceAll(', ', ',')
|
|
111
|
-
.trim();
|
|
104
|
+
sp.includePostalCode = sp.includePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim();
|
|
112
105
|
}
|
|
113
106
|
if (!(sp === null || sp === void 0 ? void 0 : sp.id)) {
|
|
114
107
|
delete sp.id;
|
|
@@ -168,6 +161,14 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
|
168
161
|
await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDeliveries);
|
|
169
162
|
return true;
|
|
170
163
|
}
|
|
164
|
+
async generateAccessTokenEfmx(id, clientId, secretKey, context) {
|
|
165
|
+
const { tx } = context.state;
|
|
166
|
+
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
167
|
+
where: { id }
|
|
168
|
+
});
|
|
169
|
+
await getAccessTokenEfmx(id, clientId, secretKey, context);
|
|
170
|
+
return true;
|
|
171
|
+
}
|
|
171
172
|
async getAccessTokenNinjavan(id, code, context) {
|
|
172
173
|
const { tx } = context.state;
|
|
173
174
|
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
@@ -305,6 +306,17 @@ __decorate([
|
|
|
305
306
|
__metadata("design:paramtypes", [Array, Object]),
|
|
306
307
|
__metadata("design:returntype", Promise)
|
|
307
308
|
], LastMileDeliveryMutation.prototype, "deleteLastMileDeliveries", null);
|
|
309
|
+
__decorate([
|
|
310
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
311
|
+
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for efmx' }),
|
|
312
|
+
__param(0, (0, type_graphql_1.Arg)('id', type => String)),
|
|
313
|
+
__param(1, (0, type_graphql_1.Arg)('clientId', type => String)),
|
|
314
|
+
__param(2, (0, type_graphql_1.Arg)('secretKey', type => String)),
|
|
315
|
+
__param(3, (0, type_graphql_1.Ctx)()),
|
|
316
|
+
__metadata("design:type", Function),
|
|
317
|
+
__metadata("design:paramtypes", [String, String, String, Object]),
|
|
318
|
+
__metadata("design:returntype", Promise)
|
|
319
|
+
], LastMileDeliveryMutation.prototype, "generateAccessTokenEfmx", null);
|
|
308
320
|
__decorate([
|
|
309
321
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
310
322
|
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for ninjavan' }),
|
|
@@ -352,7 +364,7 @@ exports.LastMileDeliveryMutation = LastMileDeliveryMutation;
|
|
|
352
364
|
async function generateAccessTokenNinjavan(id, code, context) {
|
|
353
365
|
const { tx } = context.state;
|
|
354
366
|
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
355
|
-
where: { id }
|
|
367
|
+
where: { id }
|
|
356
368
|
});
|
|
357
369
|
try {
|
|
358
370
|
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
|
|
@@ -375,7 +387,9 @@ async function generateAccessTokenNinjavan(id, code, context) {
|
|
|
375
387
|
const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result;
|
|
376
388
|
const currentTimestamp = Math.floor(Date.now() / 1000);
|
|
377
389
|
const expiryTimestamp = currentTimestamp + expiresIn;
|
|
378
|
-
await tx
|
|
390
|
+
await tx
|
|
391
|
+
.getRepository(last_mile_delivery_1.LastMileDelivery)
|
|
392
|
+
.update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
|
|
379
393
|
}
|
|
380
394
|
catch (e) {
|
|
381
395
|
env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
|
|
@@ -386,7 +400,7 @@ exports.generateAccessTokenNinjavan = generateAccessTokenNinjavan;
|
|
|
386
400
|
async function refreshAccessTokenNinjavan(id, context) {
|
|
387
401
|
const { tx } = context.state;
|
|
388
402
|
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
389
|
-
where: { id }
|
|
403
|
+
where: { id }
|
|
390
404
|
});
|
|
391
405
|
try {
|
|
392
406
|
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
|
|
@@ -420,4 +434,45 @@ async function refreshAccessTokenNinjavan(id, context) {
|
|
|
420
434
|
return lastMileDelivery;
|
|
421
435
|
}
|
|
422
436
|
exports.refreshAccessTokenNinjavan = refreshAccessTokenNinjavan;
|
|
437
|
+
async function getAccessTokenEfmx(id, clientId, secretKey, context) {
|
|
438
|
+
const { tx } = context.state;
|
|
439
|
+
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
440
|
+
where: { id }
|
|
441
|
+
});
|
|
442
|
+
try {
|
|
443
|
+
const staging = lastMileDelivery.staging ? 'stg' : '';
|
|
444
|
+
const baseUrl = `https://client${staging}.fmx.asia`;
|
|
445
|
+
const apiPath = '/api/tokenauth/authenticate';
|
|
446
|
+
const body = {
|
|
447
|
+
userNameOrEmailAddress: lastMileDelivery.clientId,
|
|
448
|
+
password: lastMileDelivery.secretKey
|
|
449
|
+
};
|
|
450
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
451
|
+
method: 'post',
|
|
452
|
+
headers: {
|
|
453
|
+
'Content-Type': 'application/json'
|
|
454
|
+
},
|
|
455
|
+
body: JSON.stringify(body)
|
|
456
|
+
});
|
|
457
|
+
const result = await response.json();
|
|
458
|
+
if (response.status != 200) {
|
|
459
|
+
throw new Error(result.error.message);
|
|
460
|
+
}
|
|
461
|
+
const { refreshToken: refreshToken, expireInSeconds: expiresIn, accessToken: accessToken } = result.result;
|
|
462
|
+
lastMileDelivery.refreshToken = refreshToken;
|
|
463
|
+
const currentTimestamp = Math.floor(Date.now() / 1000);
|
|
464
|
+
const expiryTimestamp = currentTimestamp + expiresIn;
|
|
465
|
+
lastMileDelivery.expiresIn = expiryTimestamp;
|
|
466
|
+
lastMileDelivery.accessToken = accessToken;
|
|
467
|
+
lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
|
|
468
|
+
lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
469
|
+
where: { id },
|
|
470
|
+
});
|
|
471
|
+
}
|
|
472
|
+
catch (e) {
|
|
473
|
+
env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
|
|
474
|
+
}
|
|
475
|
+
return lastMileDelivery;
|
|
476
|
+
}
|
|
477
|
+
exports.getAccessTokenEfmx = getAccessTokenEfmx;
|
|
423
478
|
//# sourceMappingURL=last-mile-delivery-mutation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-mile-delivery-mutation.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-mutation.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"last-mile-delivery-mutation.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-mutation.ts"],"names":[],"mappings":"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"}
|
|
@@ -29,6 +29,7 @@ var LmdPlatform;
|
|
|
29
29
|
LmdPlatform["POSLAJU"] = "POSLAJU";
|
|
30
30
|
LmdPlatform["NINJA_VAN"] = "NINJA_VAN";
|
|
31
31
|
LmdPlatform["SAPX"] = "SAPX";
|
|
32
|
+
LmdPlatform["EMS"] = "EMS";
|
|
32
33
|
LmdPlatform["VIETTEL_POST"] = "VIETTEL_POST";
|
|
33
34
|
LmdPlatform["DHL_EXPRESS"] = "DHL_EXPRESS";
|
|
34
35
|
})(LmdPlatform = exports.LmdPlatform || (exports.LmdPlatform = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-mile-delivery.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAKqB;AACrB,qCAUgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,yGAAkG;AAClG,4GAAqG;AAErG,IAAY,
|
|
1
|
+
{"version":3,"file":"last-mile-delivery.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-lmd",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.358",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"nock": "^13.0.2",
|
|
50
50
|
"should": "^13.2.3"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "d4abf15de3863600f915c3085f46a651c08c3b92"
|
|
53
53
|
}
|
|
@@ -43,10 +43,12 @@ export function createParcel() {
|
|
|
43
43
|
items: p?.items,
|
|
44
44
|
staging: p?.staging ? p.staging : false,
|
|
45
45
|
order_no: p?.orderNo || '',
|
|
46
|
+
account_name: p?.accountName || '',
|
|
46
47
|
order_date: p?.orderDate||'',
|
|
47
48
|
remark: p?.remark || '',
|
|
48
49
|
cod: p?.cod ? p.cod : false,
|
|
49
|
-
prefix: p?.prefix || ''
|
|
50
|
+
prefix: p?.prefix || '',
|
|
51
|
+
paid_amount: p?.paidAmount || 0
|
|
50
52
|
}
|
|
51
53
|
})
|
|
52
54
|
},
|
package/server/index.ts
CHANGED
|
@@ -6,7 +6,7 @@ export * from './controllers/etrax'
|
|
|
6
6
|
export * from './controllers/lmd-api'
|
|
7
7
|
export * from './controllers/lmd-middleware'
|
|
8
8
|
|
|
9
|
-
export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './service/last-mile-delivery/last-mile-delivery-mutation'
|
|
9
|
+
export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan,getAccessTokenEfmx } from './service/last-mile-delivery/last-mile-delivery-mutation'
|
|
10
10
|
|
|
11
11
|
import './routes'
|
|
12
12
|
|
package/server/service/index.ts
CHANGED
|
@@ -29,4 +29,4 @@ export const schema = {
|
|
|
29
29
|
]
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
-
export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './last-mile-delivery/last-mile-delivery-mutation'
|
|
32
|
+
export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan, getAccessTokenEfmx } from './last-mile-delivery/last-mile-delivery-mutation'
|
|
@@ -5,4 +5,4 @@ import { LastMileDeliveryMutation, generateAccessTokenNinjavan,refreshAccessToke
|
|
|
5
5
|
export const entities = [LastMileDelivery]
|
|
6
6
|
export const resolvers = [LastMileDeliveryQuery, LastMileDeliveryMutation]
|
|
7
7
|
|
|
8
|
-
export { generateAccessTokenNinjavan, refreshAccessTokenNinjavan } from './last-mile-delivery-mutation'
|
|
8
|
+
export { generateAccessTokenNinjavan, refreshAccessTokenNinjavan, getAccessTokenEfmx } from './last-mile-delivery-mutation'
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
|
|
2
|
-
import { getRepository, In, EntityManager,getManager,getConnection } from 'typeorm'
|
|
2
|
+
import { getRepository, In, EntityManager, getManager, getConnection } from 'typeorm'
|
|
3
3
|
import { LastMileDelivery } from './last-mile-delivery'
|
|
4
4
|
import { NewLastMileDelivery, LastMileDeliveryPatch } from './last-mile-delivery-type'
|
|
5
5
|
import { LMD_STATUS } from '../../constants'
|
|
@@ -9,7 +9,6 @@ import { LastMileDeliveryBizplace } from '../last-mile-delivery-bizplace/last-mi
|
|
|
9
9
|
import { LastMileDeliveryBizplacePatch } from '../last-mile-delivery-bizplace/last-mile-delivery-bizplace-type'
|
|
10
10
|
import { logger } from '@things-factory/env'
|
|
11
11
|
|
|
12
|
-
|
|
13
12
|
@Resolver(LastMileDelivery)
|
|
14
13
|
export class LastMileDeliveryMutation {
|
|
15
14
|
@Directive('@transaction')
|
|
@@ -34,7 +33,7 @@ export class LastMileDeliveryMutation {
|
|
|
34
33
|
@Arg('id') id: string,
|
|
35
34
|
@Arg('patch') patch: LastMileDeliveryPatch,
|
|
36
35
|
@Ctx() context: any
|
|
37
|
-
): Promise<LastMileDelivery> {
|
|
36
|
+
): Promise<LastMileDelivery> {
|
|
38
37
|
const { domain, user, tx } = context.state
|
|
39
38
|
|
|
40
39
|
const repository = tx.getRepository(LastMileDelivery)
|
|
@@ -55,7 +54,7 @@ export class LastMileDeliveryMutation {
|
|
|
55
54
|
@Ctx() context: any,
|
|
56
55
|
@Arg('lastMileDeliveryPatch', type => LastMileDeliveryPatch) patch: LastMileDeliveryPatch,
|
|
57
56
|
@Arg('lastMileDeliverySettingPatch', type => [LastMileDeliverySettingPatch], { nullable: true })
|
|
58
|
-
@Arg('lastMileDeliveryBizplacePatch'
|
|
57
|
+
@Arg('lastMileDeliveryBizplacePatch', type => [LastMileDeliveryBizplacePatch], { nullable: true })
|
|
59
58
|
bizplacePatch?: LastMileDeliveryBizplacePatch[],
|
|
60
59
|
settingPatch?: LastMileDeliverySettingPatch[]
|
|
61
60
|
): Promise<LastMileDelivery> {
|
|
@@ -70,7 +69,12 @@ export class LastMileDeliveryMutation {
|
|
|
70
69
|
const lmdBizplaceRepo = tx.getRepository(LastMileDeliveryBizplace)
|
|
71
70
|
const lastMileDelivery = await lmdRepo.findOne({
|
|
72
71
|
where: { domain, id: patch?.id },
|
|
73
|
-
relations: [
|
|
72
|
+
relations: [
|
|
73
|
+
'lastMileDeliverySettings',
|
|
74
|
+
'lastMileDeliverySettings.geoCountry',
|
|
75
|
+
'lastMileDeliveryBizplaces',
|
|
76
|
+
'lastMileDeliveryBizplaces.bizplace'
|
|
77
|
+
]
|
|
74
78
|
})
|
|
75
79
|
|
|
76
80
|
// create record if not exist
|
|
@@ -95,12 +99,13 @@ export class LastMileDeliveryMutation {
|
|
|
95
99
|
status: LMD_STATUS.ACTIVE
|
|
96
100
|
})
|
|
97
101
|
|
|
98
|
-
let
|
|
99
|
-
let clientId = lmd
|
|
100
|
-
let secretKey = lmd
|
|
102
|
+
let id = lmd.id
|
|
103
|
+
let clientId = lmd.clientId
|
|
104
|
+
let secretKey = lmd.secretKey
|
|
101
105
|
|
|
102
|
-
|
|
103
|
-
|
|
106
|
+
|
|
107
|
+
if(lmd.platform=='VIETTEL_POST'){
|
|
108
|
+
await this.getViettelTemporaryToken(id,clientId,secretKey,context)
|
|
104
109
|
}
|
|
105
110
|
|
|
106
111
|
await settingPatch.forEach(async lmdSettingData => {
|
|
@@ -109,16 +114,10 @@ export class LastMileDeliveryMutation {
|
|
|
109
114
|
let includePostalCode: any = lmdSettingData.includePostalCode
|
|
110
115
|
|
|
111
116
|
if (lmdSettingData.excludePostalCode) {
|
|
112
|
-
lmdSettingData.excludePostalCode = excludePostalCode
|
|
113
|
-
.replaceAll(' ,', ',')
|
|
114
|
-
.replaceAll(', ', ',')
|
|
115
|
-
.trim()
|
|
117
|
+
lmdSettingData.excludePostalCode = excludePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim()
|
|
116
118
|
}
|
|
117
119
|
if (lmdSettingData.includePostalCode) {
|
|
118
|
-
lmdSettingData.includePostalCode = includePostalCode
|
|
119
|
-
.replaceAll(' ,', ',')
|
|
120
|
-
.replaceAll(', ', ',')
|
|
121
|
-
.trim()
|
|
120
|
+
lmdSettingData.includePostalCode = includePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim()
|
|
122
121
|
}
|
|
123
122
|
|
|
124
123
|
let lmds = await lmdSettingRepo.save({
|
|
@@ -147,10 +146,7 @@ export class LastMileDeliveryMutation {
|
|
|
147
146
|
})
|
|
148
147
|
|
|
149
148
|
lmd = { ...lmd, lastMileDeliverySettings: lmdSetting, lastMileDeliveryBizplaces: lmdBizplace }
|
|
150
|
-
}
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
else {
|
|
149
|
+
} else {
|
|
154
150
|
lmd = await lmdRepo.save({
|
|
155
151
|
...patch,
|
|
156
152
|
domain: domain,
|
|
@@ -166,20 +162,14 @@ export class LastMileDeliveryMutation {
|
|
|
166
162
|
lmdSetting = await Promise.all(
|
|
167
163
|
settingPatch.map(async (sp: any) => {
|
|
168
164
|
if (sp.excludePostalCode) {
|
|
169
|
-
sp.excludePostalCode = sp.excludePostalCode
|
|
170
|
-
.replaceAll(' ,', ',')
|
|
171
|
-
.replaceAll(', ', ',')
|
|
172
|
-
.trim()
|
|
165
|
+
sp.excludePostalCode = sp.excludePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim()
|
|
173
166
|
}
|
|
174
167
|
if (sp.includePostalCode) {
|
|
175
|
-
sp.includePostalCode = sp.includePostalCode
|
|
176
|
-
.replaceAll(' ,', ',')
|
|
177
|
-
.replaceAll(', ', ',')
|
|
178
|
-
.trim()
|
|
168
|
+
sp.includePostalCode = sp.includePostalCode.replaceAll(' ,', ',').replaceAll(', ', ',').trim()
|
|
179
169
|
}
|
|
180
170
|
if (!sp?.id) {
|
|
181
171
|
delete sp.id
|
|
182
|
-
}
|
|
172
|
+
}
|
|
183
173
|
|
|
184
174
|
let result = await lmdSettingRepo.save({
|
|
185
175
|
...sp,
|
|
@@ -202,7 +192,7 @@ export class LastMileDeliveryMutation {
|
|
|
202
192
|
bizplacePatch.map(async (bp: any) => {
|
|
203
193
|
if (!bp?.id) {
|
|
204
194
|
delete bp.id
|
|
205
|
-
}
|
|
195
|
+
}
|
|
206
196
|
let resultLMDB = await lmdBizplaceRepo.save({
|
|
207
197
|
...bp,
|
|
208
198
|
lastMileDelivery: lmd,
|
|
@@ -296,25 +286,45 @@ export class LastMileDeliveryMutation {
|
|
|
296
286
|
return true
|
|
297
287
|
}
|
|
298
288
|
|
|
289
|
+
@Directive('@transaction')
|
|
290
|
+
@Mutation(returns => Boolean, { description: 'To get access token for efmx' })
|
|
291
|
+
async generateAccessTokenEfmx(
|
|
292
|
+
@Arg('id', type => String) id: string,
|
|
293
|
+
@Arg('clientId', type => String) clientId: string,
|
|
294
|
+
@Arg('secretKey', type => String) secretKey: string,
|
|
295
|
+
@Ctx() context: any
|
|
296
|
+
): Promise<boolean> {
|
|
297
|
+
const { tx } = context.state
|
|
298
|
+
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
299
|
+
where: { id }
|
|
300
|
+
})
|
|
301
|
+
await getAccessTokenEfmx(id, clientId, secretKey, context)
|
|
302
|
+
|
|
303
|
+
return true
|
|
304
|
+
}
|
|
305
|
+
|
|
299
306
|
@Directive('@transaction')
|
|
300
307
|
@Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
|
|
301
|
-
async getAccessTokenNinjavan(
|
|
308
|
+
async getAccessTokenNinjavan(
|
|
309
|
+
@Arg('id', type => String) id: string,
|
|
310
|
+
@Arg('code', type => String) code: string,
|
|
311
|
+
@Ctx() context: any
|
|
312
|
+
): Promise<boolean> {
|
|
302
313
|
const { tx } = context.state
|
|
303
314
|
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
304
315
|
where: { id }
|
|
305
316
|
})
|
|
306
317
|
|
|
307
|
-
await generateAccessTokenNinjavan(id,code,context)
|
|
318
|
+
await generateAccessTokenNinjavan(id, code, context)
|
|
308
319
|
|
|
309
320
|
return true
|
|
310
|
-
|
|
311
321
|
}
|
|
312
322
|
|
|
313
323
|
@Directive('@transaction')
|
|
314
324
|
@Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
|
|
315
325
|
async refreshAccessTokenNinjavan(@Arg('id', type => String) id: string, @Ctx() context: any): Promise<boolean> {
|
|
316
326
|
const { tx } = context.state
|
|
317
|
-
let lastMileDelivery
|
|
327
|
+
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
318
328
|
where: { id }
|
|
319
329
|
})
|
|
320
330
|
return true
|
|
@@ -405,65 +415,68 @@ export class LastMileDeliveryMutation {
|
|
|
405
415
|
}
|
|
406
416
|
}
|
|
407
417
|
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
const { tx } = context.state;
|
|
418
|
+
export async function generateAccessTokenNinjavan(id: string, code: string, context: any): Promise<boolean> {
|
|
419
|
+
const { tx } = context.state
|
|
411
420
|
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
412
|
-
where: { id }
|
|
421
|
+
where: { id }
|
|
413
422
|
})
|
|
414
423
|
|
|
415
|
-
try{
|
|
416
|
-
const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
|
|
424
|
+
try {
|
|
425
|
+
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' '
|
|
417
426
|
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
|
|
418
427
|
const apiPath = '/1.0/oauth/token'
|
|
419
|
-
|
|
428
|
+
|
|
420
429
|
const body = {
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
430
|
+
client_id: lastMileDelivery.clientId,
|
|
431
|
+
client_secret: lastMileDelivery.secretKey,
|
|
432
|
+
grant_type: 'authorization_code',
|
|
433
|
+
code
|
|
425
434
|
}
|
|
426
435
|
|
|
427
436
|
const response = await fetch(baseUrl + apiPath, {
|
|
428
|
-
|
|
429
|
-
|
|
437
|
+
method: 'post',
|
|
438
|
+
body: JSON.stringify(body)
|
|
430
439
|
})
|
|
431
440
|
|
|
432
441
|
const result = await response.json()
|
|
433
442
|
|
|
434
443
|
if (response.status != 200) {
|
|
435
|
-
|
|
444
|
+
throw new Error(result.error.message)
|
|
436
445
|
}
|
|
437
446
|
|
|
438
447
|
const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result
|
|
439
448
|
|
|
440
|
-
const currentTimestamp = Math.floor(Date.now() / 1000)
|
|
441
|
-
const expiryTimestamp = currentTimestamp + expiresIn
|
|
449
|
+
const currentTimestamp = Math.floor(Date.now() / 1000)
|
|
450
|
+
const expiryTimestamp = currentTimestamp + expiresIn
|
|
442
451
|
|
|
443
|
-
await tx
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
452
|
+
await tx
|
|
453
|
+
.getRepository(LastMileDelivery)
|
|
454
|
+
.update(
|
|
455
|
+
{ id: lastMileDelivery.id },
|
|
456
|
+
{ accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp }
|
|
457
|
+
)
|
|
458
|
+
} catch (e) {
|
|
459
|
+
logger.error(`[auto_accessToken_log] ${e.message}`)
|
|
460
|
+
}
|
|
461
|
+
return true
|
|
449
462
|
}
|
|
450
463
|
|
|
451
464
|
export async function refreshAccessTokenNinjavan (id:string ,context :any): Promise<LastMileDelivery>{
|
|
452
465
|
const { tx } = context.state;
|
|
453
466
|
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
454
|
-
where: { id }
|
|
467
|
+
where: { id }
|
|
455
468
|
})
|
|
456
469
|
|
|
457
|
-
try{
|
|
458
|
-
const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
|
|
470
|
+
try {
|
|
471
|
+
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' '
|
|
459
472
|
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
|
|
460
473
|
const apiPath = '/1.0/oauth/token'
|
|
461
474
|
|
|
462
475
|
const body = {
|
|
463
|
-
|
|
464
|
-
|
|
465
|
-
|
|
466
|
-
|
|
476
|
+
client_id: lastMileDelivery.clientId,
|
|
477
|
+
client_secret: lastMileDelivery.secretKey,
|
|
478
|
+
grant_type: 'refresh_token',
|
|
479
|
+
refresh_token: lastMileDelivery.refreshToken
|
|
467
480
|
}
|
|
468
481
|
|
|
469
482
|
const response = await fetch(baseUrl + apiPath, {
|
|
@@ -479,8 +492,8 @@ export async function refreshAccessTokenNinjavan (id:string ,context :any): Prom
|
|
|
479
492
|
|
|
480
493
|
const { refresh_token: refreshToken, expires_in: expiresIn, access_token: accessToken } = result
|
|
481
494
|
|
|
482
|
-
const currentTimestamp = Math.floor(Date.now() / 1000)
|
|
483
|
-
const expiryTimestamp = currentTimestamp + expiresIn
|
|
495
|
+
const currentTimestamp = Math.floor(Date.now() / 1000)
|
|
496
|
+
const expiryTimestamp = currentTimestamp + expiresIn
|
|
484
497
|
|
|
485
498
|
lastMileDelivery= await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
|
|
486
499
|
|
|
@@ -495,4 +508,60 @@ export async function refreshAccessTokenNinjavan (id:string ,context :any): Prom
|
|
|
495
508
|
|
|
496
509
|
|
|
497
510
|
return lastMileDelivery
|
|
498
|
-
}
|
|
511
|
+
}
|
|
512
|
+
|
|
513
|
+
export async function getAccessTokenEfmx(
|
|
514
|
+
id: string,
|
|
515
|
+
clientId: string,
|
|
516
|
+
secretKey: string,
|
|
517
|
+
context: any
|
|
518
|
+
): Promise<LastMileDelivery> {
|
|
519
|
+
const { tx } = context.state
|
|
520
|
+
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
521
|
+
where: { id }
|
|
522
|
+
})
|
|
523
|
+
|
|
524
|
+
try {
|
|
525
|
+
const staging = lastMileDelivery.staging ? 'stg':''
|
|
526
|
+
const baseUrl = `https://client${staging}.fmx.asia`
|
|
527
|
+
const apiPath = '/api/tokenauth/authenticate'
|
|
528
|
+
|
|
529
|
+
const body = {
|
|
530
|
+
userNameOrEmailAddress: lastMileDelivery.clientId,
|
|
531
|
+
password: lastMileDelivery.secretKey
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
535
|
+
method: 'post',
|
|
536
|
+
headers: {
|
|
537
|
+
'Content-Type': 'application/json'
|
|
538
|
+
},
|
|
539
|
+
body: JSON.stringify(body)
|
|
540
|
+
})
|
|
541
|
+
|
|
542
|
+
const result = await response.json()
|
|
543
|
+
|
|
544
|
+
if (response.status != 200) {
|
|
545
|
+
throw new Error(result.error.message)
|
|
546
|
+
}
|
|
547
|
+
|
|
548
|
+
const { refreshToken: refreshToken, expireInSeconds: expiresIn, accessToken: accessToken } = result.result
|
|
549
|
+
|
|
550
|
+
lastMileDelivery.refreshToken = refreshToken
|
|
551
|
+
|
|
552
|
+
const currentTimestamp = Math.floor(Date.now() / 1000)
|
|
553
|
+
const expiryTimestamp = currentTimestamp + expiresIn
|
|
554
|
+
lastMileDelivery.expiresIn = expiryTimestamp
|
|
555
|
+
lastMileDelivery.accessToken = accessToken
|
|
556
|
+
|
|
557
|
+
lastMileDelivery= await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
|
|
558
|
+
lastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
559
|
+
where: { id },
|
|
560
|
+
})
|
|
561
|
+
|
|
562
|
+
} catch (e) {
|
|
563
|
+
logger.error(`[auto_refreshToken_log] ${e.message}`)
|
|
564
|
+
}
|
|
565
|
+
|
|
566
|
+
return lastMileDelivery
|
|
567
|
+
}
|