solid-ui 2.4.28-7b1c0b2d → 2.4.28-7d93d5d2

package/dist/solid-ui.js

@@ -4416,7 +4416,7 @@ Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
 exports.createAndSaveKeyPairs = createAndSaveKeyPairs;
-exports.generateAndStorePublicKey = generateAndStorePublicKey;
+exports.generateAndStoreNewPublicKey = generateAndStoreNewPublicKey;
 exports.generatePrivateKey = generatePrivateKey;
 exports.generatePublicKey = generatePublicKey;
 exports.getPrivateKey = getPrivateKey;
@@ -4499,11 +4499,11 @@ function validPublicKey(webId, publicKey, privateKey) {
   }
   return true;
 }
-function generateAndStorePublicKey(_x2, _x3, _x4, _x5) {
-  return _generateAndStorePublicKey.apply(this, arguments);
+function generateAndStoreNewPublicKey(_x2, _x3, _x4, _x5) {
+  return _generateAndStoreNewPublicKey.apply(this, arguments);
 }
-function _generateAndStorePublicKey() {
-  _generateAndStorePublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, privateKey, publicKey, publicKeyDoc) {
+function _generateAndStoreNewPublicKey() {
+  _generateAndStoreNewPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, privateKey, publicKey, publicKeyDoc) {
     var del, newPublicKey, add;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
@@ -4519,7 +4519,7 @@ function _generateAndStorePublicKey() {
       }
     }, _callee3);
   }));
-  return _generateAndStorePublicKey.apply(this, arguments);
+  return _generateAndStoreNewPublicKey.apply(this, arguments);
 }
 function createAndSaveKeyPairs(_x6, _x7, _x8, _x9) {
   return _createAndSaveKeyPairs.apply(this, arguments);
@@ -4536,7 +4536,7 @@ function _createAndSaveKeyPairs() {
           return saveKeyAndHandleAcl(privateKeyDoc, [], add, webId.uri);
         case 4:
           _context4.next = 6;
-          return generateAndStorePublicKey(webId, privateKey, publicKey, publicKeyDoc);
+          return generateAndStoreNewPublicKey(webId, privateKey, publicKey, publicKeyDoc);
         case 6:
           return _context4.abrupt("return", privateKey);
         case 7:
@@ -4589,7 +4589,7 @@ function _getPrivateKey() {
             break;
           }
           _context5.next = 21;
-          return generateAndStorePublicKey(webId, privateKey, publicKey, publicKeyDoc);
+          return generateAndStoreNewPublicKey(webId, privateKey, publicKey, publicKeyDoc);
         case 21:
           keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
           _context5.next = 24;
@@ -4841,23 +4841,20 @@ function renderMessageRow(_x, _x2, _x3, _x4, _x5) {
 } // END OF RENDERMESSAGE
 function _renderMessageRow() {
   _renderMessageRow = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(channelObject, message, fresh, options, userContext) {
-    var unsignedMessage, colorizeByAuthor, creator, date, latestVersion, latestVersionCreator, msgId, content, versions, replies, thread, straightReplies, _iterator2, _step2, reply, signature, msg, originalMessage, edited, sortDate, messageRow, td1, img, bothDates, td2, text, isURI, para, isImage, _img, anc, bgcolor, getBgColor, strip, td3, toolsButton;
+    var colorizeByAuthor, creator, date, latestVersion, latestVersionCreator, msgId, content, versions, replies, thread, straightReplies, _iterator2, _step2, reply, signature, msg, messageRow, publicKey, regex, validSignature, validPublicKeyHexString, originalMessage, edited, sortDate, td1, img, bothDates, td2, text, isURI, para, isImage, _img, anc, bgcolor, getBgColor, strip, td3, toolsButton;
     return _regenerator["default"].wrap(function _callee9$(_context10) {
       while (1) switch (_context10.prev = _context10.next) {
         case 0:
           getBgColor = function _getBgColor(fresh) {
             return fresh ? '#e8ffe8' : 'white';
           };
-          unsignedMessage = false;
-          colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true; // const id = store.any(latestVersion, ns.sioc('id'))
-          // const replies = store.each(latestVersion, ns.sioc('has_reply'))
+          colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
           creator = _solidLogic.store.any(message, ns.foaf('maker'));
           date = _solidLogic.store.any(message, ns.dct('created'));
-          _context10.next = 7;
+          _context10.next = 6;
           return (0, _chatLogic.mostRecentVersion)(message);
-        case 7:
+        case 6:
           latestVersion = _context10.sent;
-          debug.log('@@@@ alain mostRecentVersion');
           debug.log(message);
           debug.log(latestVersion);
           latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker')); // use latest content if same owner, else use original
@@ -4867,9 +4864,9 @@ function _renderMessageRow() {
           debug.log(latestVersionCreator);
           msgId = creator.uri === (latestVersionCreator === null || latestVersionCreator === void 0 ? void 0 : latestVersionCreator.uri) ? latestVersion : message;
           content = _solidLogic.store.any(msgId, ns.sioc('content'));
-          _context10.next = 19;
+          _context10.next = 17;
           return (0, _chatLogic.allVersions)(msgId);
-        case 19:
+        case 17:
           versions = _context10.sent;
           if (versions.length > 1) {
             debug.log('renderMessageRow versions: ', versions.join(',  '));
@@ -4911,35 +4908,38 @@ function _renderMessageRow() {
           msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
           msg.content = content.value;
           msg.maker = creator.uri;
-
-          // verify signature
-          if (!(signature !== null && signature !== void 0 && signature.value)) {
-            // unsigned message
-            unsignedMessage = true;
-            debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
-          } else {
-            // signed message, get public key and check signature
-            (0, _keys.getPublicKey)(creator).then(function (publicKey) {
-              debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
-              if (!publicKey) {
-                debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
-              }
-              // check that publicKey is a valid hex string
-              var regex = /[0-9A-Fa-f]{6}/g;
-              if (!(publicKey !== null && publicKey !== void 0 && publicKey.match(regex))) debug.warn('invalid publicKey hex string\n' + creator.uri + '\n' + publicKey);
-              // verify signature
-              else if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature === null || signature === void 0 ? void 0 : signature.value, msg, publicKey)) debug.warn('invalid signature\n' + msg.id);
-            });
+          messageRow = dom.createElement('tr'); // verify signature
+          if (signature !== null && signature !== void 0 && signature.value) {
+            _context10.next = 38;
+            break;
           }
-          _context10.next = 38;
-          return (0, _chatLogic.originalVersion)(message);
+          // unsigned message
+          messageRow.setAttribute('style', style.textInputBackgroundColorHighlight);
+          _context10.next = 48;
+          break;
         case 38:
+          _context10.next = 40;
+          return (0, _keys.getPublicKey)(creator);
+        case 40:
+          publicKey = _context10.sent;
+          debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
+          if (!publicKey) {
+            debug.warn('message is signed but ' + creator.uri + ' is missing publicKey');
+          }
+          // check that publicKey is a valid hex string
+          regex = /[0-9A-Fa-f]{6}/g;
+          validSignature = (0, _signature.verifySignature)(signature === null || signature === void 0 ? void 0 : signature.value, msg, publicKey);
+          validPublicKeyHexString = publicKey === null || publicKey === void 0 ? void 0 : publicKey.match(regex);
+          if (!validPublicKeyHexString) debug.warn('invalid publicKey hex string\n' + creator.uri + '\n' + publicKey);else if (signature !== null && signature !== void 0 && signature.value && !validSignature) debug.warn('invalid signature\n' + msg.id);
+          if (!validSignature || !validPublicKeyHexString) messageRow.setAttribute('style', style.textInputBackgroundColorError);
+        case 48:
+          _context10.next = 50;
+          return (0, _chatLogic.originalVersion)(message);
+        case 50:
           originalMessage = _context10.sent;
           edited = !message.sameTerm(originalMessage); // @@ load it first  @@   Or display the new data at the old date.
           // @@@ kludge!
           sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()) || _solidLogic.store.the(message, ns.dct('created'), null, message.doc()); // In message
-          messageRow = dom.createElement('tr');
-          if (unsignedMessage) messageRow.setAttribute('style', 'background-color: red');
           messageRow.AJAR_date = sortDate.value;
           messageRow.AJAR_subject = message;
           td1 = dom.createElement('td');
@@ -4990,9 +4990,9 @@ function _renderMessageRow() {
             bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
             para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
           }
-          _context10.next = 59;
+          _context10.next = 69;
           return (0, _messageTools.sentimentStripLinked)(message, message.doc());
-        case 59:
+        case 69:
           strip = _context10.sent;
           if (strip.children.length) {
             td2.appendChild(dom.createElement('br'));
@@ -5057,7 +5057,7 @@ function _renderMessageRow() {
             }));
           }
           return _context10.abrupt("return", messageRow);
-        case 68:
+        case 78:
         case "end":
           return _context10.stop();
       }
@@ -11069,6 +11069,8 @@ var style = {
   formFieldNameBoxStyle: "padding: 0.3em; vertical-align: middle; width:".concat(formFieldNameBoxWidth, ";"),
   textInputBackgroundColor: '#eef',
   textInputBackgroundColorUneditable: '#fff',
+  textInputBackgroundColorError: 'background-color: #fee;',
+  textInputBackgroundColorHighlight: 'background-color: #fdeadc;',
   textInputColor: '#000',
   textInputColorPending: '#888',
   multilineTextInputStyle: 'font-size:100%; white-space: pre-wrap; background-color: #eef;' + ' border: 0.07em solid gray; padding: 1em 0.5em; margin: 1em 1em;',
@@ -14368,8 +14370,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-06-06T08:34:10Z',
-  commit: '7b1c0b2d7ab8de07add05b789f87dfdbeb68b960',
+  buildTime: '2023-06-06T09:58:09Z',
+  commit: '7d93d5d2c946c99747446d9189b9117e05440d88',
   npmInfo: {
     'solid-ui': '2.4.28',
     npm: '8.19.4',