@iobroker/adapter-react-v5 4.0.20 → 4.0.21

package/Components/JsonConfigComponent/ConfigCheckLicense.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports["default"] = void 0;
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -22,6 +23,7 @@ var _Send = _interopRequireDefault(require("@mui/icons-material/Send"));
 var _i18n = _interopRequireDefault(require("./wrapper/i18n"));
 var _Error = _interopRequireDefault(require("./wrapper/Dialogs/Error"));
 var _ConfigGeneric2 = _interopRequireDefault(require("./ConfigGeneric"));
+var _Confirm = _interopRequireDefault(require("./wrapper/Dialogs/Confirm"));
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 var styles = function styles(theme) {
@@ -37,6 +39,7 @@ var styles = function styles(theme) {
     licLabel: {
       fontWeight: 'bold',
       minWidth: 100,
+      marginRight: 10,
       textTransform: 'capitalize',
       display: 'inline-block'
     },
@@ -112,13 +115,44 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
     value: function renderMessageDialog() {
       var _this2 = this;
       if (this.state.showLicenseData) {
-        var pre = Object.keys(this.state.showLicenseData).map(function (key) {
-          return /*#__PURE__*/_react["default"].createElement("div", {
-            key: key
-          }, /*#__PURE__*/_react["default"].createElement("div", {
-            className: _this2.props.classes.licLabel
-          }, key.replace(/_/g, ' '), ":"), " ", _this2.state.showLicenseData[key]);
+        var pre = [];
+        var data = this.state.showLicenseData;
+        Object.keys(data).forEach(function (key) {
+          if (data[key] === null || data[key] === undefined) {
+            return;
+          }
+          if ((0, _typeof2["default"])(data[key]) === 'object') {
+            var obj = data[key];
+            Object.keys(obj).forEach(function (key1) {
+              if (obj[key1] !== null && obj[key1] !== undefined) {
+                if ((0, _typeof2["default"])(obj[key1]) === 'object') {
+                  pre.push( /*#__PURE__*/_react["default"].createElement("div", {
+                    key: key1
+                  }, /*#__PURE__*/_react["default"].createElement("div", {
+                    className: _this2.props.classes.licLabel
+                  }, key1, ":"), JSON.stringify(obj[key1], null, 2)));
+                } else {
+                  pre.push( /*#__PURE__*/_react["default"].createElement("div", {
+                    key: key1
+                  }, /*#__PURE__*/_react["default"].createElement("div", {
+                    className: _this2.props.classes.licLabel
+                  }, key, " - ", key1, ":"), data[key1].toString()));
+                }
+              }
+            });
+          } else {
+            pre.push( /*#__PURE__*/_react["default"].createElement("div", {
+              key: key
+            }, /*#__PURE__*/_react["default"].createElement("div", {
+              className: _this2.props.classes.licLabel
+            }, key.replace(/_/g, ' '), ":"), data[key]));
+          }
         });
+        pre.push( /*#__PURE__*/_react["default"].createElement("div", {
+          key: "checked"
+        }, /*#__PURE__*/_react["default"].createElement("div", {
+          className: this.props.classes.licLabel
+        }, _i18n["default"].t('ra_Checked'), ":"), this.state.licenseOfflineCheck ? _i18n["default"].t('ra_locally') : _i18n["default"].t('ra_via internet')));
         return /*#__PURE__*/_react["default"].createElement(_material.Dialog, {
           open: !0,
           onClose: function onClose() {
@@ -209,7 +243,7 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
     key: "checkLicense",
     value: function () {
       var _checkLicense = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(license, adapterName) {
-        var uuid, _uuidObj$native2, uuidObj, version, _aObj$common2, aObj, _data, response, data, _data2, showLicenseData, validTill, parts, _error$response, _data3, _parts;
+        var uuid, _uuidObj$native2, uuidObj, version, _aObj$common2, aObj, controller, timeout, _data, response, data, _data2, showLicenseData, validTill, parts, _error$response, _data3, _parts;
         return _regenerator["default"].wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -233,8 +267,13 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
               aObj = _context3.sent;
               version = aObj === null || aObj === void 0 ? void 0 : (_aObj$common2 = aObj.common) === null || _aObj$common2 === void 0 ? void 0 : _aObj$common2.version;
             case 10:
-              _context3.prev = 10;
-              _context3.next = 13;
+              controller = new AbortController();
+              timeout = setTimeout(function () {
+                timeout = null;
+                controller.abort();
+              }, 5000);
+              _context3.prev = 12;
+              _context3.next = 15;
               return window.fetch('https://iobroker.net/api/v1/public/cert/', {
                 method: 'POST',
                 body: JSON.stringify({
@@ -243,13 +282,15 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 }),
                 headers: {
                   'Content-Type': 'text/plain'
-                }
+                },
+                signal: controller.signal
               });
-            case 13:
+            case 15:
               response = _context3.sent;
-              _context3.next = 16;
+              timeout && clearTimeout(timeout);
+              _context3.next = 19;
               return response.text();
-            case 16:
+            case 19:
               data = _context3.sent;
               try {
                 data = JSON.parse(data);
@@ -257,107 +298,108 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 // ignore
               }
               if (!((_data = data) !== null && _data !== void 0 && _data.error)) {
-                _context3.next = 30;
+                _context3.next = 33;
                 break;
               }
-              _context3.prev = 19;
+              _context3.prev = 22;
               _data2 = ConfigCheckLicense.parseJwt(license);
               return _context3.abrupt("return", this.setState({
                 _error: _data2.error,
+                licenseOfflineCheck: false,
                 showLicenseData: _data2,
                 result: false,
                 running: false
               }));
-            case 24:
-              _context3.prev = 24;
-              _context3.t0 = _context3["catch"](19);
+            case 27:
+              _context3.prev = 27;
+              _context3.t0 = _context3["catch"](22);
               console.log('Cannot parse license');
               return _context3.abrupt("return", this.setState({
                 _error: data.error,
                 result: false,
                 running: false
               }));
-            case 28:
-              _context3.next = 49;
+            case 31:
+              _context3.next = 52;
               break;
-            case 30:
+            case 33:
               showLicenseData = null;
               try {
                 showLicenseData = ConfigCheckLicense.parseJwt(license);
               } catch (e) {}
               if (!data) {
-                _context3.next = 48;
+                _context3.next = 51;
                 break;
               }
               validTill = data.validTill || data.valid_till;
               if (!(validTill && validTill !== '0000-00-00 00:00:00' && new Date(validTill).getTime() < Date.now())) {
-                _context3.next = 36;
+                _context3.next = 39;
                 break;
               }
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_License expired on %s', new Date(validTill).toLocaleString()),
-                licenseOfflineCheck: true,
+                licenseOfflineCheck: false,
                 showLicenseData: showLicenseData,
                 result: false,
                 running: false
               }));
-            case 36:
+            case 39:
               parts = (data.name || '').split('.');
               if (!(parts[1] === adapterName)) {
-                _context3.next = 45;
+                _context3.next = 48;
                 break;
               }
               if (!(uuid && data.uuid && data.uuid !== uuid)) {
-                _context3.next = 40;
+                _context3.next = 43;
                 break;
               }
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_Serial number (UUID) "%s" in license is for other device.', data.uuid),
-                licenseOfflineCheck: true,
+                licenseOfflineCheck: false,
                 showLicenseData: showLicenseData,
                 result: false,
                 running: false
               }));
-            case 40:
+            case 43:
               if (ConfigCheckLicense.isVersionValid(version, data.version, data.invoice, adapterName)) {
-                _context3.next = 42;
+                _context3.next = 45;
                 break;
               }
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_License is for version %s, but required version is %s', data.version, this.props.schema.version),
-                licenseOfflineCheck: true,
+                licenseOfflineCheck: false,
                 showLicenseData: showLicenseData,
                 result: false,
                 running: false
               }));
-            case 42:
+            case 45:
               return _context3.abrupt("return", this.setState({
-                licenseOfflineCheck: true,
+                licenseOfflineCheck: false,
                 showLicenseData: showLicenseData,
                 result: true,
                 running: false
               }));
-            case 45:
+            case 48:
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_License for other product "%s"', data.name),
-                licenseOfflineCheck: true,
+                licenseOfflineCheck: false,
                 showLicenseData: showLicenseData,
                 result: false,
                 running: false
               }));
-            case 46:
-              _context3.next = 49;
-              break;
-            case 48:
-              throw new Error('ra_Invalid answer from server');
             case 49:
-              _context3.next = 74;
+              _context3.next = 52;
               break;
             case 51:
-              _context3.prev = 51;
-              _context3.t1 = _context3["catch"](10);
+              throw new Error('ra_Invalid answer from server');
+            case 52:
+              _context3.next = 77;
+              break;
+            case 54:
+              _context3.prev = 54;
+              _context3.t1 = _context3["catch"](12);
               if (!((_context3.t1 === null || _context3.t1 === void 0 ? void 0 : (_error$response = _context3.t1.response) === null || _error$response === void 0 ? void 0 : _error$response.status) === 404)) {
-                _context3.next = 55;
+                _context3.next = 58;
                 break;
               }
               return _context3.abrupt("return", this.setState({
@@ -365,12 +407,12 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 result: false,
                 running: false
               }));
-            case 55:
-              _context3.prev = 55;
+            case 58:
+              _context3.prev = 58;
               _data3 = ConfigCheckLicense.parseJwt(license);
               _parts = (_data3.name || '').split('.');
               if (!(_data3.valid_till && _data3.valid_till !== '0000-00-00 00:00:00' && new Date(_data3.valid_till).getTime() < Date.now())) {
-                _context3.next = 60;
+                _context3.next = 63;
                 break;
               }
               return _context3.abrupt("return", this.setState({
@@ -380,13 +422,13 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 running: false,
                 result: false
               }));
-            case 60:
+            case 63:
               if (!(_parts[1] === adapterName)) {
-                _context3.next = 68;
+                _context3.next = 71;
                 break;
               }
               if (!(uuid && _data3.uuid && _data3.uuid !== uuid)) {
-                _context3.next = 63;
+                _context3.next = 66;
                 break;
               }
               return _context3.abrupt("return", this.setState({
@@ -396,9 +438,9 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 result: false,
                 running: false
               }));
-            case 63:
+            case 66:
               if (ConfigCheckLicense.isVersionValid(version, _data3.version, _data3.invoice, adapterName)) {
-                _context3.next = 65;
+                _context3.next = 68;
                 break;
               }
               return _context3.abrupt("return", this.setState({
@@ -408,12 +450,14 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 result: false,
                 running: false
               }));
-            case 65:
+            case 68:
               return _context3.abrupt("return", this.setState({
+                running: false,
                 result: true,
-                licenseOfflineCheck: true
+                licenseOfflineCheck: true,
+                showLicenseData: _data3
               }));
-            case 68:
+            case 71:
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_License for other product "%s"', _data3.name),
                 licenseOfflineCheck: true,
@@ -421,75 +465,135 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
                 result: false,
                 running: false
               }));
-            case 69:
-              _context3.next = 74;
+            case 72:
+              _context3.next = 77;
               break;
-            case 71:
-              _context3.prev = 71;
-              _context3.t2 = _context3["catch"](55);
+            case 74:
+              _context3.prev = 74;
+              _context3.t2 = _context3["catch"](58);
               return _context3.abrupt("return", this.setState({
                 _error: _i18n["default"].t('ra_Cannot decode license'),
                 result: false,
                 licenseOfflineCheck: true,
                 running: false
               }));
-            case 74:
+            case 77:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[10, 51], [19, 24], [55, 71]]);
+        }, _callee3, this, [[12, 54], [22, 27], [58, 74]]);
       }));
       function checkLicense(_x2, _x3) {
         return _checkLicense.apply(this, arguments);
       }
       return checkLicense;
     }()
+  }, {
+    key: "renderAskForUpdate",
+    value: function renderAskForUpdate() {
+      var _this3 = this;
+      if (!this.state.askForUpdate) {
+        return null;
+      }
+      return /*#__PURE__*/_react["default"].createElement(_Confirm["default"], {
+        text: _i18n["default"].t('ra_License not found in license manager. Do you want to read licenses from iobroker.net?'),
+        ok: _i18n["default"].t('ra_Yes'),
+        onClose: /*#__PURE__*/function () {
+          var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(isYes) {
+            return _regenerator["default"].wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  _this3.setState({
+                    askForUpdate: false
+                  });
+                  if (!isYes) {
+                    _context4.next = 6;
+                    break;
+                  }
+                  _context4.next = 4;
+                  return ConfigCheckLicense.updateLicenses();
+                case 4:
+                  _context4.next = 6;
+                  return _this3._onClick(true);
+                case 6:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _callee4);
+          }));
+          return function (_x4) {
+            return _ref.apply(this, arguments);
+          };
+        }()
+      });
+    }
   }, {
     key: "_onClick",
     value: function () {
-      var _onClick2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
-        var license;
-        return _regenerator["default"].wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _onClick2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(secondRun) {
+        var adapterName, license;
+        return _regenerator["default"].wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
+              adapterName = this.props.adapterName === 'vis-2-beta' ? 'vis' : this.props.adapterName;
               this.setState({
                 running: true
               });
               if (!this.props.data.useLicenseManager) {
-                _context4.next = 7;
+                _context5.next = 11;
+                break;
+              }
+              _context5.next = 5;
+              return this.findInLicenseManager(adapterName);
+            case 5:
+              license = _context5.sent;
+              if (!(!license && !secondRun)) {
+                _context5.next = 9;
                 break;
               }
-              _context4.next = 4;
-              return this.findInLicenseManager(this.props.adapterName);
-            case 4:
-              license = _context4.sent;
-              _context4.next = 8;
+              // no suitable license found in license manager
+              // should we read all licenses again?
+              this.setState({
+                askForUpdate: true
+              });
+              return _context5.abrupt("return");
+            case 9:
+              _context5.next = 12;
               break;
-            case 7:
+            case 11:
               license = this.props.data.license;
-            case 8:
+            case 12:
               if (!license) {
-                _context4.next = 13;
+                _context5.next = 17;
                 break;
               }
-              _context4.next = 11;
-              return this.checkLicense(license, this.props.adapterName, this.props.schema.uuid);
-            case 11:
-              _context4.next = 14;
+              _context5.next = 15;
+              return this.checkLicense(license, adapterName, this.props.schema.uuid);
+            case 15:
+              _context5.next = 18;
               break;
-            case 13:
-              this.setState({
-                _error: _i18n["default"].t('ra_Suitable license not found in license manager'),
-                result: false,
-                running: false
-              });
-            case 14:
+            case 17:
+              if (this.props.data.useLicenseManager) {
+                this.setState({
+                  _error: _i18n["default"].t('ra_Suitable license not found in license manager'),
+                  result: false,
+                  running: false
+                });
+              } else {
+                // this case could not happen
+                this.setState({
+                  _error: _i18n["default"].t('ra_Please enter the license'),
+                  result: false,
+                  running: false
+                });
+              }
+            case 18:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function _onClick() {
+      function _onClick(_x5) {
         return _onClick2.apply(this, arguments);
       }
       return _onClick;
@@ -497,24 +601,24 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
   }, {
     key: "renderItem",
     value: function renderItem(error, disabled, defaultValue) {
-      var _this3 = this;
+      var _this4 = this;
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: this.props.classes.fullWidth
       }, /*#__PURE__*/_react["default"].createElement(_material.Button, {
         variant: this.props.schema.variant || 'outlined',
         color: this.props.schema.color || 'primary',
         className: this.props.classes.fullWidth,
-        disabled: !this.props.data.license && !this.props.data.useLicenseManager,
+        disabled: !this.props.data.license && !this.props.data.useLicenseManager || this.state.running,
         startIcon: /*#__PURE__*/_react["default"].createElement(_Send["default"], null),
         onClick: function onClick() {
-          return _this3._onClick();
+          return _this4._onClick();
         }
       }, this.state.running ? /*#__PURE__*/_react["default"].createElement(_material.CircularProgress, {
         size: 20,
         style: {
           marginRight: 8
         }
-      }) : null, this.getText(this.props.schema.label || 'ra_Check license', this.props.schema.noTranslation)), this.renderMessageDialog());
+      }) : null, this.getText(this.props.schema.label || 'ra_Check license', this.props.schema.noTranslation)), this.renderMessageDialog(), this.renderErrorDialog(), this.renderAskForUpdate());
     }
   }], [{
     key: "parseJwt",
@@ -563,6 +667,25 @@ var ConfigCheckLicense = /*#__PURE__*/function (_ConfigGeneric) {
       }
       return true;
     }
+  }, {
+    key: "updateLicenses",
+    value: function updateLicenses(socket) {
+      return new Promise(function (resolve, reject) {
+        socket.getRawSocket().emit('updateLicenses', null, null, function (err, licenses) {
+          if (err === 'permissionError') {
+            reject(_i18n["default"].t('May not trigger "updateLicenses"'));
+          } else {
+            if (err && err.error) {
+              reject(_i18n["default"].t(err.error));
+            } else if (err) {
+              reject(_i18n["default"].t(err));
+            } else {
+              resolve(licenses);
+            }
+          }
+        });
+      });
+    }
   }]);
   return ConfigCheckLicense;
 }(_ConfigGeneric2["default"]);