@things-factory/integration-fulfillment 4.0.21 → 4.0.25

package/client/pages/fulfillment-center-operato.js

@@ -1,8 +1,11 @@
-import { html, css } from 'lit-element'
 import gql from 'graphql-tag'
+import { css, html } from 'lit-element'
 import { connect } from 'pwa-helpers/connect-mixin.js'
-import { client, store, PageView } from '@things-factory/shell'
+
+import { client, PageView, store } from '@things-factory/shell'
+
 import LOGO from '../../assets/images/operato-logo.jpeg'
+
 class FulfillmentCenterOperato extends connect(store)(PageView) {
   static get styles() {
     return css`
@@ -140,11 +143,12 @@ class FulfillmentCenterOperato extends connect(store)(PageView) {
       <div>
         ${status == 'active'
           ? html`<mwc-button
-              @click=${e => this.deactivate(name)}
-              raised
-              danger
-              label="disconnect this center"
-            ></mwc-button>`
+                @click=${e => this.deactivate(name)}
+                raised
+                danger
+                label="disconnect this center"
+              ></mwc-button>
+              <mwc-button @click=${e => this.refreshToken()} raised label="refresh token"></mwc-button>`
           : html`<mwc-button @click=${e => this.activate(name)} raised label="connect this center"></mwc-button>`}
       </div>
     `
@@ -277,6 +281,41 @@ class FulfillmentCenterOperato extends connect(store)(PageView) {
       })
     )
   }
+
+  async refreshToken() {
+    const { name } = this.fulfillmentCenter
+
+    var response = await client.mutate({
+      mutation: gql`
+        mutation refreshOperatoAccessToken($id: String!) {
+          refreshOperatoAccessToken(id: $id) {
+            name
+            platform
+            centerId
+            countryCode
+            accessInfo
+            status
+          }
+        }
+      `,
+      variables: {
+        id: this.id
+      }
+    })
+
+    if (!response.errors) {
+      this.fulfillmentCenter = response.data.refreshOperatoAccessToken
+    }
+
+    document.dispatchEvent(
+      new CustomEvent('notify', {
+        detail: {
+          level: 'info',
+          message: `${response.errors ? 'fail' : 'success'} to refresh : ${name}`
+        }
+      })
+    )
+  }
 }
 
 customElements.define('fulfillment-center-operato', FulfillmentCenterOperato)

package/dist-server/controllers/operato/operato.js

@@ -7,6 +7,9 @@ exports.Operato = void 0;
 const debug_1 = __importDefault(require("debug"));
 const node_fetch_1 = __importDefault(require("node-fetch"));
 const env_1 = require("@things-factory/env");
+const utils_1 = require("@things-factory/utils");
+const typeorm_1 = require("typeorm");
+const entities_1 = require("../../entities");
 const { protocol = 'https', host, callback } = env_1.config.get('fulfillmentIntegrationOperato', {});
 const debug = (0, debug_1.default)('things-factory:integration-fulfillment:operato');
 class Operato {
@@ -55,9 +58,38 @@ class Operato {
         else {
             const text = await response.text();
             debug('response result', text);
-            throw new Error(`response code - ${response.status}, ${text}`);
+            throw response;
         }
     }
+    static async refreshAccessToken(fulfillmentCenter) {
+        const requestBody = {
+            refreshToken: fulfillmentCenter.refreshToken
+        };
+        const refreshResponse = await (0, node_fetch_1.default)(`${protocol}://${host}/oauth/refresh-token`, {
+            method: 'post',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(requestBody)
+        });
+        if (!refreshResponse.ok) {
+            throw new Error(`get operato information failed: ${await refreshResponse.text()}`);
+        }
+        const body = await refreshResponse.json();
+        const { accessToken /* token used to call the API */, id_token /* token containing user identity details (only returned if OpenID Connect scopes are requested) */, expires_in /* amount of seconds until the access token expires */, token_type: tokenType /* must be Bearer */, refreshToken
+        /* token used to refresh the access token once it has expired (only returned if the offline_access scope is requested).
+         */
+         } = body;
+        const { exp } = (0, utils_1.parseJwt)(accessToken);
+        var patch = {
+            accessToken,
+            refreshToken,
+            tokenType,
+            expiresIn: new Date(exp * 1000)
+        };
+        const repository = (0, typeorm_1.getRepository)(entities_1.FulfillmentCenter);
+        return await repository.save(Object.assign(Object.assign({}, fulfillmentCenter), patch));
+    }
 }
 exports.Operato = Operato;
 //# sourceMappingURL=operato.js.map

package/dist-server/controllers/operato/operato.js.map

@@ -1 +1 @@
-{"version":3,"file":"operato.js","sourceRoot":"","sources":["../../../server/controllers/operato/operato.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,4DAA8B;AAE9B,6CAA4C;AAE5C,MAAM,EAAE,QAAQ,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AAE9F,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,gDAAgD,CAAC,CAAA;AAUrE,MAAa,OAAO;IAGlB,YAAY,MAAqB;QAC/B,IAAI,CAAC,MAAM,qBACN,MAAM,CACV,CAAA;IACH,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,4BAA4B;QAC5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC3C,sJAAsJ;QACtJ,OAAO,GAAG,QAAQ,MAAM,IAAI,iDAAiD,MAAM,iCAAiC,WAAW,UAAU,KAAK,EAAE,CAAA;IAClJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAW,EAAE,IAAY,EAAE,IAAS;QAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QACxE,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,WAAW;gBACpC,yBAAyB,EAAE,MAAM,CAAC,QAAQ;aAC3C;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QACpC,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;QAEhC,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAW,EAAE,IAAY,EAAE,OAAY,EAAE;QAClD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,IAAI,OAAO,IAAI,EAAE,CAAA;QAEnD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,WAAW;gBACpC,yBAAyB,EAAE,MAAM,CAAC,QAAQ;aAC3C;YACD,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;aAAM;YACL,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YAClC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;YAC9B,MAAM,IAAI,KAAK,CAAC,mBAAmB,QAAQ,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC,CAAA;SAC/D;IACH,CAAC;CACF;AA/DD,0BA+DC"}
+{"version":3,"file":"operato.js","sourceRoot":"","sources":["../../../server/controllers/operato/operato.ts"],"names":[],"mappings":";;;;;;AAAA,kDAAyB;AACzB,4DAA8B;AAE9B,6CAA4C;AAC5C,iDAAgD;AAChD,qCAAuC;AACvC,6CAAkD;AAElD,MAAM,EAAE,QAAQ,GAAG,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AAE9F,MAAM,KAAK,GAAG,IAAA,eAAK,EAAC,gDAAgD,CAAC,CAAA;AAUrE,MAAa,OAAO;IAGlB,YAAY,MAAqB;QAC/B,IAAI,CAAC,MAAM,qBACN,MAAM,CACV,CAAA;IACH,CAAC;IAED,YAAY,CAAC,KAAK;QAChB,4BAA4B;QAC5B,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC,MAAM,CAAA;QAC3C,sJAAsJ;QACtJ,OAAO,GAAG,QAAQ,MAAM,IAAI,iDAAiD,MAAM,iCAAiC,WAAW,UAAU,KAAK,EAAE,CAAA;IAClJ,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,MAAW,EAAE,IAAY,EAAE,IAAS;QAC5C,MAAM,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;aAC5B,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;aACxD,IAAI,CAAC,GAAG,CAAC,CAAA;QAEZ,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,IAAI,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAA;QACxE,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAE3B,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,WAAW;gBACpC,yBAAyB,EAAE,MAAM,CAAC,QAAQ;aAC3C;SACF,CAAC,CAAA;QAEF,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;QACpC,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAA;QAEhC,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,MAAW,EAAE,IAAY,EAAE,OAAY,EAAE;QAClD,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAEnB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAA;QAErC,MAAM,QAAQ,GAAG,GAAG,QAAQ,MAAM,IAAI,OAAO,IAAI,EAAE,CAAA;QAEnD,MAAM,QAAQ,GAAG,MAAM,IAAA,oBAAK,EAAC,QAAQ,EAAE;YACrC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;gBAClC,gBAAgB,EAAE,MAAM,CAAC,WAAW;gBACpC,yBAAyB,EAAE,MAAM,CAAC,QAAQ;aAC3C;YACD,IAAI,EAAE,QAAQ;SACf,CAAC,CAAA;QAEF,IAAI,QAAQ,CAAC,EAAE,EAAE;YACf,OAAO,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;SAC7B;aAAM;YACL,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YAClC,KAAK,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;YAC9B,MAAM,QAAQ,CAAA;SACf;IACH,CAAC;IAEM,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,iBAAiB;QACtD,MAAM,WAAW,GAAG;YAClB,YAAY,EAAE,iBAAiB,CAAC,YAAY;SAC7C,CAAA;QAED,MAAM,eAAe,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,QAAQ,MAAM,IAAI,sBAAsB,EAAE;YAC/E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SAClC,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;SACnF;QAED,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,CAAA;QACzC,MAAM,EACJ,WAAW,CAAC,gCAAgC,EAC5C,QAAQ,CAAC,mGAAmG,EAC5G,UAAU,CAAC,sDAAsD,EACjE,UAAU,EAAE,SAAS,CAAC,oBAAoB,EAC1C,YAAY;QACZ;WACG;UACJ,GAAG,IAAI,CAAA;QAER,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAQ,EAAC,WAAW,CAAC,CAAA;QAErC,IAAI,KAAK,GAAG;YACV,WAAW;YACX,YAAY;YACZ,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;SAChC,CAAA;QAED,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;QAEnD,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,iBAAiB,GACjB,KAAK,EACR,CAAA;IACJ,CAAC;CACF;AA5GD,0BA4GC"}

package/dist-server/controllers/operato/platform-action.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.action = void 0;
+exports.action = exports._action = void 0;
 const operato_1 = require("./operato");
 const env_1 = require("@things-factory/env");
 const operatoConfig = env_1.config.get('fulfillmentIntegrationOperato', {});
@@ -19,7 +19,7 @@ function substitute(path, obj) {
     });
     return result;
 }
-const action = async ({ center, method = 'get', path, request }) => {
+const _action = async ({ center, method = 'get', path, request }) => {
     const client = new operato_1.Operato({
         center: center.centerId,
         appKey,
@@ -28,11 +28,22 @@ const action = async ({ center, method = 'get', path, request }) => {
     });
     const { resource = {}, payload = {} } = request;
     path = substitute(path, resource);
-    var response = await client[method](center, path, payload);
-    if (response.errors) {
-        throw response;
+    return await client[method](center, path, payload);
+};
+exports._action = _action;
+const action = async ({ center, method = 'get', path, request }) => {
+    try {
+        return await (0, exports._action)({ center, method, path, request });
+    }
+    catch (ex) {
+        if (ex.status === 401) {
+            var refreshed = await operato_1.Operato.refreshAccessToken(center);
+            return await (0, exports._action)({ center: refreshed, method, path, request });
+        }
+        else {
+            throw ex;
+        }
     }
-    return response;
 };
 exports.action = action;
 //# sourceMappingURL=platform-action.js.map

package/dist-server/controllers/operato/platform-action.js.map

@@ -1 +1 @@
-{"version":3,"file":"platform-action.js","sourceRoot":"","sources":["../../../server/controllers/operato/platform-action.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,6CAA4C;AAC5C,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AACrE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAA;AAE3C,SAAS,UAAU,CAAC,IAAI,EAAE,GAAG;IAC3B,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,EAAE,GAAG,YAAY,CAAA;IACrB,IAAI,IAAI,CAAA;IAER,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;QAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;KACpB;IAED,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC;AAEM,MAAM,MAAM,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;IACxE,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC,QAAQ;QACvB,MAAM;QACN,SAAS;QACT,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC,CAAA;IAEF,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAE/C,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAEjC,IAAI,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAC1D,IAAI,QAAQ,CAAC,MAAM,EAAE;QACnB,MAAM,QAAQ,CAAA;KACf;IAED,OAAO,QAAQ,CAAA;AACjB,CAAC,CAAA;AAlBY,QAAA,MAAM,UAkBlB"}
+{"version":3,"file":"platform-action.js","sourceRoot":"","sources":["../../../server/controllers/operato/platform-action.ts"],"names":[],"mappings":";;;AAAA,uCAAmC;AAEnC,6CAA4C;AAC5C,MAAM,aAAa,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AACrE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,aAAa,CAAA;AAE3C,SAAS,UAAU,CAAC,IAAI,EAAE,GAAG;IAC3B,IAAI,KAAK,GAAG,EAAE,CAAA;IACd,IAAI,EAAE,GAAG,YAAY,CAAA;IACrB,IAAI,IAAI,CAAA;IAER,OAAO,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE;QAC7B,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;KACpB;IAED,IAAI,MAAM,GAAG,IAAI,CAAA;IACjB,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACnB,IAAI,KAAK,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAC5B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,GAAG,EAAE,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACxE,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC;AAEM,MAAM,OAAO,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;IACzE,MAAM,MAAM,GAAG,IAAI,iBAAO,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC,QAAQ;QACvB,MAAM;QACN,SAAS;QACT,WAAW,EAAE,MAAM,CAAC,WAAW;KAChC,CAAC,CAAA;IAEF,MAAM,EAAE,QAAQ,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,GAAG,OAAO,CAAA;IAE/C,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAEjC,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AACpD,CAAC,CAAA;AAbY,QAAA,OAAO,WAanB;AAEM,MAAM,MAAM,GAAG,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;IACxE,IAAI;QACF,OAAO,MAAM,IAAA,eAAO,EAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;KACxD;IAAC,OAAO,EAAE,EAAE;QACX,IAAI,EAAE,CAAC,MAAM,KAAK,GAAG,EAAE;YACrB,IAAI,SAAS,GAAG,MAAM,iBAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAA;YACxD,OAAO,MAAM,IAAA,eAAO,EAAC,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;SACnE;aAAM;YACL,MAAM,EAAE,CAAA;SACT;KACF;AACH,CAAC,CAAA;AAXY,QAAA,MAAM,UAWlB"}

package/dist-server/graphql/resolvers/fulfillment-center/operato/index.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mutation = exports.Query = void 0;
-const get_operato_auth_url_1 = require("./get-operato-auth-url");
 const deactivate_operato_center_1 = require("./deactivate-operato-center");
 const generate_operato_access_token_1 = require("./generate-operato-access-token");
+const get_operato_auth_url_1 = require("./get-operato-auth-url");
+const refresh_operato_access_token_1 = require("./refresh-operato-access-token");
 exports.Query = Object.assign({}, get_operato_auth_url_1.getOperatoAuthURL);
-exports.Mutation = Object.assign(Object.assign({}, generate_operato_access_token_1.generateOperatoAccessToken), deactivate_operato_center_1.deactivateOperatoCenter);
+exports.Mutation = Object.assign(Object.assign(Object.assign({}, generate_operato_access_token_1.generateOperatoAccessToken), deactivate_operato_center_1.deactivateOperatoCenter), refresh_operato_access_token_1.refreshOperatoAccessToken);
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/resolvers/fulfillment-center/operato/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/fulfillment-center/operato/index.ts"],"names":[],"mappings":";;;AAAA,iEAA0D;AAE1D,2EAAqE;AACrE,mFAA4E;AAE/D,QAAA,KAAK,qBACb,wCAAiB,EACrB;AAEY,QAAA,QAAQ,mCAChB,0DAA0B,GAC1B,mDAAuB,EAC3B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/fulfillment-center/operato/index.ts"],"names":[],"mappings":";;;AAAA,2EAAqE;AACrE,mFAA4E;AAC5E,iEAA0D;AAC1D,iFAA0E;AAE7D,QAAA,KAAK,qBACb,wCAAiB,EACrB;AAEY,QAAA,QAAQ,iDAChB,0DAA0B,GAC1B,mDAAuB,GACvB,wDAAyB,EAC7B"}

package/dist-server/graphql/resolvers/fulfillment-center/operato/refresh-operato-access-token.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.refreshOperatoAccessToken = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const typeorm_1 = require("typeorm");
+const env_1 = require("@things-factory/env");
+const utils_1 = require("@things-factory/utils");
+const entities_1 = require("../../../../entities");
+const { protocol = 'https', host, appKey, appSecret } = env_1.config.get('fulfillmentIntegrationOperato', {});
+const debug = require('debug')('things-factory:integration-fulfillment:refresh-operato-access-token');
+exports.refreshOperatoAccessToken = {
+    async refreshOperatoAccessToken(_, { id }, context) {
+        const repository = (0, typeorm_1.getRepository)(entities_1.FulfillmentCenter);
+        const fulfillmentCenter = await repository.findOne({
+            where: { domain: context.state.domain, id }
+        });
+        const requestBody = {
+            refreshToken: fulfillmentCenter.refreshToken
+        };
+        const refreshResponse = await (0, node_fetch_1.default)(`${protocol}://${host}/oauth/refresh-token`, {
+            method: 'post',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body: JSON.stringify(requestBody)
+        });
+        if (!refreshResponse.ok) {
+            throw new Error(`get operato information failed: ${await refreshResponse.text()}`);
+        }
+        const body = await refreshResponse.json();
+        const { accessToken /* token used to call the API */, id_token /* token containing user identity details (only returned if OpenID Connect scopes are requested) */, expires_in /* amount of seconds until the access token expires */, token_type: tokenType /* must be Bearer */, refreshToken
+        /* token used to refresh the access token once it has expired (only returned if the offline_access scope is requested).
+         */
+         } = body;
+        const { exp } = (0, utils_1.parseJwt)(accessToken);
+        var patch = {
+            accessToken,
+            refreshToken,
+            tokenType,
+            expiresIn: new Date(exp * 1000)
+        };
+        return await repository.save(Object.assign(Object.assign(Object.assign({}, fulfillmentCenter), patch), { updater: context.state.user }));
+    }
+};
+//# sourceMappingURL=refresh-operato-access-token.js.map

package/dist-server/graphql/resolvers/fulfillment-center/operato/refresh-operato-access-token.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"refresh-operato-access-token.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/fulfillment-center/operato/refresh-operato-access-token.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA8B;AAC9B,qCAAuC;AAEvC,6CAA4C;AAC5C,iDAAgD;AAEhD,mDAAwD;AAExD,MAAM,EAAE,QAAQ,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,YAAM,CAAC,GAAG,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAA;AAEvG,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,qEAAqE,CAAC,CAAA;AAExF,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,EAAE,EAAE,EAAE,EAAE,OAAY;QAC1D,MAAM,UAAU,GAAG,IAAA,uBAAa,EAAC,4BAAiB,CAAC,CAAA;QACnD,MAAM,iBAAiB,GAAQ,MAAM,UAAU,CAAC,OAAO,CAAC;YACtD,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE;SAC5C,CAAC,CAAA;QAEF,MAAM,WAAW,GAAG;YAClB,YAAY,EAAE,iBAAiB,CAAC,YAAY;SAC7C,CAAA;QAED,MAAM,eAAe,GAAG,MAAM,IAAA,oBAAK,EAAC,GAAG,QAAQ,MAAM,IAAI,sBAAsB,EAAE;YAC/E,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;SAClC,CAAC,CAAA;QAEF,IAAI,CAAC,eAAe,CAAC,EAAE,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,mCAAmC,MAAM,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;SACnF;QAED,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,CAAA;QACzC,MAAM,EACJ,WAAW,CAAC,gCAAgC,EAC5C,QAAQ,CAAC,mGAAmG,EAC5G,UAAU,CAAC,sDAAsD,EACjE,UAAU,EAAE,SAAS,CAAC,oBAAoB,EAC1C,YAAY;QACZ;WACG;UACJ,GAAG,IAAI,CAAA;QAER,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,gBAAQ,EAAC,WAAW,CAAC,CAAA;QAErC,IAAI,KAAK,GAAG;YACV,WAAW;YACX,YAAY;YACZ,SAAS;YACT,SAAS,EAAE,IAAI,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;SAChC,CAAA;QAED,OAAO,MAAM,UAAU,CAAC,IAAI,+CACvB,iBAAiB,GACjB,KAAK,KACR,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,IAC3B,CAAA;IACJ,CAAC;CACF,CAAA"}

package/dist-server/graphql/types/fulfillment-center/index.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Types = exports.Query = exports.Mutation = void 0;
 const fulfillment_center_1 = require("./fulfillment-center");
-const new_fulfillment_center_1 = require("./new-fulfillment-center");
-const fulfillment_center_patch_1 = require("./fulfillment-center-patch");
 const fulfillment_center_list_1 = require("./fulfillment-center-list");
+const fulfillment_center_patch_1 = require("./fulfillment-center-patch");
+const new_fulfillment_center_1 = require("./new-fulfillment-center");
 exports.Mutation = `
   createFulfillmentCenter (
     fulfillmentCenter: NewFulfillmentCenter!
@@ -35,6 +35,10 @@ exports.Mutation = `
   deactivateOperatoCenter (
     name: String!
   ): FulfillmentCenter @transaction
+
+  refreshOperatoAccessToken (
+    id: String!
+  ): FulfillmentCenter
 `;
 exports.Query = `
   fulfillmentCenters(filters: [Filter], pagination: Pagination, sortings: [Sorting]): FulfillmentCenterList

package/dist-server/graphql/types/fulfillment-center/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/fulfillment-center/index.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AACxD,qEAA+D;AAC/D,yEAAmE;AACnE,uEAAiE;AAEpD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;CAQlC,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,sCAAiB,EAAE,6CAAoB,EAAE,iDAAsB,EAAE,+CAAqB,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/fulfillment-center/index.ts"],"names":[],"mappings":";;;AAAA,6DAAwD;AACxD,uEAAiE;AACjE,yEAAmE;AACnE,qEAA+D;AAElD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;CAQlC,CAAA;AAEY,QAAA,KAAK,GAAG,CAAC,sCAAiB,EAAE,6CAAoB,EAAE,iDAAsB,EAAE,+CAAqB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-fulfillment",
-  "version": "4.0.21",
+  "version": "4.0.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -25,17 +25,17 @@
     "test": "DEBUG=things-factory:* NODE_ENV=development npx mocha -r ts-node/register ./test/**/*spec.ts"
   },
   "dependencies": {
-    "@things-factory/apptool-ui": "^4.0.21",
-    "@things-factory/auth-ui": "^4.0.21",
-    "@things-factory/biz-base": "^4.0.21",
-    "@things-factory/context-ui": "^4.0.21",
-    "@things-factory/grist-ui": "^4.0.21",
-    "@things-factory/i18n-ui": "^4.0.21",
-    "@things-factory/integration-ui": "^4.0.21",
-    "@things-factory/more-ui": "^4.0.21",
-    "@things-factory/resource-ui": "^4.0.21",
-    "@things-factory/setting-ui": "^4.0.21",
-    "@things-factory/system-ui": "^4.0.21",
+    "@things-factory/apptool-ui": "^4.0.25",
+    "@things-factory/auth-ui": "^4.0.25",
+    "@things-factory/biz-base": "^4.0.25",
+    "@things-factory/context-ui": "^4.0.25",
+    "@things-factory/grist-ui": "^4.0.25",
+    "@things-factory/i18n-ui": "^4.0.25",
+    "@things-factory/integration-ui": "^4.0.25",
+    "@things-factory/more-ui": "^4.0.25",
+    "@things-factory/resource-ui": "^4.0.25",
+    "@things-factory/setting-ui": "^4.0.25",
+    "@things-factory/system-ui": "^4.0.25",
     "debug": "^4.1.1",
     "node-fetch": "^2.6.0"
   },
@@ -50,5 +50,5 @@
     "nock": "^13.0.2",
     "should": "^13.2.3"
   },
-  "gitHead": "ab5451f749a4e886ae3668bee82777b566538e17"
+  "gitHead": "9c44141d651dab7b4a9c0f0b6fecb8d6937d116f"
 }

package/server/controllers/operato/operato.ts

@@ -2,6 +2,9 @@ import Debug from 'debug'
 import fetch from 'node-fetch'
 
 import { config } from '@things-factory/env'
+import { parseJwt } from '@things-factory/utils'
+import { getRepository } from 'typeorm'
+import { FulfillmentCenter } from '../../entities'
 
 const { protocol = 'https', host, callback } = config.get('fulfillmentIntegrationOperato', {})
 
@@ -75,7 +78,52 @@ export class Operato {
     } else {
       const text = await response.text()
       debug('response result', text)
-      throw new Error(`response code - ${response.status}, ${text}`)
+      throw response
     }
   }
+
+  public static async refreshAccessToken(fulfillmentCenter) {
+    const requestBody = {
+      refreshToken: fulfillmentCenter.refreshToken
+    }
+
+    const refreshResponse = await fetch(`${protocol}://${host}/oauth/refresh-token`, {
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(requestBody)
+    })
+
+    if (!refreshResponse.ok) {
+      throw new Error(`get operato information failed: ${await refreshResponse.text()}`)
+    }
+
+    const body = await refreshResponse.json()
+    const {
+      accessToken /* token used to call the API */,
+      id_token /* token containing user identity details (only returned if OpenID Connect scopes are requested) */,
+      expires_in /* amount of seconds until the access token expires */,
+      token_type: tokenType /* must be Bearer */,
+      refreshToken
+      /* token used to refresh the access token once it has expired (only returned if the offline_access scope is requested).
+       */
+    } = body
+
+    const { exp } = parseJwt(accessToken)
+
+    var patch = {
+      accessToken,
+      refreshToken,
+      tokenType,
+      expiresIn: new Date(exp * 1000)
+    }
+
+    const repository = getRepository(FulfillmentCenter)
+
+    return await repository.save({
+      ...fulfillmentCenter,
+      ...patch
+    })
+  }
 }

package/server/controllers/operato/platform-action.ts

@@ -22,7 +22,7 @@ function substitute(path, obj) {
   return result
 }
 
-export const action = async ({ center, method = 'get', path, request }) => {
+export const _action = async ({ center, method = 'get', path, request }) => {
   const client = new Operato({
     center: center.centerId,
     appKey,
@@ -34,10 +34,18 @@ export const action = async ({ center, method = 'get', path, request }) => {
 
   path = substitute(path, resource)
 
-  var response = await client[method](center, path, payload)
-  if (response.errors) {
-    throw response
-  }
+  return await client[method](center, path, payload)
+}
 
-  return response
+export const action = async ({ center, method = 'get', path, request }) => {
+  try {
+    return await _action({ center, method, path, request })
+  } catch (ex) {
+    if (ex.status === 401) {
+      var refreshed = await Operato.refreshAccessToken(center)
+      return await _action({ center: refreshed, method, path, request })
+    } else {
+      throw ex
+    }
+  }
 }

package/server/graphql/resolvers/fulfillment-center/operato/index.ts

@@ -1,7 +1,7 @@
-import { getOperatoAuthURL } from './get-operato-auth-url'
-
 import { deactivateOperatoCenter } from './deactivate-operato-center'
 import { generateOperatoAccessToken } from './generate-operato-access-token'
+import { getOperatoAuthURL } from './get-operato-auth-url'
+import { refreshOperatoAccessToken } from './refresh-operato-access-token'
 
 export const Query = {
   ...getOperatoAuthURL
@@ -9,5 +9,6 @@ export const Query = {
 
 export const Mutation = {
   ...generateOperatoAccessToken,
-  ...deactivateOperatoCenter
+  ...deactivateOperatoCenter,
+  ...refreshOperatoAccessToken
 }

package/server/graphql/resolvers/fulfillment-center/operato/refresh-operato-access-token.ts

@@ -0,0 +1,62 @@
+import fetch from 'node-fetch'
+import { getRepository } from 'typeorm'
+
+import { config } from '@things-factory/env'
+import { parseJwt } from '@things-factory/utils'
+
+import { FulfillmentCenter } from '../../../../entities'
+
+const { protocol = 'https', host, appKey, appSecret } = config.get('fulfillmentIntegrationOperato', {})
+
+const debug = require('debug')('things-factory:integration-fulfillment:refresh-operato-access-token')
+
+export const refreshOperatoAccessToken = {
+  async refreshOperatoAccessToken(_: any, { id }, context: any) {
+    const repository = getRepository(FulfillmentCenter)
+    const fulfillmentCenter: any = await repository.findOne({
+      where: { domain: context.state.domain, id }
+    })
+
+    const requestBody = {
+      refreshToken: fulfillmentCenter.refreshToken
+    }
+
+    const refreshResponse = await fetch(`${protocol}://${host}/oauth/refresh-token`, {
+      method: 'post',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(requestBody)
+    })
+
+    if (!refreshResponse.ok) {
+      throw new Error(`get operato information failed: ${await refreshResponse.text()}`)
+    }
+
+    const body = await refreshResponse.json()
+    const {
+      accessToken /* token used to call the API */,
+      id_token /* token containing user identity details (only returned if OpenID Connect scopes are requested) */,
+      expires_in /* amount of seconds until the access token expires */,
+      token_type: tokenType /* must be Bearer */,
+      refreshToken
+      /* token used to refresh the access token once it has expired (only returned if the offline_access scope is requested).
+       */
+    } = body
+
+    const { exp } = parseJwt(accessToken)
+
+    var patch = {
+      accessToken,
+      refreshToken,
+      tokenType,
+      expiresIn: new Date(exp * 1000)
+    }
+
+    return await repository.save({
+      ...fulfillmentCenter,
+      ...patch,
+      updater: context.state.user
+    })
+  }
+}

package/server/graphql/types/fulfillment-center/index.ts

@@ -1,7 +1,7 @@
 import { FulfillmentCenter } from './fulfillment-center'
-import { NewFulfillmentCenter } from './new-fulfillment-center'
-import { FulfillmentCenterPatch } from './fulfillment-center-patch'
 import { FulfillmentCenterList } from './fulfillment-center-list'
+import { FulfillmentCenterPatch } from './fulfillment-center-patch'
+import { NewFulfillmentCenter } from './new-fulfillment-center'
 
 export const Mutation = /* GraphQL */ `
   createFulfillmentCenter (
@@ -33,6 +33,10 @@ export const Mutation = /* GraphQL */ `
   deactivateOperatoCenter (
     name: String!
   ): FulfillmentCenter @transaction
+
+  refreshOperatoAccessToken (
+    id: String!
+  ): FulfillmentCenter
 `
 
 export const Query = /* GraphQL */ `

package/translations/en.json

@@ -1,6 +1,6 @@
 {
   "field.country-code": "country",
-  "field.platform": "platoform",
+  "field.platform": "platform",
   "field.status": "status",
   "field.center-id": "center id",
   "title.fulfillment centers": "fulfillment centers",

package/translations/ms.json

@@ -1,6 +1,6 @@
 {
   "field.country-code": "country",
-  "field.platform": "platoform",
+  "field.platform": "platform",
   "field.status": "status",
   "field.center-id": "center id",
   "title.fulfillment centers": "fulfillment centers"

package/translations/zh.json

@@ -1,6 +1,6 @@
 {
   "field.country-code": "country",
-  "field.platform": "platoform",
+  "field.platform": "platform",
   "field.status": "status",
   "field.center-id": "center id",
   "title.fulfillment centers": "fulfillment centers"