@things-factory/integration-lmd 4.3.282 → 4.3.284

package/client/pages/integration-lmd-detail.js

@@ -365,8 +365,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
   async pageUpdated(changes, lifecycle) {
     if (changes.resourceId == 'new') this._data.id 
     try {
-      const urlParams = new URLSearchParams(location.href)
-      const code = urlParams.get('code')
 
       if (this.active) {
         this._clearView()
@@ -378,21 +376,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
       if (this?._data && !this._data?.rank) {
         this._data.rank = 0
       }
-
-      if (code) {
-        const response = await client.mutate({
-          mutation: gql`
-            mutation generateAccessTokenNinjavan($id: String!, $code: String!) {
-              generateAccessTokenNinjavan(id: $id, code: $code)
-            }
-          `,
-          variables: {
-            id: this._data.id,
-            code: code
-          },
-          context: gqlContext()
-        })
-      }
       this.updateContext()
     } catch (e) {
       this._showToast(e)
@@ -469,10 +452,12 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
   }
 
   _authenticate(e) {
-    location.href = this.getNinjavanAuthUrl()
+    let lmdId =this.___data.id
+    //location.href = `https://3ec2-118-101-69-107.ngrok-free.app/ninjavan-connect-callback?code=1234&state=${lmdId}`
+    location.href = this.getNinjavanAuthUrl(lmdId)
   }
 
-  getNinjavanAuthUrl() {
+  getNinjavanAuthUrl(lmdId) {
     const sandbox = this._data.staging ? '-sandbox' : ''
     const baseUrl = `https://dashboard${sandbox}.ninjavan.co/oauth/login`
     const client_id = this._data.clientId
@@ -486,7 +471,7 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
     const data = {
       client_id,
       scopes: scopes.join(' '),
-      state
+      state:lmdId
     }
 
     const qs = Object.entries(data)
@@ -495,7 +480,6 @@ class IntegrationLmdDetail extends localize(i18next)(PageView) {
 
     return `${baseUrl}?${qs}`
   }
-
   
   async _updateLastMileDelivery(e) {
     try {

package/dist-server/index.js

@@ -14,11 +14,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = void 0;
 __exportStar(require("./migrations"), exports);
 __exportStar(require("./service"), exports);
 __exportStar(require("./middlewares"), exports);
 __exportStar(require("./controllers/etrax"), exports);
 __exportStar(require("./controllers/lmd-api"), exports);
 __exportStar(require("./controllers/lmd-middleware"), exports);
+var last_mile_delivery_mutation_1 = require("./service/last-mile-delivery/last-mile-delivery-mutation");
+Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
+Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
 require("./routes");
+process.on('bootstrap-module-start', async ({ app, config, client }) => { });
 //# sourceMappingURL=index.js.map

package/dist-server/index.js.map

@@ -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"}
+{"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

@@ -0,0 +1,45 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ninjavanPublicRouter = void 0;
+const koa_router_1 = __importDefault(require("koa-router"));
+const typeorm_1 = require("typeorm");
+const last_mile_delivery_1 = require("../service/last-mile-delivery/last-mile-delivery");
+const last_mile_delivery_mutation_1 = require("../service/last-mile-delivery/last-mile-delivery-mutation");
+const biz_base_1 = require("@things-factory/biz-base");
+const debug = require('debug')('things-factory:integration-lmd:ninjavan-public-router');
+exports.ninjavanPublicRouter = new koa_router_1.default();
+exports.ninjavanPublicRouter.get('/ninjavan-connect-callback', async (context, next) => {
+    const { code, state } = context.query;
+    // search lmd with domain relation
+    await (0, typeorm_1.getConnection)().transaction(async (tx) => {
+        const repository = tx.getRepository(last_mile_delivery_1.LastMileDelivery);
+        const lastMileDelivery = await repository
+            .createQueryBuilder('lastMileDelivery')
+            .leftJoinAndSelect('lastMileDelivery.domain', 'domain')
+            .where('lastMileDelivery.id =:id', { id: state })
+            .getOne();
+        const bizplace = await tx.getRepository(biz_base_1.Bizplace).findOne({
+            where: { domain: lastMileDelivery.domain },
+            relations: ['company']
+        });
+        const company = await tx.getRepository(biz_base_1.Company).findOne({
+            where: { id: bizplace.company.id },
+            relations: ['domain']
+        });
+        const whSubdomain = lastMileDelivery.domain.subdomain;
+        const domain = lastMileDelivery.domain;
+        context.state.domain = domain;
+        context.state.tx = tx;
+        const bizplaceId = bizplace.id;
+        const companySubdomain = company.domain.subdomain;
+        const result = await (0, last_mile_delivery_mutation_1.generateAccessTokenNinjavan)(state, code, context);
+        const whSubdomainUrl = `__context__={"headers":{"x-things-factory-domain":"${whSubdomain}"}}`;
+        const newUrl = encodeURIComponent(whSubdomainUrl);
+        const redirectUrl = `https://operatohub.com/domain/${companySubdomain}/lmd-home?status=${result ? 'SUCCESS' : 'FAILED'}`;
+        context.redirect(redirectUrl);
+    });
+});
+//# sourceMappingURL=ninjavan-public-router.js.map

package/dist-server/routers/ninjavan-public-router.js.map

@@ -0,0 +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

@@ -1,11 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ninjavan_public_router_1 = require("./routers/ninjavan-public-router");
 const debug = require('debug')('things-factory:integration-lmd:routes');
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
-    /*
-     * can add global public routes to application (auth not required, tenancy not required)
-     *
-     * ex) routes.get('/path', async(context, next) => {})
-     * ex) routes.post('/path', async(context, next) => {})
-     */
+    globalPublicRouter.use(ninjavan_public_router_1.ninjavanPublicRouter.routes(), ninjavan_public_router_1.ninjavanPublicRouter.allowedMethods());
 });
 process.on('bootstrap-module-global-private-route', (app, globalPrivateRouter) => {
     /*
@@ -18,8 +16,5 @@ process.on('bootstrap-module-domain-public-route', (app, domainPublicRouter) =>
      */
 });
 process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) => {
-    /*
-     * can add domain private routes to application (auth required, tenancy required)
-     */
 });
 //# sourceMappingURL=routes.js.map

package/dist-server/routes.js.map

@@ -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"}
+{"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

@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.schema = exports.entities = void 0;
+exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.schema = exports.entities = void 0;
 /* EXPORT ENTITY TYPES */
 __exportStar(require("./last-mile-delivery-bizplace/last-mile-delivery-bizplace"), exports);
 __exportStar(require("./last-mile-delivery-setting/last-mile-delivery-setting"), exports);
@@ -41,4 +41,7 @@ exports.schema = {
         ...courier_service_1.resolvers,
     ]
 };
+var last_mile_delivery_mutation_1 = require("./last-mile-delivery/last-mile-delivery-mutation");
+Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.generateAccessTokenNinjavan; } });
+Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_1.refreshAccessTokenNinjavan; } });
 //# sourceMappingURL=index.js.map

package/dist-server/service/index.js.map

@@ -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"}
+{"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

@@ -1,9 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolvers = exports.entities = void 0;
+exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.resolvers = exports.entities = void 0;
 const last_mile_delivery_1 = require("./last-mile-delivery");
 const last_mile_delivery_query_1 = require("./last-mile-delivery-query");
 const last_mile_delivery_mutation_1 = require("./last-mile-delivery-mutation");
 exports.entities = [last_mile_delivery_1.LastMileDelivery];
 exports.resolvers = [last_mile_delivery_query_1.LastMileDeliveryQuery, last_mile_delivery_mutation_1.LastMileDeliveryMutation];
+var last_mile_delivery_mutation_2 = require("./last-mile-delivery-mutation");
+Object.defineProperty(exports, "generateAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.generateAccessTokenNinjavan; } });
+Object.defineProperty(exports, "refreshAccessTokenNinjavan", { enumerable: true, get: function () { return last_mile_delivery_mutation_2.refreshAccessTokenNinjavan; } });
 //# sourceMappingURL=index.js.map

package/dist-server/service/last-mile-delivery/index.js.map

@@ -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"}
+{"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

@@ -12,7 +12,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.LastMileDeliveryMutation = void 0;
+exports.refreshAccessTokenNinjavan = exports.generateAccessTokenNinjavan = exports.LastMileDeliveryMutation = void 0;
 const type_graphql_1 = require("type-graphql");
 const typeorm_1 = require("typeorm");
 const last_mile_delivery_1 = require("./last-mile-delivery");
@@ -162,38 +162,12 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
         await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDeliveries);
         return true;
     }
-    async generateAccessTokenNinjavan(id, code, context) {
+    async getAccessTokenNinjavan(id, code, context) {
         const { tx } = context.state;
         let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
             where: { id }
         });
-        try {
-            const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
-            const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
-            const apiPath = '/1.0/oauth/token';
-            const body = {
-                client_id: lastMileDelivery.clientId,
-                client_secret: lastMileDelivery.secretKey,
-                grant_type: 'authorization_code',
-                code
-            };
-            const response = await fetch(baseUrl + apiPath, {
-                method: 'post',
-                body: JSON.stringify(body)
-            });
-            const result = await response.json();
-            if (response.status != 200) {
-                throw new Error(result.error.message);
-            }
-            const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result;
-            lastMileDelivery.accessToken = accessToken;
-            lastMileDelivery.refreshToken = refreshToken;
-            lastMileDelivery.expiresIn = experiesIn;
-            await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
-        }
-        catch (e) {
-            env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
-        }
+        await generateAccessTokenNinjavan(id, code, context);
         return true;
     }
     async refreshAccessTokenNinjavan(id, context) {
@@ -201,33 +175,6 @@ let LastMileDeliveryMutation = class LastMileDeliveryMutation {
         let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
             where: { id }
         });
-        try {
-            const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
-            const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
-            const apiPath = '/1.0/oauth/token';
-            const body = {
-                client_id: lastMileDelivery.clientId,
-                client_secret: lastMileDelivery.secretKey,
-                grant_type: 'refresh_token',
-                refresh_token: lastMileDelivery.refreshToken
-            };
-            const response = await fetch(baseUrl + apiPath, {
-                method: 'post',
-                body: JSON.stringify(body)
-            });
-            const result = await response.json();
-            if (response.status != 200) {
-                throw new Error(result.error.message);
-            }
-            const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result;
-            lastMileDelivery.refreshToken = refreshToken;
-            lastMileDelivery.expiresIn = experiesIn;
-            lastMileDelivery.accessToken = accessToken;
-            await tx.getRepository(last_mile_delivery_1.LastMileDelivery).save(lastMileDelivery);
-        }
-        catch (e) {
-            env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
-        }
         return true;
     }
 };
@@ -297,7 +244,7 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, String, Object]),
     __metadata("design:returntype", Promise)
-], LastMileDeliveryMutation.prototype, "generateAccessTokenNinjavan", null);
+], LastMileDeliveryMutation.prototype, "getAccessTokenNinjavan", null);
 __decorate([
     (0, type_graphql_1.Directive)('@transaction'),
     (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To get access token for ninjavan' }),
@@ -311,4 +258,72 @@ LastMileDeliveryMutation = __decorate([
     (0, type_graphql_1.Resolver)(last_mile_delivery_1.LastMileDelivery)
 ], LastMileDeliveryMutation);
 exports.LastMileDeliveryMutation = LastMileDeliveryMutation;
+async function generateAccessTokenNinjavan(id, code, context) {
+    const { tx } = context.state;
+    let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
+        where: { id },
+    });
+    try {
+        const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
+        const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
+        const apiPath = '/1.0/oauth/token';
+        const body = {
+            client_id: lastMileDelivery.clientId,
+            client_secret: lastMileDelivery.secretKey,
+            grant_type: 'authorization_code',
+            code
+        };
+        const response = await fetch(baseUrl + apiPath, {
+            method: 'post',
+            body: JSON.stringify(body)
+        });
+        const result = await response.json();
+        if (response.status != 200) {
+            throw new Error(result.error.message);
+        }
+        const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result;
+        const currentTimestamp = Math.floor(Date.now() / 1000);
+        const expiryTimestamp = currentTimestamp + expiresIn;
+        await tx.getRepository(last_mile_delivery_1.LastMileDelivery).update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
+    }
+    catch (e) {
+        env_1.logger.error(`[auto_accessToken_log] ${e.message}`);
+    }
+    return true;
+}
+exports.generateAccessTokenNinjavan = generateAccessTokenNinjavan;
+async function refreshAccessTokenNinjavan(id, code, context) {
+    const { tx } = context.state;
+    let lastMileDelivery = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
+        where: { id },
+    });
+    try {
+        const sandbox = lastMileDelivery.staging ? '-sandbox' : ' ';
+        const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode;
+        const apiPath = '/1.0/oauth/token';
+        const body = {
+            client_id: lastMileDelivery.clientId,
+            client_secret: lastMileDelivery.secretKey,
+            grant_type: 'refresh_token',
+            refresh_token: lastMileDelivery.refreshToken
+        };
+        const response = await fetch(baseUrl + apiPath, {
+            method: 'post',
+            body: JSON.stringify(body)
+        });
+        const result = await response.json();
+        if (response.status != 200) {
+            throw new Error(result.error.message);
+        }
+        const { refresh_token: refreshToken, expires_in: expiresIn, access_token: accessToken } = result;
+        const currentTimestamp = Math.floor(Date.now() / 1000);
+        const expiryTimestamp = currentTimestamp + expiresIn;
+        await tx.getRepository(last_mile_delivery_1.LastMileDelivery).update({ id: lastMileDelivery.id }, { accessToken: accessToken, refreshToken: refreshToken, expiresIn: expiryTimestamp });
+    }
+    catch (e) {
+        env_1.logger.error(`[auto_refreshToken_log] ${e.message}`);
+    }
+    return true;
+}
+exports.refreshAccessTokenNinjavan = refreshAccessTokenNinjavan;
 //# sourceMappingURL=last-mile-delivery-mutation.js.map

package/dist-server/service/last-mile-delivery/last-mile-delivery-mutation.js.map

@@ -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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"}
+{"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

@@ -24,7 +24,7 @@ let LastMileDeliveryQuery = class LastMileDeliveryQuery {
     async lastMileDelivery(id, context) {
         const { domain, user, tx } = context.state;
         const result = await tx.getRepository(last_mile_delivery_1.LastMileDelivery).findOne({
-            where: { domain, id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces', 'lastMileDeliveryBizplaces.bizplace']
+            where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces', 'lastMileDeliveryBizplaces.bizplace']
         });
         return result;
     }

package/dist-server/service/last-mile-delivery/last-mile-delivery-query.js.map

@@ -1 +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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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-lmd",
-  "version": "4.3.282",
+  "version": "4.3.284",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -49,5 +49,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "dd44d1892e859eef74f2d5729a03a1cc49a8f806"
+  "gitHead": "a50c16ae136f288fc1a1bf02859b03c4bd82aaeb"
 }

package/server/index.ts

@@ -6,4 +6,8 @@ export * from './controllers/etrax'
 export * from './controllers/lmd-api'
 export * from './controllers/lmd-middleware'
 
+export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './service/last-mile-delivery/last-mile-delivery-mutation'
+
 import './routes'
+
+process.on('bootstrap-module-start' as any, async ({ app, config, client }: any) => {})

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

@@ -0,0 +1,57 @@
+import Router from 'koa-router'
+import { getUrlFromContext,buildGqlContext } from '@things-factory/shell'
+import { EntityManager, getConnection, getRepository } from 'typeorm'
+import { LastMileDelivery } from '../service/last-mile-delivery/last-mile-delivery'
+import { LastMileDeliveryBizplace } from '../service/last-mile-delivery-bizplace/last-mile-delivery-bizplace'
+import { generateAccessTokenNinjavan } from '../service/last-mile-delivery/last-mile-delivery-mutation'
+import { Bizplace, Company } from '@things-factory/biz-base'
+
+const debug = require('debug')('things-factory:integration-lmd:ninjavan-public-router')
+
+export const ninjavanPublicRouter = new Router()
+
+ninjavanPublicRouter.get('/ninjavan-connect-callback', async (context, next) => {
+  const {code,state} = context.query
+
+  // search lmd with domain relation
+  await getConnection().transaction(async (tx: EntityManager) => {
+    const repository = tx.getRepository(LastMileDelivery)
+    const lastMileDelivery = await repository
+      .createQueryBuilder('lastMileDelivery')
+      .leftJoinAndSelect('lastMileDelivery.domain', 'domain')
+      .where('lastMileDelivery.id =:id', { id: state })
+      .getOne()
+
+    const bizplace: Bizplace = await tx.getRepository(Bizplace).findOne({
+      where: { domain: lastMileDelivery.domain },
+      relations: ['company']
+    })
+
+    const company: Company = await tx.getRepository(Company).findOne({
+      where: { id: bizplace.company.id },
+      relations: ['domain']
+    })
+
+    const whSubdomain = lastMileDelivery.domain.subdomain
+    const domain = lastMileDelivery.domain
+
+    context.state.domain = domain
+    context.state.tx= tx
+
+    const bizplaceId = bizplace.id
+    const companySubdomain = company.domain.subdomain
+
+
+    const result = await generateAccessTokenNinjavan(state, code, context)
+
+    const whSubdomainUrl =`__context__={"headers":{"x-things-factory-domain":"${whSubdomain}"}}`
+    const newUrl = encodeURIComponent(whSubdomainUrl)
+
+    const redirectUrl = `https://operatohub.com/domain/${companySubdomain}/lmd-home?status=${result ? 'SUCCESS' : 'FAILED'}`;
+    context.redirect(redirectUrl);
+
+  })
+})
+
+
+

package/server/routes.ts

@@ -1,12 +1,9 @@
+import { ninjavanPublicRouter } from "./routers/ninjavan-public-router"
+
 const debug = require('debug')('things-factory:integration-lmd:routes')
 
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
-  /*
-   * can add global public routes to application (auth not required, tenancy not required)
-   *
-   * ex) routes.get('/path', async(context, next) => {})
-   * ex) routes.post('/path', async(context, next) => {})
-   */
+  globalPublicRouter.use(ninjavanPublicRouter.routes(), ninjavanPublicRouter.allowedMethods())
 })
 
 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
 })
 
 process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {
-  /*
-   * can add domain private routes to application (auth required, tenancy required)
-   */
+
 })

package/server/service/index.ts

@@ -28,3 +28,5 @@ export const schema = {
 		...CourierServiceResolvers,
   ] 
 }
+
+export { generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './last-mile-delivery/last-mile-delivery-mutation'

package/server/service/last-mile-delivery/index.ts

@@ -1,6 +1,8 @@
 import { LastMileDelivery } from './last-mile-delivery'
 import { LastMileDeliveryQuery } from './last-mile-delivery-query'
-import { LastMileDeliveryMutation } from './last-mile-delivery-mutation'
+import { LastMileDeliveryMutation, generateAccessTokenNinjavan,refreshAccessTokenNinjavan } from './last-mile-delivery-mutation'
 
 export const entities = [LastMileDelivery]
 export const resolvers = [LastMileDeliveryQuery, LastMileDeliveryMutation]
+
+export { generateAccessTokenNinjavan, refreshAccessTokenNinjavan } from './last-mile-delivery-mutation'

package/server/service/last-mile-delivery/last-mile-delivery-mutation.ts

@@ -1,5 +1,5 @@
 import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
-import { getRepository, In } from 'typeorm'
+import { getRepository, In, EntityManager,getManager,getConnection } from 'typeorm'
 import { LastMileDelivery } from './last-mile-delivery'
 import { NewLastMileDelivery, LastMileDeliveryPatch } from './last-mile-delivery-type'
 import { LMD_STATUS } from '../../constants'
@@ -9,6 +9,7 @@ import { LastMileDeliveryBizplace } from '../last-mile-delivery-bizplace/last-mi
 import { LastMileDeliveryBizplacePatch } from '../last-mile-delivery-bizplace/last-mile-delivery-bizplace-type'
 import { logger } from '@things-factory/env'
 
+
 @Resolver(LastMileDelivery)
 export class LastMileDeliveryMutation {
   @Directive('@transaction')
@@ -140,6 +141,7 @@ export class LastMileDeliveryMutation {
       lmd = { ...lmd, lastMileDeliverySettings: lmdSetting, lastMileDeliveryBizplaces: lmdBizplace }
     } 
     
+    
     else {
       lmd = await lmdRepo.save({
         ...patch,
@@ -288,45 +290,16 @@ export class LastMileDeliveryMutation {
 
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To get access token for ninjavan' })
-  async generateAccessTokenNinjavan(@Arg('id', type => String) id: string, @Arg('code', type => String) code: string, @Ctx() context: any): Promise<boolean> {
+  async getAccessTokenNinjavan(@Arg('id', type => String) id: string, @Arg('code', type => String) code: string, @Ctx() context: any): Promise<boolean> {
     const { tx } = context.state
     let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
       where: { id }
     })
-    try{
-       const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
-       const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
-       const apiPath = '/1.0/oauth/token'
-        
-       const body = {
-           client_id: lastMileDelivery.clientId,
-           client_secret: lastMileDelivery.secretKey,
-           grant_type: 'authorization_code',
-           code
-       }
-
-       const response = await fetch(baseUrl + apiPath, {
-           method: 'post',
-           body: JSON.stringify(body)
-       })
-
-       const result = await response.json()
-
-       if (response.status != 200) {
-           throw new Error(result.error.message)
-       }
-
-       const { access_token: accessToken, refresh_token: refreshToken, experies_in: experiesIn } = result
-
-       lastMileDelivery.accessToken = accessToken
-       lastMileDelivery.refreshToken = refreshToken
-       lastMileDelivery.expiresIn = experiesIn
-
-       await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
-      } catch (e) {
-          logger.error(`[auto_accessToken_log] ${e.message}`)
-      }
-      return true
+
+    await generateAccessTokenNinjavan(id,code,context)
+
+    return true
+   
   }
 
   @Directive('@transaction')
@@ -336,40 +309,92 @@ export class LastMileDeliveryMutation {
     let lastMileDelivery : LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
       where: { id }
     })
-    try{
-      const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
-      const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
-      const apiPath = '/1.0/oauth/token'
-
-      const body = {
-      client_id: lastMileDelivery.clientId,
-      client_secret: lastMileDelivery.secretKey,
-      grant_type: 'refresh_token',
-      refresh_token: lastMileDelivery.refreshToken
-      }
+    return true
+  }
+}
 
-      const response = await fetch(baseUrl + apiPath, {
+
+export async function generateAccessTokenNinjavan(id:string , code: string , context :any): Promise<boolean>{
+  const { tx } = context.state;
+  let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+    where: { id },
+  })
+
+  try{
+    const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
+    const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
+    const apiPath = '/1.0/oauth/token'
+     
+    const body = {
+        client_id: lastMileDelivery.clientId,
+        client_secret: lastMileDelivery.secretKey,
+        grant_type: 'authorization_code',
+        code
+    }
+
+    const response = await fetch(baseUrl + apiPath, {
         method: 'post',
         body: JSON.stringify(body)
-      })
+    })
 
-      const result = await response.json()
+    const result = await response.json()
 
-      if (response.status != 200) {
+    if (response.status != 200) {
         throw new Error(result.error.message)
-      }
+    }
 
-      const { refresh_token: refreshToken, expries: experiesIn, access_token: accessToken } = result
+    const { access_token: accessToken, refresh_token: refreshToken, expires_in: expiresIn } = result
 
-      lastMileDelivery.refreshToken = refreshToken
-      lastMileDelivery.expiresIn = experiesIn
-      lastMileDelivery.accessToken = accessToken
+    const currentTimestamp = Math.floor(Date.now() / 1000);
+    const expiryTimestamp = currentTimestamp + expiresIn;
 
-      await tx.getRepository(LastMileDelivery).save(lastMileDelivery)
-    } catch (e) {
-      logger.error(`[auto_refreshToken_log] ${e.message}`)
-    }    
+    await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
     
-    return true
-  }
+   } catch (e) {
+       logger.error(`[auto_accessToken_log] ${e.message}`)
+   }
+   return true
 }
+
+export async function refreshAccessTokenNinjavan (id:string , code: string , context :any): Promise<boolean>{
+  const { tx } = context.state;
+  let lastMileDelivery: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+    where: { id },
+  })
+
+  try{
+    const sandbox = lastMileDelivery.staging? '-sandbox' : ' '
+    const baseUrl = `https://aaa${sandbox}.ninjavan.co/` + lastMileDelivery.countryCode
+    const apiPath = '/1.0/oauth/token'
+
+    const body = {
+    client_id: lastMileDelivery.clientId,
+    client_secret: lastMileDelivery.secretKey,
+    grant_type: 'refresh_token',
+    refresh_token: lastMileDelivery.refreshToken
+    }
+
+    const response = await fetch(baseUrl + apiPath, {
+      method: 'post',
+      body: JSON.stringify(body)
+    })
+
+    const result = await response.json()
+
+    if (response.status != 200) {
+      throw new Error(result.error.message)
+    }
+
+    const { refresh_token: refreshToken, expires_in: expiresIn, access_token: accessToken } = result
+
+    const currentTimestamp = Math.floor(Date.now() / 1000);
+    const expiryTimestamp = currentTimestamp + expiresIn;
+
+    await tx.getRepository(LastMileDelivery).update({id : lastMileDelivery.id}, {accessToken:accessToken, refreshToken:refreshToken, expiresIn:expiryTimestamp})
+    
+  } catch (e) {
+    logger.error(`[auto_refreshToken_log] ${e.message}`)
+  }    
+  
+  return true
+}

package/server/service/last-mile-delivery/last-mile-delivery-query.ts

@@ -15,9 +15,8 @@ export class LastMileDeliveryQuery {
   async lastMileDelivery(@Arg('id') id: string, @Ctx() context: any): Promise<LastMileDelivery> {
     const { domain, user, tx } = context.state
     const result = await tx.getRepository(LastMileDelivery).findOne({
-      where: { domain, id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces','lastMileDeliveryBizplaces.bizplace']
+      where: { id }, relations: ['lastMileDeliverySettings', 'lastMileDeliverySettings.geoCountry', 'lastMileDeliveryBizplaces','lastMileDeliveryBizplaces.bizplace']
     })
-
     return result
   }