@things-factory/integration-lmd 4.3.281 → 4.3.284

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.
Files changed (26) hide show
  1. package/client/pages/integration-lmd-detail.js +5 -21
  2. package/dist-server/controllers/lmd-middleware/apis/create-parcel.js +2 -1
  3. package/dist-server/controllers/lmd-middleware/apis/create-parcel.js.map +1 -1
  4. package/dist-server/index.js +5 -0
  5. package/dist-server/index.js.map +1 -1
  6. package/dist-server/routers/ninjavan-public-router.js +45 -0
  7. package/dist-server/routers/ninjavan-public-router.js.map +1 -0
  8. package/dist-server/routes.js +4 -9
  9. package/dist-server/routes.js.map +1 -1
  10. package/dist-server/service/index.js +4 -1
  11. package/dist-server/service/index.js.map +1 -1
  12. package/dist-server/service/last-mile-delivery/index.js +4 -1
  13. package/dist-server/service/last-mile-delivery/index.js.map +1 -1
  14. package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js +72 -57
  15. package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js.map +1 -1
  16. package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js +1 -1
  17. package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js.map +1 -1
  18. package/package.json +2 -2
  19. package/server/controllers/lmd-middleware/apis/create-parcel.ts +2 -1
  20. package/server/index.ts +4 -0
  21. package/server/routers/ninjavan-public-router.ts +57 -0
  22. package/server/routes.ts +4 -9
  23. package/server/service/index.ts +2 -0
  24. package/server/service/last-mile-delivery/index.ts +3 -1
  25. package/server/service/last-mile-delivery/last-mile-delivery-mutation.ts +87 -62
  26. package/server/service/last-mile-delivery/last-mile-delivery-query.ts +1 -2
package/client/pages/integration-lmd-detail.js CHANGED
@@ -365,8 +365,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
365
365
  async pageUpdated(changes, lifecycle) {
366
366
  if (changes.resourceId == 'new') this._data.id
367
367
  try {
368
- const urlParams = new URLSearchParams(location.href)
369
- const code = urlParams.get('code')
370
368
 
371
369
  if (this.active) {
372
370
  this._clearView()
@@ -378,21 +376,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
378
376
  if (this?._data && !this._data?.rank) {
379
377
  this._data.rank = 0
380
378
  }
381
-
382
- if (code) {
383
- const response = await client.mutate({
384
- mutation: gql`
385
- mutation generateAccessTokenNinjavan($id: String!, $code: String!) {
386
- generateAccessTokenNinjavan(id: $id, code: $code)
387
- }
388
- `,
389
- variables: {
390
- id: this._data.id,
391
- code: code
392
- },
393
- context: gqlContext()
394
- })
395
- }
396
379
  this.updateContext()
397
380
  } catch (e) {
398
381
  this._showToast(e)
@@ -469,10 +452,12 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
469
452
  }
470
453
 
471
454
  _authenticate(e) {
472
- location.href = this.getNinjavanAuthUrl()
455
+ let lmdId =this.___data.id
456
+ //location.href = `https://3ec2-118-101-69-107.ngrok-free.app/ninjavan-connect-callback?code=1234&state=${lmdId}`
457
+ location.href = this.getNinjavanAuthUrl(lmdId)
473
458
  }
474
459
 
475
- getNinjavanAuthUrl() {
460
+ getNinjavanAuthUrl(lmdId) {
476
461
  const sandbox = this._data.staging ? '-sandbox' : ''
477
462
  const baseUrl = `https://dashboard${sandbox}.ninjavan.co/oauth/login`
478
463
  const client_id = this._data.clientId
@@ -486,7 +471,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
486
471
  const data = {
487
472
  client_id,
488
473
  scopes: scopes.join(' '),
489
- state
474
+ state:lmdId
490
475
  }
491
476
 
492
477
  const qs = Object.entries(data)
@@ -495,7 +480,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
495
480
 
496
481
  return `${baseUrl}?${qs}`
497
482
  }
498
-
499
483
 
500
484
  async _updateLastMileDelivery(e) {
501
485
  try {
package/dist-server/controllers/lmd-middleware/apis/create-parcel.js CHANGED
@@ -38,7 +38,8 @@ function createParcel() {
38
38
  account_number: (p === null || p === void 0 ? void 0 : p.accountNumber) || '',
39
39
  token: (p === null || p === void 0 ? void 0 : p.token) || '',
40
40
  items: p === null || p === void 0 ? void 0 : p.items,
41
- staging: (p === null || p === void 0 ? void 0 : p.staging) ? p.staging : false
41
+ staging: (p === null || p === void 0 ? void 0 : p.staging) ? p.staging : false,
42
+ order_no: (p === null || p === void 0 ? void 0 : p.orderNo) || '',
42
43
  };
43
44
  });
44
45
  },
package/dist-server/controllers/lmd-middleware/apis/create-parcel.js.map CHANGED
@@ -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,11 +14,16 @@ 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
18
  __exportStar(require("./migrations"), exports);
18
19
  __exportStar(require("./service"), exports);
19
20
  __exportStar(require("./middlewares"), exports);
20
21
  __exportStar(require("./controllers/etrax"), exports);
21
22
  __exportStar(require("./controllers/lmd-api"), exports);
22
23
  __exportStar(require("./controllers/lmd-middleware"), exports);
24
+ var last_mile_delivery_mutation_1 = require("./service/last-mile-delivery/last-mile-delivery-mutation");
25
+ Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
26
+ Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
23
27
  require("./routes");
28
+ process.on('bootstrap-module-start', async ({ app, config, client }) => { });
24
29
  //# 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,oBAAiB"}
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,wGAAiI;AAAxH,0IAAA,2BAA2B,OAAA;AAAC,yIAAA,0BAA0B,OAAA;AAE/D,oBAAiB;AAEjB,OAAO,CAAC,EAAE,CAAC,wBAA+B,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAO,EAAE,EAAE,GAAE,CAAC,CAAC,CAAA"}
package/dist-server/routers/ninjavan-public-router.js ADDED
@@ -0,0 +1,45 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.ninjavanPublicRouter = void 0;
7
+ const koa_router_1 = __importDefault(require("koa-router"));
8
+ const typeorm_1 = require("typeorm");
9
+ const last_mile_delivery_1 = require("../service/last-mile-delivery/last-mile-delivery");
10
+ const last_mile_delivery_mutation_1 = require("../service/last-mile-delivery/last-mile-delivery-mutation");
11
+ const biz_base_1 = require("@things-factory/biz-base");
12
+ const debug = require('debug')('things-factory:integration-lmd:ninjavan-public-router');
13
+ exports.ninjavanPublicRouter = new koa_router_1.default();
14
+ exports.ninjavanPublicRouter.get('/ninjavan-connect-callback', async (context, next) => {
15
+ const { code, state } = context.query;
16
+ // search lmd with domain relation
17
+ await (0, typeorm_1.getConnection)().transaction(async (tx) => {
18
+ const repository = tx.getRepository(last_mile_delivery_1.LastMileDelivery);
19
+ const lastMileDelivery = await repository
20
+ .createQueryBuilder('lastMileDelivery')
21
+ .leftJoinAndSelect('lastMileDelivery.domain', 'domain')
22
+ .where('lastMileDelivery.id =:id', { id: state })
23
+ .getOne();
24
+ const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
25
+ where: { domain: lastMileDelivery.domain },
26
+ relations: ['company']
27
+ });
28
+ const company = await tx.getRepository(biz_base_1.Company).findOne({
29
+ where: { id: bizplace.company.id },
30
+ relations: ['domain']
31
+ });
32
+ const whSubdomain = lastMileDelivery.domain.subdomain;
33
+ const domain = lastMileDelivery.domain;
34
+ context.state.domain = domain;
35
+ context.state.tx = tx;
36
+ const bizplaceId = bizplace.id;
37
+ const companySubdomain = company.domain.subdomain;
38
+ const result = await (0, last_mile_delivery_mutation_1.generateAccessTokenNinjavan)(state, code, context);
39
+ const whSubdomainUrl = `__context__={"headers":{"x-things-factory-domain":"${whSubdomain}"}}`;
40
+ const newUrl = encodeURIComponent(whSubdomainUrl);
41
+ const redirectUrl = `https://operatohub.com/domain/${companySubdomain}/lmd-home?status=${result ? 'SUCCESS' : 'FAILED'}`;
42
+ context.redirect(redirectUrl);
43
+ });
44
+ });
45
+ //# sourceMappingURL=ninjavan-public-router.js.map
package/dist-server/routers/ninjavan-public-router.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ninjavan-public-router.js","sourceRoot":"","sources":["../../server/routers/ninjavan-public-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAE/B,qCAAqE;AACrE,yFAAmF;AAEnF,2GAAuG;AACvG,uDAA4D;AAE5D,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,uDAAuD,CAAC,CAAA;AAE1E,QAAA,oBAAoB,GAAG,IAAI,oBAAM,EAAE,CAAA;AAEhD,4BAAoB,CAAC,GAAG,CAAC,4BAA4B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,EAAC,IAAI,EAAC,KAAK,EAAC,GAAG,OAAO,CAAC,KAAK,CAAA;IAElC,kCAAkC;IAClC,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,EAAiB,EAAE,EAAE;QAC5D,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,qCAAgB,CAAC,CAAA;QACrD,MAAM,gBAAgB,GAAG,MAAM,UAAU;aACtC,kBAAkB,CAAC,kBAAkB,CAAC;aACtC,iBAAiB,CAAC,yBAAyB,EAAE,QAAQ,CAAC;aACtD,KAAK,CAAC,0BAA0B,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC;aAChD,MAAM,EAAE,CAAA;QAEX,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;YAClE,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE;YAC1C,SAAS,EAAE,CAAC,SAAS,CAAC;SACvB,CAAC,CAAA;QAEF,MAAM,OAAO,GAAY,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;YAC/D,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,CAAC,OAAO,CAAC,EAAE,EAAE;YAClC,SAAS,EAAE,CAAC,QAAQ,CAAC;SACtB,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG,gBAAgB,CAAC,MAAM,CAAC,SAAS,CAAA;QACrD,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;QAEtC,OAAO,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAA;QAC7B,OAAO,CAAC,KAAK,CAAC,EAAE,GAAE,EAAE,CAAA;QAEpB,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAA;QAC9B,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAA;QAGjD,MAAM,MAAM,GAAG,MAAM,IAAA,yDAA2B,EAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;QAEtE,MAAM,cAAc,GAAE,sDAAsD,WAAW,KAAK,CAAA;QAC5F,MAAM,MAAM,GAAG,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAEjD,MAAM,WAAW,GAAG,iCAAiC,gBAAgB,oBAAoB,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACzH,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAEhC,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}
package/dist-server/routes.js CHANGED
@@ -1,11 +1,9 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ const ninjavan_public_router_1 = require("./routers/ninjavan-public-router");
1
4
  const debug = require('debug')('things-factory:integration-lmd:routes');
2
5
  process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
3
- /*
4
- * can add global public routes to application (auth not required, tenancy not required)
5
- *
6
- * ex) routes.get('/path', async(context, next) => {})
7
- * ex) routes.post('/path', async(context, next) => {})
8
- */
6
+ globalPublicRouter.use(ninjavan_public_router_1.ninjavanPublicRouter.routes(), ninjavan_public_router_1.ninjavanPublicRouter.allowedMethods());
9
7
  });
10
8
  process.on('bootstrap-module-global-private-route', (app, globalPrivateRouter) => {
11
9
  /*
@@ -18,8 +16,5 @@ process.on('bootstrap-module-domain-public-route', (app, domainPublicRouter) =>
18
16
  */
19
17
  });
20
18
  process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) => {
21
- /*
22
- * can add domain private routes to application (auth required, tenancy required)
23
- */
24
19
  });
25
20
  //# sourceMappingURL=routes.js.map
package/dist-server/routes.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"AAAA,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,uCAAuC,CAAC,CAAA;AAEvE,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA"}
1
+ {"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,6EAAuE;AAEvE,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,uCAAuC,CAAC,CAAA;AAEvE,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF,kBAAkB,CAAC,GAAG,CAAC,6CAAoB,CAAC,MAAM,EAAE,EAAE,6CAAoB,CAAC,cAAc,EAAE,CAAC,CAAA;AAC9F,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;AAExF,CAAC,CAAC,CAAA"}
package/dist-server/service/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.schema = exports.entities = void 0;
17
+ 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);
@@ -41,4 +41,7 @@ exports.schema = {
41
41
  ...courier_service_1.resolvers,
42
42
  ]
43
43
  };
44
+ var last_mile_delivery_mutation_1 = require("./last-mile-delivery/last-mile-delivery-mutation");
45
+ Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
46
+ Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
44
47
  //# sourceMappingURL=index.js.map
package/dist-server/service/index.js.map CHANGED
@@ -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"}
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,gGAAyH;AAAhH,0IAAA,2BAA2B,OAAA;AAAC,yIAAA,0BAA0B,OAAA"}
package/dist-server/service/last-mile-delivery/index.js CHANGED
@@ -1,9 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.resolvers = exports.entities = void 0;
3
+ 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");
7
7
  exports.entities = [last_mile_delivery_1.LastMileDelivery];
8
8
  exports.resolvers = [last_mile_delivery_query_1.LastMileDeliveryQuery, last_mile_delivery_mutation_1.LastMileDeliveryMutation];
9
+ var last_mile_delivery_mutation_2 = require("./last-mile-delivery-mutation");
10
+ Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.generateAccessTokenNinjavan; } });
11
+ Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.refreshAccessTokenNinjavan; } });
9
12
  //# sourceMappingURL=index.js.map
package/dist-server/service/last-mile-delivery/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/index.ts"],"names":[],"mappings":";;;AAAA,6DAAuD;AACvD,yEAAkE;AAClE,+EAAwE;AAE3D,QAAA,QAAQ,GAAG,CAAC,qCAAgB,CAAC,CAAA;AAC7B,QAAA,SAAS,GAAG,CAAC,gDAAqB,EAAE,sDAAwB,CAAC,CAAA"}
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,6EAAuG;AAA9F,0IAAA,2BAA2B,OAAA;AAAE,yIAAA,0BAA0B,OAAA"}
package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js CHANGED
@@ -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.LastMileDeliveryMutation = void 0;
15
+ 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");
@@ -162,38 +162,12 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
162
162
  await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDeliveries);
163
163
  return true;
164
164
  }
165
- async generateAccessTokenNinjavan(id, code, context) {
165
+ async getAccessTokenNinjavan(id, code, context) {
166
166
  const { tx } = context.state;
167
167
  let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
168
168
  where: { id }
169
169
  });
170
- try {
171
- const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
172
- const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
173
- const apiPath = '/1.0/oauth/token';
174
- const body = {
175
- client_id: lastMileDelivery.clientId,
176
- client_secret: lastMileDelivery.secretKey,
177
- grant_type: 'authorization_code',
178
- code
179
- };
180
- const response = await fetch(baseUrl + apiPath, {
181
- method: 'post',
182
- body: JSON.stringify(body)
183
- });
184
- const result = await response.json();
185
- if (response.status != 200) {
186
- throw new Error(result.error.message);
187
- }
188
- const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result;
189
- lastMileDelivery.accessToken = accessToken;
190
- lastMileDelivery.refreshToken = refreshToken;
191
- lastMileDelivery.expiresIn = experiesIn;
192
- await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
193
- }
194
- catch (e) {
195
- env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
196
- }
170
+ await generateAccessTokenNinjavan(id, code, context);
197
171
  return true;
198
172
  }
199
173
  async refreshAccessTokenNinjavan(id, context) {
@@ -201,33 +175,6 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
201
175
  let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
202
176
  where: { id }
203
177
  });
204
- try {
205
- const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
206
- const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
207
- const apiPath = '/1.0/oauth/token';
208
- const body = {
209
- client_id: lastMileDelivery.clientId,
210
- client_secret: lastMileDelivery.secretKey,
211
- grant_type: 'refresh_token',
212
- refresh_token: lastMileDelivery.refreshToken
213
- };
214
- const response = await fetch(baseUrl + apiPath, {
215
- method: 'post',
216
- body: JSON.stringify(body)
217
- });
218
- const result = await response.json();
219
- if (response.status != 200) {
220
- throw new Error(result.error.message);
221
- }
222
- const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result;
223
- lastMileDelivery.refreshToken = refreshToken;
224
- lastMileDelivery.expiresIn = experiesIn;
225
- lastMileDelivery.accessToken = accessToken;
226
- await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
227
- }
228
- catch (e) {
229
- env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
230
- }
231
178
  return true;
232
179
  }
233
180
  };
@@ -297,7 +244,7 @@ __decorate([
297
244
  __metadata("design:type", Function),
298
245
  __metadata("design:paramtypes", [String, String, Object]),
299
246
  __metadata("design:returntype", Promise)
300
- ], LastMileDeliveryMutation.prototype, "generateAccessTokenNinjavan", null);
247
+ ], LastMileDeliveryMutation.prototype, "getAccessTokenNinjavan", null);
301
248
  __decorate([
302
249
  (0, type_graphql_1.Directive)('@transaction'),
303
250
  (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for ninjavan' }),
@@ -311,4 +258,72 @@ LastMileDeliveryMutation = __decorate([
311
258
  (0, type_graphql_1.Resolver)(last_mile_delivery_1.LastMileDelivery)
312
259
  ], LastMileDeliveryMutation);
313
260
  exports.LastMileDeliveryMutation = LastMileDeliveryMutation;
261
+ async function generateAccessTokenNinjavan(id, code, context) {
262
+ const { tx } = context.state;
263
+ let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
264
+ where: { id },
265
+ });
266
+ try {
267
+ const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
268
+ const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
269
+ const apiPath = '/1.0/oauth/token';
270
+ const body = {
271
+ client_id: lastMileDelivery.clientId,
272
+ client_secret: lastMileDelivery.secretKey,
273
+ grant_type: 'authorization_code',
274
+ code
275
+ };
276
+ const response = await fetch(baseUrl + apiPath, {
277
+ method: 'post',
278
+ body: JSON.stringify(body)
279
+ });
280
+ const result = await response.json();
281
+ if (response.status != 200) {
282
+ throw new Error(result.error.message);
283
+ }
284
+ const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result;
285
+ const currentTimestamp = Math.floor(Date.now() / 1000);
286
+ const expiryTimestamp = currentTimestamp + expiresIn;
287
+ await tx.getRepository(last_mile_delivery_1.LastMileDelivery).update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
288
+ }
289
+ catch (e) {
290
+ env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
291
+ }
292
+ return true;
293
+ }
294
+ exports.generateAccessTokenNinjavan = generateAccessTokenNinjavan;
295
+ async function refreshAccessTokenNinjavan(id, code, context) {
296
+ const { tx } = context.state;
297
+ let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
298
+ where: { id },
299
+ });
300
+ try {
301
+ const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
302
+ const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
303
+ const apiPath = '/1.0/oauth/token';
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
+ const response = await fetch(baseUrl + apiPath, {
311
+ method: 'post',
312
+ body: JSON.stringify(body)
313
+ });
314
+ const result = await response.json();
315
+ if (response.status != 200) {
316
+ throw new Error(result.error.message);
317
+ }
318
+ const { refresh_token: refreshToken, expires_in: expiresIn, access_token: accessToken } = result;
319
+ const currentTimestamp = Math.floor(Date.now() / 1000);
320
+ const expiryTimestamp = currentTimestamp + expiresIn;
321
+ await tx.getRepository(last_mile_delivery_1.LastMileDelivery).update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
322
+ }
323
+ catch (e) {
324
+ env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
325
+ }
326
+ return true;
327
+ }
328
+ exports.refreshAccessTokenNinjavan = refreshAccessTokenNinjavan;
314
329
  //# sourceMappingURL=last-mile-delivery-mutation.js.map
package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js.map CHANGED
@@ -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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"}
package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js CHANGED
@@ -24,7 +24,7 @@ let LastMileDeliveryQuery = class LastMileDeliveryQuery {
24
24
  async lastMileDelivery(id, context) {
25
25
  const { domain, user, tx } = context.state;
26
26
  const result = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
27
- where: { domain, id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces', 'lastMileDeliveryBizplaces.bizplace']
27
+ where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces', 'lastMileDeliveryBizplaces.bizplace']
28
28
  });
29
29
  return result;
30
30
  }
package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"last-mile-delivery-query.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-query.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA8F;AAC9F,qCAAuC;AACvC,iDAA4E;AAC5E,yDAAgD;AAChD,6DAAuD;AAEvD,uEAAgE;AAKzD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAG1B,AAAN,KAAK,CAAC,gBAAgB,CAAY,EAAU,EAAS,OAAY;QAC/D,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAC1C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,qCAAgB,CAAC,CAAC,OAAO,CAAC;YAC9D,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,0BAA0B,EAAE,qCAAqC,EAAE,2BAA2B,EAAC,oCAAoC,CAAC;SACxK,CAAC,CAAA;QAEF,OAAO,MAAM,CAAA;IACf,CAAC;IAGK,AAAN,KAAK,CAAC,kBAAkB,CAAS,MAAiB,EAAS,OAAY;QACrE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAA;QAC5D,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,uBAAa,EAAC,qCAAgB,CAAC,CAAC,YAAY,iCAAK,eAAe,KAAE,SAAS,EAAE,CAAC,0BAA0B,CAAC,IAAE,CAAA;QAExI,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,MAAM,CAAS,gBAAkC;QACrD,OAAO,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAA;IACvE,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAS,gBAAkC;QACtD,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAS,gBAAkC;QACtD,OAAO,MAAM,IAAA,uBAAa,EAAC,gBAAI,CAAC,CAAC,OAAO,CAAC,gBAAgB,CAAC,SAAS,CAAC,CAAA;IACtE,CAAC;CACF,CAAA;AAjCO;IAFL,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,qCAAgB,EAAE,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC;IAC3D,WAAA,IAAA,kBAAG,EAAC,IAAI,CAAC,CAAA;IAAc,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;6DAOnD;AAGK;IADL,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,8CAAoB,EAAE,EAAE,WAAW,EAAE,sCAAsC,EAAE,CAAC;IACtE,WAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,WAAA,IAAA,kBAAG,GAAE,CAAA;;yDAAjB,iBAAS,oBAAT,iBAAS;;+DAOjD;AAGK;IADL,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IAChB,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAmB,qCAAgB;;mDAEtD;AAGK;IADL,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAmB,qCAAgB;;oDAEvD;AAGK;IADL,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,CAAC;IACb,WAAA,IAAA,mBAAI,GAAE,CAAA;;qCAAmB,qCAAgB;;oDAEvD;AAnCU,qBAAqB;IADjC,IAAA,uBAAQ,EAAC,qCAAgB,CAAC;GACd,qBAAqB,CAoCjC;AApCY,sDAAqB"}
1
+ {"version":3,"file":"last-mile-delivery-query.js","sourceRoot":"","sources":["../../../server/service/last-mile-delivery/last-mile-delivery-query.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.281",
3
+ "version": "4.3.284",
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": "188bb788d3bf0de2e9ae82ac0433e8f08b979bfc"
52
+ "gitHead": "a50c16ae136f288fc1a1bf02859b03c4bd82aaeb"
53
53
  }
package/server/controllers/lmd-middleware/apis/create-parcel.ts CHANGED
@@ -35,7 +35,8 @@ export function createParcel() {
35
35
  account_number: p?.accountNumber || '',
36
36
  token: p?.token || '',
37
37
  items: p?.items,
38
- staging: p?.staging ? p.staging : false
38
+ staging: p?.staging ? p.staging : false,
39
+ order_no: p?.orderNo || '',
39
40
  }
40
41
  })
41
42
  },
package/server/index.ts CHANGED
@@ -6,4 +6,8 @@ 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'
10
+
9
11
  import './routes'
12
+
13
+ process.on('bootstrap-module-start' as any, async ({ app, config, client }: any) => {})
package/server/routers/ninjavan-public-router.ts ADDED
@@ -0,0 +1,57 @@
1
+ import Router from 'koa-router'
2
+ import { getUrlFromContext,buildGqlContext } from '@things-factory/shell'
3
+ import { EntityManager, getConnection, getRepository } from 'typeorm'
4
+ import { LastMileDelivery } from '../service/last-mile-delivery/last-mile-delivery'
5
+ import { LastMileDeliveryBizplace } from '../service/last-mile-delivery-bizplace/last-mile-delivery-bizplace'
6
+ import { generateAccessTokenNinjavan } from '../service/last-mile-delivery/last-mile-delivery-mutation'
7
+ import { Bizplace, Company } from '@things-factory/biz-base'
8
+
9
+ const debug = require('debug')('things-factory:integration-lmd:ninjavan-public-router')
10
+
11
+ export const ninjavanPublicRouter = new Router()
12
+
13
+ ninjavanPublicRouter.get('/ninjavan-connect-callback', async (context, next) => {
14
+ const {code,state} = context.query
15
+
16
+ // search lmd with domain relation
17
+ await getConnection().transaction(async (tx: EntityManager) => {
18
+ const repository = tx.getRepository(LastMileDelivery)
19
+ const lastMileDelivery = await repository
20
+ .createQueryBuilder('lastMileDelivery')
21
+ .leftJoinAndSelect('lastMileDelivery.domain', 'domain')
22
+ .where('lastMileDelivery.id =:id', { id: state })
23
+ .getOne()
24
+
25
+ const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
26
+ where: { domain: lastMileDelivery.domain },
27
+ relations: ['company']
28
+ })
29
+
30
+ const company: Company = await tx.getRepository(Company).findOne({
31
+ where: { id: bizplace.company.id },
32
+ relations: ['domain']
33
+ })
34
+
35
+ const whSubdomain = lastMileDelivery.domain.subdomain
36
+ const domain = lastMileDelivery.domain
37
+
38
+ context.state.domain = domain
39
+ context.state.tx= tx
40
+
41
+ const bizplaceId = bizplace.id
42
+ const companySubdomain = company.domain.subdomain
43
+
44
+
45
+ const result = await generateAccessTokenNinjavan(state, code, context)
46
+
47
+ const whSubdomainUrl =`__context__={"headers":{"x-things-factory-domain":"${whSubdomain}"}}`
48
+ const newUrl = encodeURIComponent(whSubdomainUrl)
49
+
50
+ const redirectUrl = `https://operatohub.com/domain/${companySubdomain}/lmd-home?status=${result ? 'SUCCESS' : 'FAILED'}`;
51
+ context.redirect(redirectUrl);
52
+
53
+ })
54
+ })
55
+
56
+
57
+
package/server/routes.ts CHANGED
@@ -1,12 +1,9 @@
1
+ import { ninjavanPublicRouter } from "./routers/ninjavan-public-router"
2
+
1
3
  const debug = require('debug')('things-factory:integration-lmd:routes')
2
4
 
3
5
  process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
4
- /*
5
- * can add global public routes to application (auth not required, tenancy not required)
6
- *
7
- * ex) routes.get('/path', async(context, next) => {})
8
- * ex) routes.post('/path', async(context, next) => {})
9
- */
6
+ globalPublicRouter.use(ninjavanPublicRouter.routes(), ninjavanPublicRouter.allowedMethods())
10
7
  })
11
8
 
12
9
  process.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRouter) => {
@@ -22,7 +19,5 @@ process.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRout
22
19
  })
23
20
 
24
21
  process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
25
- /*
26
- * can add domain private routes to application (auth required, tenancy required)
27
- */
22
+
28
23
  })
package/server/service/index.ts CHANGED
@@ -28,3 +28,5 @@ export const schema = {
28
28
  ...CourierServiceResolvers,
29
29
  ]
30
30
  }
31
+
32
+ export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './last-mile-delivery/last-mile-delivery-mutation'
package/server/service/last-mile-delivery/index.ts CHANGED
@@ -1,6 +1,8 @@
1
1
  import { LastMileDelivery } from './last-mile-delivery'
2
2
  import { LastMileDeliveryQuery } from './last-mile-delivery-query'
3
- import { LastMileDeliveryMutation } from './last-mile-delivery-mutation'
3
+ import { LastMileDeliveryMutation, generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './last-mile-delivery-mutation'
4
4
 
5
5
  export const entities = [LastMileDelivery]
6
6
  export const resolvers = [LastMileDeliveryQuery, LastMileDeliveryMutation]
7
+
8
+ export { generateAccessTokenNinjavan, refreshAccessTokenNinjavan } from './last-mile-delivery-mutation'
package/server/service/last-mile-delivery/last-mile-delivery-mutation.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
2
- import { getRepository, In } 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,6 +9,7 @@ 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
+
12
13
  @Resolver(LastMileDelivery)
13
14
  export class LastMileDeliveryMutation {
14
15
  @Directive('@transaction')
@@ -140,6 +141,7 @@ export class LastMileDeliveryMutation {
140
141
  lmd = { ...lmd, lastMileDeliverySettings: lmdSetting, lastMileDeliveryBizplaces: lmdBizplace }
141
142
  }
142
143
 
144
+
143
145
  else {
144
146
  lmd = await lmdRepo.save({
145
147
  ...patch,
@@ -288,45 +290,16 @@ export class LastMileDeliveryMutation {
288
290
 
289
291
  @Directive('@transaction')
290
292
  @Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
291
- async generateAccessTokenNinjavan(@Arg('id', type => String) id: string, @Arg('code', type => String) code: string, @Ctx() context: any): Promise<boolean> {
293
+ async getAccessTokenNinjavan(@Arg('id', type => String) id: string, @Arg('code', type => String) code: string, @Ctx() context: any): Promise<boolean> {
292
294
  const { tx } = context.state
293
295
  let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
294
296
  where: { id }
295
297
  })
296
- try{
297
- const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
298
- const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
299
- const apiPath = '/1.0/oauth/token'
300
-
301
- const body = {
302
- client_id: lastMileDelivery.clientId,
303
- client_secret: lastMileDelivery.secretKey,
304
- grant_type: 'authorization_code',
305
- code
306
- }
307
-
308
- const response = await fetch(baseUrl + apiPath, {
309
- method: 'post',
310
- body: JSON.stringify(body)
311
- })
312
-
313
- const result = await response.json()
314
-
315
- if (response.status != 200) {
316
- throw new Error(result.error.message)
317
- }
318
-
319
- const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result
320
-
321
- lastMileDelivery.accessToken = accessToken
322
- lastMileDelivery.refreshToken = refreshToken
323
- lastMileDelivery.expiresIn = experiesIn
324
-
325
- await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
326
- } catch (e) {
327
- logger.error(`[auto_accessToken_log] ${e.message}`)
328
- }
329
- return true
298
+
299
+ await generateAccessTokenNinjavan(id,code,context)
300
+
301
+ return true
302
+
330
303
  }
331
304
 
332
305
  @Directive('@transaction')
@@ -336,40 +309,92 @@ export class LastMileDeliveryMutation {
336
309
  let lastMileDelivery : LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
337
310
  where: { id }
338
311
  })
339
- try{
340
- const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
341
- const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
342
- const apiPath = '/1.0/oauth/token'
343
-
344
- const body = {
345
- client_id: lastMileDelivery.clientId,
346
- client_secret: lastMileDelivery.secretKey,
347
- grant_type: 'refresh_token',
348
- refresh_token: lastMileDelivery.refreshToken
349
- }
312
+ return true
313
+ }
314
+ }
350
315
 
351
- const response = await fetch(baseUrl + apiPath, {
316
+
317
+ export async function generateAccessTokenNinjavan(id:string , code: string , context :any): Promise<boolean>{
318
+ const { tx } = context.state;
319
+ let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
320
+ where: { id },
321
+ })
322
+
323
+ try{
324
+ const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
325
+ const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
326
+ const apiPath = '/1.0/oauth/token'
327
+
328
+ const body = {
329
+ client_id: lastMileDelivery.clientId,
330
+ client_secret: lastMileDelivery.secretKey,
331
+ grant_type: 'authorization_code',
332
+ code
333
+ }
334
+
335
+ const response = await fetch(baseUrl + apiPath, {
352
336
  method: 'post',
353
337
  body: JSON.stringify(body)
354
- })
338
+ })
355
339
 
356
- const result = await response.json()
340
+ const result = await response.json()
357
341
 
358
- if (response.status != 200) {
342
+ if (response.status != 200) {
359
343
  throw new Error(result.error.message)
360
- }
344
+ }
361
345
 
362
- const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result
346
+ const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result
363
347
 
364
- lastMileDelivery.refreshToken = refreshToken
365
- lastMileDelivery.expiresIn = experiesIn
366
- lastMileDelivery.accessToken = accessToken
348
+ const currentTimestamp = Math.floor(Date.now() / 1000);
349
+ const expiryTimestamp = currentTimestamp + expiresIn;
367
350
 
368
- await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
369
- } catch (e) {
370
- logger.error(`[auto_refreshToken_log] ${e.message}`)
371
- }
351
+ await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
372
352
 
373
- return true
374
- }
353
+ } catch (e) {
354
+ logger.error(`[auto_accessToken_log] ${e.message}`)
355
+ }
356
+ return true
375
357
  }
358
+
359
+ export async function refreshAccessTokenNinjavan (id:string , code: string , context :any): Promise<boolean>{
360
+ const { tx } = context.state;
361
+ let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
362
+ where: { id },
363
+ })
364
+
365
+ try{
366
+ const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
367
+ const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
368
+ const apiPath = '/1.0/oauth/token'
369
+
370
+ const body = {
371
+ client_id: lastMileDelivery.clientId,
372
+ client_secret: lastMileDelivery.secretKey,
373
+ grant_type: 'refresh_token',
374
+ refresh_token: lastMileDelivery.refreshToken
375
+ }
376
+
377
+ const response = await fetch(baseUrl + apiPath, {
378
+ method: 'post',
379
+ body: JSON.stringify(body)
380
+ })
381
+
382
+ const result = await response.json()
383
+
384
+ if (response.status != 200) {
385
+ throw new Error(result.error.message)
386
+ }
387
+
388
+ const { refresh_token: refreshToken, expires_in: expiresIn, access_token: accessToken } = result
389
+
390
+ const currentTimestamp = Math.floor(Date.now() / 1000);
391
+ const expiryTimestamp = currentTimestamp + expiresIn;
392
+
393
+ await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
394
+
395
+ } catch (e) {
396
+ logger.error(`[auto_refreshToken_log] ${e.message}`)
397
+ }
398
+
399
+ return true
400
+ }
package/server/service/last-mile-delivery/last-mile-delivery-query.ts CHANGED
@@ -15,9 +15,8 @@ export class LastMileDeliveryQuery {
15
15
  async lastMileDelivery(@Arg('id') id: string, @Ctx() context: any): Promise<LastMileDelivery> {
16
16
  const { domain, user, tx } = context.state
17
17
  const result = await tx.getRepository(LastMileDelivery).findOne({
18
- where: { domain, id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces','lastMileDeliveryBizplaces.bizplace']
18
+ where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces','lastMileDeliveryBizplaces.bizplace']
19
19
  })
20
-
21
20
  return result
22
21
  }
23
22