@things-factory/integration-lmd 4.3.262 → 4.3.267
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 +106 -22
- package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js +88 -0
- 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-type.js +8 -0
- package/dist-server/service/last-mile-delivery/last-mile-delivery-type.js.map +1 -1
- package/dist-server/service/last-mile-delivery/last-mile-delivery.js +8 -2
- package/dist-server/service/last-mile-delivery/last-mile-delivery.js.map +1 -1
- package/dist-server/service/last-mile-delivery-setting/last-mile-delivery-setting.js +1 -1
- package/dist-server/service/last-mile-delivery-setting/last-mile-delivery-setting.js.map +1 -1
- package/package.json +2 -2
- package/server/service/last-mile-delivery/last-mile-delivery-mutation.ts +89 -1
- package/server/service/last-mile-delivery/last-mile-delivery-type.ts +6 -0
- package/server/service/last-mile-delivery/last-mile-delivery.ts +17 -8
- package/server/service/last-mile-delivery-setting/last-mile-delivery-setting.ts +1 -1
|
@@ -1,11 +1,29 @@
|
|
|
1
|
-
import { MultiColumnFormStyles } from '@things-factory/form-ui'
|
|
2
|
-
import { client, CustomAlert, gqlContext, navigate, PageView } from '@things-factory/shell'
|
|
3
|
-
import { CommonButtonStyles, ScrollbarStyles } from '@things-factory/styles'
|
|
4
1
|
import '@things-factory/grist-ui'
|
|
2
|
+
|
|
5
3
|
import gql from 'graphql-tag'
|
|
6
|
-
import {
|
|
7
|
-
|
|
8
|
-
|
|
4
|
+
import {
|
|
5
|
+
css,
|
|
6
|
+
html
|
|
7
|
+
} from 'lit'
|
|
8
|
+
|
|
9
|
+
import { MultiColumnFormStyles } from '@things-factory/form-ui'
|
|
10
|
+
import {
|
|
11
|
+
i18next,
|
|
12
|
+
localize
|
|
13
|
+
} from '@things-factory/i18n-base'
|
|
14
|
+
import {
|
|
15
|
+
client,
|
|
16
|
+
CustomAlert,
|
|
17
|
+
gqlContext,
|
|
18
|
+
navigate,
|
|
19
|
+
PageView
|
|
20
|
+
} from '@things-factory/shell'
|
|
21
|
+
import {
|
|
22
|
+
CommonButtonStyles,
|
|
23
|
+
ScrollbarStyles
|
|
24
|
+
} from '@things-factory/styles'
|
|
25
|
+
import { isMobileDevice } from '@things-factory/utils'
|
|
26
|
+
|
|
9
27
|
import { buildDomainContext } from './integration-lmd'
|
|
10
28
|
|
|
11
29
|
class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
@@ -87,22 +105,32 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
87
105
|
super()
|
|
88
106
|
this._data = { lmdSettingData: { records: [] } }
|
|
89
107
|
}
|
|
90
|
-
|
|
108
|
+
|
|
91
109
|
get context() {
|
|
110
|
+
var actions = [
|
|
111
|
+
{
|
|
112
|
+
title: i18next.t('button.save'),
|
|
113
|
+
action: this._updateLastMileDelivery.bind(this),
|
|
114
|
+
...CommonButtonStyles.save
|
|
115
|
+
},
|
|
116
|
+
{
|
|
117
|
+
title: i18next.t('button.back'),
|
|
118
|
+
action: this._navigateToList.bind(this),
|
|
119
|
+
...CommonButtonStyles.back
|
|
120
|
+
}
|
|
121
|
+
]
|
|
122
|
+
|
|
123
|
+
if (this._data.platform == 'NINJA_VAN' && this._data.clientId && this._data.secretKey) {
|
|
124
|
+
actions.unshift({
|
|
125
|
+
title: i18next.t('button.authenticate'),
|
|
126
|
+
action: this._authenticate.bind(this),
|
|
127
|
+
...CommonButtonStyles.connect
|
|
128
|
+
})
|
|
129
|
+
}
|
|
130
|
+
|
|
92
131
|
return {
|
|
93
132
|
title: i18next.t('title.last_mile_delivery_platform_detail'),
|
|
94
|
-
actions
|
|
95
|
-
{
|
|
96
|
-
title: i18next.t('button.save'),
|
|
97
|
-
action: this._updateLastMileDelivery.bind(this),
|
|
98
|
-
...CommonButtonStyles.save
|
|
99
|
-
},
|
|
100
|
-
{
|
|
101
|
-
title: i18next.t('button.back'),
|
|
102
|
-
action: this._navigateToList.bind(this),
|
|
103
|
-
...CommonButtonStyles.back
|
|
104
|
-
}
|
|
105
|
-
],
|
|
133
|
+
actions,
|
|
106
134
|
help: 'page/integration-lmd-detail'
|
|
107
135
|
}
|
|
108
136
|
}
|
|
@@ -125,6 +153,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
125
153
|
{ name: 'DHL MY', value: 'DHL_MY' },
|
|
126
154
|
{ name: 'Airspeed', value: 'AIRSPEED' },
|
|
127
155
|
{ name: 'Poslaju', value: 'POSLAJU' },
|
|
156
|
+
{ name: 'Ninja Van', value: 'NINJA_VAN' },
|
|
128
157
|
{ name: 'Sapx', value: 'SAPX' },
|
|
129
158
|
]
|
|
130
159
|
|
|
@@ -145,6 +174,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
145
174
|
name="platform"
|
|
146
175
|
@change=${e => {
|
|
147
176
|
this._data.platform = e.currentTarget.value
|
|
177
|
+
this.updateContext()
|
|
148
178
|
}}
|
|
149
179
|
>
|
|
150
180
|
${Object.keys(PLATFORMS).map(
|
|
@@ -253,7 +283,11 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
253
283
|
}
|
|
254
284
|
|
|
255
285
|
async pageUpdated(changes, lifecycle) {
|
|
286
|
+
if (changes.resourceId == 'new') this._data.id
|
|
256
287
|
try {
|
|
288
|
+
const urlParams = new URLSearchParams(location.href)
|
|
289
|
+
const code = urlParams.get('code')
|
|
290
|
+
|
|
257
291
|
if (this.active) {
|
|
258
292
|
this._clearView()
|
|
259
293
|
await this.updateComplete
|
|
@@ -263,6 +297,21 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
263
297
|
if (this?._data && !this._data?.rank) {
|
|
264
298
|
this._data.rank = 0
|
|
265
299
|
}
|
|
300
|
+
|
|
301
|
+
if (code) {
|
|
302
|
+
const response = await client.mutate({
|
|
303
|
+
mutation: gql`
|
|
304
|
+
mutation generateAccessTokenNinjavan($id: String!, $code: String!) {
|
|
305
|
+
generateAccessTokenNinjavan(id: $id, code: $code)
|
|
306
|
+
}
|
|
307
|
+
`,
|
|
308
|
+
variables: {
|
|
309
|
+
id: this._data.id,
|
|
310
|
+
code: code
|
|
311
|
+
},
|
|
312
|
+
context: gqlContext()
|
|
313
|
+
})
|
|
314
|
+
}
|
|
266
315
|
this.updateContext()
|
|
267
316
|
} catch (e) {
|
|
268
317
|
this._showToast(e)
|
|
@@ -289,6 +338,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
289
338
|
soldToAccountId
|
|
290
339
|
accessToken
|
|
291
340
|
countryCode
|
|
341
|
+
staging
|
|
292
342
|
lastMileDeliverySettings {
|
|
293
343
|
id
|
|
294
344
|
name
|
|
@@ -313,15 +363,45 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
313
363
|
lmdSettingData: {
|
|
314
364
|
records: response.data?.lastMileDelivery?.lastMileDeliverySettings || [],
|
|
315
365
|
total: response.data?.lastMileDelivery?.lastMileDeliverySettings.length || 0
|
|
316
|
-
}
|
|
366
|
+
},
|
|
317
367
|
}
|
|
318
368
|
}
|
|
369
|
+
const test = this._data.platform
|
|
319
370
|
return
|
|
320
371
|
} else {
|
|
321
372
|
this._clearView()
|
|
322
373
|
}
|
|
323
374
|
}
|
|
324
375
|
|
|
376
|
+
_authenticate(e) {
|
|
377
|
+
location.href = this.getNinjavanAuthUrl()
|
|
378
|
+
}
|
|
379
|
+
|
|
380
|
+
getNinjavanAuthUrl() {
|
|
381
|
+
const sandbox = this._data.staging ? '-sandbox' : ''
|
|
382
|
+
const baseUrl = `https://dashboard${sandbox}.ninjavan.co/oauth/login`
|
|
383
|
+
const client_id = this._data.clientId
|
|
384
|
+
const scopes = [
|
|
385
|
+
'SHIPPER_PUBLIC_APIS_CREATE_ORDER',
|
|
386
|
+
'SHIPPER_PUBLIC_APIS_GET_AWB',
|
|
387
|
+
'SHIPPER_PUBLIC_APIS_CANCEL_ORDER'
|
|
388
|
+
]
|
|
389
|
+
const state = ''
|
|
390
|
+
|
|
391
|
+
const data = {
|
|
392
|
+
client_id,
|
|
393
|
+
scopes: scopes.join(' '),
|
|
394
|
+
state
|
|
395
|
+
}
|
|
396
|
+
|
|
397
|
+
const qs = Object.entries(data)
|
|
398
|
+
.map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`)
|
|
399
|
+
.join('&')
|
|
400
|
+
|
|
401
|
+
return `${baseUrl}?${qs}`
|
|
402
|
+
}
|
|
403
|
+
|
|
404
|
+
|
|
325
405
|
async _updateLastMileDelivery(e) {
|
|
326
406
|
try {
|
|
327
407
|
this._validateForm()
|
|
@@ -364,8 +444,12 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
|
|
|
364
444
|
|
|
365
445
|
if (!response.errors) {
|
|
366
446
|
this._showToast({ message: i18next.t('text.details_saved') })
|
|
367
|
-
this.
|
|
368
|
-
|
|
447
|
+
this._data = {
|
|
448
|
+
...this._data,
|
|
449
|
+
id: response.data.upsertLastMileDelivery.id
|
|
450
|
+
}
|
|
451
|
+
await this._fetchOrder()
|
|
452
|
+
this.updateContext()
|
|
369
453
|
}
|
|
370
454
|
} catch (e) {
|
|
371
455
|
this._showToast(e)
|
|
@@ -20,6 +20,7 @@ const last_mile_delivery_type_1 = require("./last-mile-delivery-type");
|
|
|
20
20
|
const constants_1 = require("../../constants");
|
|
21
21
|
const last_mile_delivery_setting_1 = require("../last-mile-delivery-setting/last-mile-delivery-setting");
|
|
22
22
|
const last_mile_delivery_setting_type_1 = require("../last-mile-delivery-setting/last-mile-delivery-setting-type");
|
|
23
|
+
const env_1 = require("@things-factory/env");
|
|
23
24
|
let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
24
25
|
async createLastMileDelivery(lastMileDelivery, context) {
|
|
25
26
|
const { domain, user, tx } = context.state;
|
|
@@ -145,6 +146,74 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
|
|
|
145
146
|
await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDeliveries);
|
|
146
147
|
return true;
|
|
147
148
|
}
|
|
149
|
+
async generateAccessTokenNinjavan(id, code, context) {
|
|
150
|
+
const { tx } = context.state;
|
|
151
|
+
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
152
|
+
where: { id }
|
|
153
|
+
});
|
|
154
|
+
try {
|
|
155
|
+
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
|
|
156
|
+
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
|
|
157
|
+
const apiPath = '/1.0/oauth/token';
|
|
158
|
+
const body = {
|
|
159
|
+
client_id: lastMileDelivery.clientId,
|
|
160
|
+
client_secret: lastMileDelivery.secretKey,
|
|
161
|
+
grant_type: 'authorization_code',
|
|
162
|
+
code
|
|
163
|
+
};
|
|
164
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
165
|
+
method: 'post',
|
|
166
|
+
body: JSON.stringify(body)
|
|
167
|
+
});
|
|
168
|
+
const result = await response.json();
|
|
169
|
+
if (response.status != 200) {
|
|
170
|
+
throw new Error(result.error.message);
|
|
171
|
+
}
|
|
172
|
+
const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result;
|
|
173
|
+
lastMileDelivery.accessToken = accessToken;
|
|
174
|
+
lastMileDelivery.refreshToken = refreshToken;
|
|
175
|
+
lastMileDelivery.expiresIn = experiesIn;
|
|
176
|
+
await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
|
|
177
|
+
}
|
|
178
|
+
catch (e) {
|
|
179
|
+
env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
|
|
180
|
+
}
|
|
181
|
+
return true;
|
|
182
|
+
}
|
|
183
|
+
async refreshAccessTokenNinjavan(id, context) {
|
|
184
|
+
const { tx } = context.state;
|
|
185
|
+
let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
|
|
186
|
+
where: { id }
|
|
187
|
+
});
|
|
188
|
+
try {
|
|
189
|
+
const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
|
|
190
|
+
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
|
|
191
|
+
const apiPath = '/1.0/oauth/token';
|
|
192
|
+
const body = {
|
|
193
|
+
client_id: lastMileDelivery.clientId,
|
|
194
|
+
client_secret: lastMileDelivery.secretKey,
|
|
195
|
+
grant_type: 'refresh_token',
|
|
196
|
+
refresh_token: lastMileDelivery.refreshToken
|
|
197
|
+
};
|
|
198
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
199
|
+
method: 'post',
|
|
200
|
+
body: JSON.stringify(body)
|
|
201
|
+
});
|
|
202
|
+
const result = await response.json();
|
|
203
|
+
if (response.status != 200) {
|
|
204
|
+
throw new Error(result.error.message);
|
|
205
|
+
}
|
|
206
|
+
const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result;
|
|
207
|
+
lastMileDelivery.refreshToken = refreshToken;
|
|
208
|
+
lastMileDelivery.expiresIn = experiesIn;
|
|
209
|
+
lastMileDelivery.accessToken = accessToken;
|
|
210
|
+
await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
|
|
211
|
+
}
|
|
212
|
+
catch (e) {
|
|
213
|
+
env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
|
|
214
|
+
}
|
|
215
|
+
return true;
|
|
216
|
+
}
|
|
148
217
|
};
|
|
149
218
|
__decorate([
|
|
150
219
|
(0, type_graphql_1.Directive)('@transaction'),
|
|
@@ -202,6 +271,25 @@ __decorate([
|
|
|
202
271
|
__metadata("design:paramtypes", [Array, Object]),
|
|
203
272
|
__metadata("design:returntype", Promise)
|
|
204
273
|
], LastMileDeliveryMutation.prototype, "deleteLastMileDeliveries", null);
|
|
274
|
+
__decorate([
|
|
275
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
276
|
+
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for ninjavan' }),
|
|
277
|
+
__param(0, (0, type_graphql_1.Arg)('id', type => String)),
|
|
278
|
+
__param(1, (0, type_graphql_1.Arg)('code', type => String)),
|
|
279
|
+
__param(2, (0, type_graphql_1.Ctx)()),
|
|
280
|
+
__metadata("design:type", Function),
|
|
281
|
+
__metadata("design:paramtypes", [String, String, Object]),
|
|
282
|
+
__metadata("design:returntype", Promise)
|
|
283
|
+
], LastMileDeliveryMutation.prototype, "generateAccessTokenNinjavan", null);
|
|
284
|
+
__decorate([
|
|
285
|
+
(0, type_graphql_1.Directive)('@transaction'),
|
|
286
|
+
(0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for ninjavan' }),
|
|
287
|
+
__param(0, (0, type_graphql_1.Arg)('id', type => String)),
|
|
288
|
+
__param(1, (0, type_graphql_1.Ctx)()),
|
|
289
|
+
__metadata("design:type", Function),
|
|
290
|
+
__metadata("design:paramtypes", [String, Object]),
|
|
291
|
+
__metadata("design:returntype", Promise)
|
|
292
|
+
], LastMileDeliveryMutation.prototype, "refreshAccessTokenNinjavan", null);
|
|
205
293
|
LastMileDeliveryMutation = __decorate([
|
|
206
294
|
(0, type_graphql_1.Resolver)(last_mile_delivery_1.LastMileDelivery)
|
|
207
295
|
], LastMileDeliveryMutation);
|
|
@@ -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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"}
|
|
@@ -62,6 +62,10 @@ __decorate([
|
|
|
62
62
|
(0, type_graphql_1.Field)(),
|
|
63
63
|
__metadata("design:type", String)
|
|
64
64
|
], NewLastMileDelivery.prototype, "refreshToken", void 0);
|
|
65
|
+
__decorate([
|
|
66
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
67
|
+
__metadata("design:type", String)
|
|
68
|
+
], NewLastMileDelivery.prototype, "expiresIn", void 0);
|
|
65
69
|
__decorate([
|
|
66
70
|
(0, type_graphql_1.Field)(),
|
|
67
71
|
__metadata("design:type", String)
|
|
@@ -116,6 +120,10 @@ __decorate([
|
|
|
116
120
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
117
121
|
__metadata("design:type", String)
|
|
118
122
|
], LastMileDeliveryPatch.prototype, "refreshToken", void 0);
|
|
123
|
+
__decorate([
|
|
124
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
125
|
+
__metadata("design:type", String)
|
|
126
|
+
], LastMileDeliveryPatch.prototype, "expiresIn", void 0);
|
|
119
127
|
__decorate([
|
|
120
128
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
121
129
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-mile-delivery-type.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAsF;AAGtF,6DAAuD;AAGhD,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;
|
|
1
|
+
{"version":3,"file":"last-mile-delivery-type.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-type.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var _a, _b, _c;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.LastMileDelivery = exports.LmdPlatform = void 0;
|
|
14
|
-
const typeorm_1 = require("typeorm");
|
|
15
14
|
const type_graphql_1 = require("type-graphql");
|
|
16
|
-
const
|
|
15
|
+
const typeorm_1 = require("typeorm");
|
|
17
16
|
const auth_base_1 = require("@things-factory/auth-base");
|
|
17
|
+
const shell_1 = require("@things-factory/shell");
|
|
18
18
|
const last_mile_delivery_setting_1 = require("../last-mile-delivery-setting/last-mile-delivery-setting");
|
|
19
19
|
var LmdPlatform;
|
|
20
20
|
(function (LmdPlatform) {
|
|
@@ -26,6 +26,7 @@ var LmdPlatform;
|
|
|
26
26
|
LmdPlatform["DHL_MY"] = "DHL_MY";
|
|
27
27
|
LmdPlatform["AIRSPEED"] = "AIRSPEED";
|
|
28
28
|
LmdPlatform["POSLAJU"] = "POSLAJU";
|
|
29
|
+
LmdPlatform["NINJA_VAN"] = "NINJA_VAN";
|
|
29
30
|
LmdPlatform["SAPX"] = "SAPX";
|
|
30
31
|
})(LmdPlatform = exports.LmdPlatform || (exports.LmdPlatform = {}));
|
|
31
32
|
(0, type_graphql_1.registerEnumType)(LmdPlatform, {
|
|
@@ -132,6 +133,11 @@ __decorate([
|
|
|
132
133
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
133
134
|
__metadata("design:type", Boolean)
|
|
134
135
|
], LastMileDelivery.prototype, "staging", void 0);
|
|
136
|
+
__decorate([
|
|
137
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
138
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
139
|
+
__metadata("design:type", String)
|
|
140
|
+
], LastMileDelivery.prototype, "expiresIn", void 0);
|
|
135
141
|
__decorate([
|
|
136
142
|
(0, typeorm_1.OneToMany)(type => last_mile_delivery_setting_1.LastMileDeliverySetting, lastMileDeliverySetting => lastMileDeliverySetting.lastMileDelivery),
|
|
137
143
|
(0, type_graphql_1.Field)(type => [last_mile_delivery_setting_1.LastMileDeliverySetting], { nullable: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-mile-delivery.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA
|
|
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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"}
|
|
@@ -109,7 +109,7 @@ __decorate([
|
|
|
109
109
|
], LastMileDeliverySetting.prototype, "updaterId", void 0);
|
|
110
110
|
LastMileDeliverySetting = __decorate([
|
|
111
111
|
(0, typeorm_1.Entity)(),
|
|
112
|
-
(0, typeorm_1.Index)('ix_last_mile_delivery_setting_0', (lastMileDeliverySetting) => [lastMileDeliverySetting.domain, lastMileDeliverySetting.name], { unique: true }),
|
|
112
|
+
(0, typeorm_1.Index)('ix_last_mile_delivery_setting_0', (lastMileDeliverySetting) => [lastMileDeliverySetting.domain, lastMileDeliverySetting.name, lastMileDeliverySetting.geoCountry, lastMileDeliverySetting.lastMileDelivery], { unique: true }),
|
|
113
113
|
(0, type_graphql_1.ObjectType)({ description: 'Entity for LastMileDeliverySetting' })
|
|
114
114
|
], LastMileDeliverySetting);
|
|
115
115
|
exports.LastMileDeliverySetting = LastMileDeliverySetting;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"last-mile-delivery-setting.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery-setting/last-mile-delivery-setting.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"last-mile-delivery-setting.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery-setting/last-mile-delivery-setting.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.267",
|
|
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": "4a13b0ed23951e75c858c0e7a1cda65d51b9bcfa"
|
|
53
53
|
}
|
|
@@ -5,6 +5,7 @@ import { NewLastMileDelivery, LastMileDeliveryPatch } from './last-mile-delivery
|
|
|
5
5
|
import { LMD_STATUS } from '../../constants'
|
|
6
6
|
import { LastMileDeliverySetting } from '../last-mile-delivery-setting/last-mile-delivery-setting'
|
|
7
7
|
import { LastMileDeliverySettingPatch } from '../last-mile-delivery-setting/last-mile-delivery-setting-type'
|
|
8
|
+
import { logger } from '@things-factory/env'
|
|
8
9
|
|
|
9
10
|
@Resolver(LastMileDelivery)
|
|
10
11
|
export class LastMileDeliveryMutation {
|
|
@@ -30,7 +31,7 @@ export class LastMileDeliveryMutation {
|
|
|
30
31
|
@Arg('id') id: string,
|
|
31
32
|
@Arg('patch') patch: LastMileDeliveryPatch,
|
|
32
33
|
@Ctx() context: any
|
|
33
|
-
|
|
34
|
+
): Promise<LastMileDelivery> {
|
|
34
35
|
const { domain, user, tx } = context.state
|
|
35
36
|
|
|
36
37
|
const repository = tx.getRepository(LastMileDelivery)
|
|
@@ -244,4 +245,91 @@ export class LastMileDeliveryMutation {
|
|
|
244
245
|
|
|
245
246
|
return true
|
|
246
247
|
}
|
|
248
|
+
|
|
249
|
+
@Directive('@transaction')
|
|
250
|
+
@Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
|
|
251
|
+
async generateAccessTokenNinjavan(@Arg('id', type => String) id: string, @Arg('code', type => String) code: string, @Ctx() context: any): Promise<boolean> {
|
|
252
|
+
const { tx } = context.state
|
|
253
|
+
let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
254
|
+
where: { id }
|
|
255
|
+
})
|
|
256
|
+
try{
|
|
257
|
+
const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
|
|
258
|
+
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
|
|
259
|
+
const apiPath = '/1.0/oauth/token'
|
|
260
|
+
|
|
261
|
+
const body = {
|
|
262
|
+
client_id: lastMileDelivery.clientId,
|
|
263
|
+
client_secret: lastMileDelivery.secretKey,
|
|
264
|
+
grant_type: 'authorization_code',
|
|
265
|
+
code
|
|
266
|
+
}
|
|
267
|
+
|
|
268
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
269
|
+
method: 'post',
|
|
270
|
+
body: JSON.stringify(body)
|
|
271
|
+
})
|
|
272
|
+
|
|
273
|
+
const result = await response.json()
|
|
274
|
+
|
|
275
|
+
if (response.status != 200) {
|
|
276
|
+
throw new Error(result.error.message)
|
|
277
|
+
}
|
|
278
|
+
|
|
279
|
+
const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result
|
|
280
|
+
|
|
281
|
+
lastMileDelivery.accessToken = accessToken
|
|
282
|
+
lastMileDelivery.refreshToken = refreshToken
|
|
283
|
+
lastMileDelivery.expiresIn = experiesIn
|
|
284
|
+
|
|
285
|
+
await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
|
|
286
|
+
} catch (e) {
|
|
287
|
+
logger.error(`[auto_accessToken_log] ${e.message}`)
|
|
288
|
+
}
|
|
289
|
+
return true
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
@Directive('@transaction')
|
|
293
|
+
@Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
|
|
294
|
+
async refreshAccessTokenNinjavan(@Arg('id', type => String) id: string, @Ctx() context: any): Promise<boolean> {
|
|
295
|
+
const { tx } = context.state
|
|
296
|
+
let lastMileDelivery : LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
|
|
297
|
+
where: { id }
|
|
298
|
+
})
|
|
299
|
+
try{
|
|
300
|
+
const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
|
|
301
|
+
const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
|
|
302
|
+
const apiPath = '/1.0/oauth/token'
|
|
303
|
+
|
|
304
|
+
const body = {
|
|
305
|
+
client_id: lastMileDelivery.clientId,
|
|
306
|
+
client_secret: lastMileDelivery.secretKey,
|
|
307
|
+
grant_type: 'refresh_token',
|
|
308
|
+
refresh_token: lastMileDelivery.refreshToken
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
const response = await fetch(baseUrl + apiPath, {
|
|
312
|
+
method: 'post',
|
|
313
|
+
body: JSON.stringify(body)
|
|
314
|
+
})
|
|
315
|
+
|
|
316
|
+
const result = await response.json()
|
|
317
|
+
|
|
318
|
+
if (response.status != 200) {
|
|
319
|
+
throw new Error(result.error.message)
|
|
320
|
+
}
|
|
321
|
+
|
|
322
|
+
const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result
|
|
323
|
+
|
|
324
|
+
lastMileDelivery.refreshToken = refreshToken
|
|
325
|
+
lastMileDelivery.expiresIn = experiesIn
|
|
326
|
+
lastMileDelivery.accessToken = accessToken
|
|
327
|
+
|
|
328
|
+
await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
|
|
329
|
+
} catch (e) {
|
|
330
|
+
logger.error(`[auto_refreshToken_log] ${e.message}`)
|
|
331
|
+
}
|
|
332
|
+
|
|
333
|
+
return true
|
|
334
|
+
}
|
|
247
335
|
}
|
|
@@ -41,6 +41,9 @@ export class NewLastMileDelivery {
|
|
|
41
41
|
@Field()
|
|
42
42
|
refreshToken: string
|
|
43
43
|
|
|
44
|
+
@Field({ nullable: true })
|
|
45
|
+
expiresIn?: string
|
|
46
|
+
|
|
44
47
|
@Field()
|
|
45
48
|
status: string
|
|
46
49
|
}
|
|
@@ -80,6 +83,9 @@ export class LastMileDeliveryPatch {
|
|
|
80
83
|
@Field({ nullable: true })
|
|
81
84
|
refreshToken?: string
|
|
82
85
|
|
|
86
|
+
@Field({ nullable: true })
|
|
87
|
+
expiresIn?: string
|
|
88
|
+
|
|
83
89
|
@Field({ nullable: true })
|
|
84
90
|
pickupAccountId?: string
|
|
85
91
|
|
|
@@ -1,20 +1,24 @@
|
|
|
1
1
|
import {
|
|
2
|
+
Field,
|
|
3
|
+
ID,
|
|
4
|
+
ObjectType,
|
|
5
|
+
registerEnumType
|
|
6
|
+
} from 'type-graphql'
|
|
7
|
+
import {
|
|
8
|
+
Column,
|
|
2
9
|
CreateDateColumn,
|
|
3
|
-
UpdateDateColumn,
|
|
4
10
|
Entity,
|
|
5
11
|
Index,
|
|
6
|
-
Column,
|
|
7
|
-
RelationId,
|
|
8
12
|
ManyToOne,
|
|
13
|
+
OneToMany,
|
|
9
14
|
PrimaryGeneratedColumn,
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
OneToMany
|
|
15
|
+
RelationId,
|
|
16
|
+
UpdateDateColumn
|
|
13
17
|
} from 'typeorm'
|
|
14
|
-
import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
|
|
15
18
|
|
|
16
|
-
import { Domain } from '@things-factory/shell'
|
|
17
19
|
import { User } from '@things-factory/auth-base'
|
|
20
|
+
import { Domain } from '@things-factory/shell'
|
|
21
|
+
|
|
18
22
|
import { LastMileDeliverySetting } from '../last-mile-delivery-setting/last-mile-delivery-setting'
|
|
19
23
|
|
|
20
24
|
export enum LmdPlatform {
|
|
@@ -26,6 +30,7 @@ export enum LmdPlatform {
|
|
|
26
30
|
DHL_MY = 'DHL_MY',
|
|
27
31
|
AIRSPEED = 'AIRSPEED',
|
|
28
32
|
POSLAJU = 'POSLAJU',
|
|
33
|
+
NINJA_VAN = 'NINJA_VAN',
|
|
29
34
|
SAPX ='SAPX'
|
|
30
35
|
}
|
|
31
36
|
|
|
@@ -125,6 +130,10 @@ export class LastMileDelivery {
|
|
|
125
130
|
@Field({ nullable: true })
|
|
126
131
|
staging: boolean
|
|
127
132
|
|
|
133
|
+
@Column({ nullable: true })
|
|
134
|
+
@Field({ nullable: true })
|
|
135
|
+
expiresIn?: string
|
|
136
|
+
|
|
128
137
|
@OneToMany(type => LastMileDeliverySetting, lastMileDeliverySetting => lastMileDeliverySetting.lastMileDelivery)
|
|
129
138
|
@Field(type => [LastMileDeliverySetting], { nullable: true })
|
|
130
139
|
lastMileDeliverySettings: LastMileDeliverySetting[]
|
|
@@ -16,7 +16,7 @@ import { GeoCountry } from '@things-factory/geography'
|
|
|
16
16
|
import { LastMileDelivery } from '../last-mile-delivery/last-mile-delivery'
|
|
17
17
|
|
|
18
18
|
@Entity()
|
|
19
|
-
@Index('ix_last_mile_delivery_setting_0', (lastMileDeliverySetting: LastMileDeliverySetting) => [lastMileDeliverySetting.domain, lastMileDeliverySetting.name], { unique: true })
|
|
19
|
+
@Index('ix_last_mile_delivery_setting_0', (lastMileDeliverySetting: LastMileDeliverySetting) => [lastMileDeliverySetting.domain, lastMileDeliverySetting.name, lastMileDeliverySetting.geoCountry, lastMileDeliverySetting.lastMileDelivery ], { unique: true })
|
|
20
20
|
@ObjectType({ description: 'Entity for LastMileDeliverySetting' })
|
|
21
21
|
export class LastMileDeliverySetting {
|
|
22
22
|
@PrimaryGeneratedColumn('uuid')
|