solid-ui 2.4.27-fd5a7172 → 2.4.28-6f763399

package/dist/solid-ui.js

@@ -2682,7 +2682,6 @@ var ChatChannel = /*#__PURE__*/function () {
                 if (deleteIt) {
                   // we need to add a specific signature, else anyone can delete a msg ?
                   sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument));
-                  // msg.dateDeleted = dateStamp
                 }
                 _context2.next = 20;
                 break;
@@ -2714,14 +2713,8 @@ var ChatChannel = /*#__PURE__*/function () {
               case 32:
                 privateKey = _context2.sent;
                 // me.uri)
-                // const privateKey0 = 'a11bc5d2eee6cdb3b37f5473a712cad905ccfb13fb2ccdbf1be0a1ac4fdc7d2a'
-                sig = (0, _signature.signMsg)(msg, privateKey); // const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
-                /* const pubKey = await getPublicKey(me)
-                const verify = verifySignature(sig, msg, pubKey) // alain to remove
-                debug.warn('sig ' + sig)
-                debug.warn('verifySign ' + verify)
-                debug.warn(msg) */
-                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "Proof")), $rdf.lit(sig), chatDocument));
+                sig = (0, _signature.signMsg)(msg, privateKey);
+                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "proofValue")), $rdf.lit(sig), chatDocument));
               case 35:
                 _context2.prev = 35;
                 _context2.next = 38;
@@ -4040,7 +4033,7 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var debug = _interopRequireWildcard(__webpack_require__(/*! ../debug */ "./lib/debug.js"));
 var _secp256k = __webpack_require__(/*! @noble/curves/secp256k1 */ "./node_modules/@noble/curves/secp256k1.js");
 var _utils = __webpack_require__(/*! @noble/hashes/utils */ "./node_modules/@noble/hashes/utils.js");
-var _signature = __webpack_require__(/*! ./signature */ "./lib/chat/signature.js");
+var ns = _interopRequireWildcard(__webpack_require__(/*! ../ns */ "./lib/ns.js"));
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var $rdf = _interopRequireWildcard(__webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js"));
 var _accessData = __webpack_require__(/*! ../utils/keyHelpers/accessData */ "./lib/utils/keyHelpers/accessData.js");
@@ -4082,7 +4075,7 @@ function _getPublicKey() {
           return _solidLogic.store.fetcher.load(publicKeyDoc);
         case 8:
           // url.href)
-          key = _solidLogic.store.any(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
+          key = _solidLogic.store.any(webId, ns.solid('publicKey'));
           return _context2.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 12:
           _context2.prev = 12;
@@ -4136,14 +4129,14 @@ function _getPrivateKey() {
             break;
           }
           del = [];
-          add = []; // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))
+          add = [];
           if (privateKey) {
             _context3.next = 24;
             break;
           }
           // add = []
           privateKey = generatePrivateKey();
-          add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), _solidLogic.store.sym(privateKeyDoc))];
+          add = [$rdf.st(webId, ns.solid('privateKey'), $rdf.literal(privateKey), _solidLogic.store.sym(privateKeyDoc))];
           _context3.next = 24;
           return saveKey(privateKeyDoc, [], add, webId.uri);
         case 24:
@@ -4154,12 +4147,12 @@ function _getPrivateKey() {
           del = [];
           // delete invalid public key
           if (publicKey) {
-            del = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), _solidLogic.store.sym(publicKeyDoc))];
+            del = [$rdf.st(webId, ns.solid('publicKey'), $rdf.lit(publicKey), _solidLogic.store.sym(publicKeyDoc))];
             debug.log(del);
           }
           // update new valid key
           newPublicKey = generatePublicKey(privateKey);
-          add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
+          add = [$rdf.st(webId, ns.solid('publicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
           _context3.next = 31;
           return saveKey(publicKeyDoc, del, add);
         case 31:
@@ -4176,7 +4169,7 @@ function _getPrivateKey() {
   }));
   return _getPrivateKey.apply(this, arguments);
 }
-var deleteKey = /*#__PURE__*/function () {
+var deleteKeyAcl = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(keyDoc) {
     var keyAclDoc, response;
     return _regenerator["default"].wrap(function _callee$(_context) {
@@ -4215,7 +4208,7 @@ var deleteKey = /*#__PURE__*/function () {
       }
     }, _callee, null, [[4, 11]]);
   }));
-  return function deleteKey(_x3) {
+  return function deleteKeyAcl(_x3) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4237,7 +4230,7 @@ function _saveKey() {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.next = 2;
-            return deleteKey(keyDoc);
+            return deleteKeyAcl(keyDoc);
           case 2:
             _context4.next = 4;
             return _solidLogic.store.updater.updateMany(del, add);
@@ -4308,7 +4301,11 @@ var messageBodyStyle = style.messageBodyStyle;
 var label = utils.label;
 
 /**
+ * elementForImageURI
  * HTML component for an image
+ * @param imageUri
+ * @param options { inlineImageHeightEms }
+ * @returns HTMLAnchorElement For Image
  */
 function elementForImageURI(imageUri, options) {
   var img = dom.createElement('img');
@@ -4338,21 +4335,27 @@ var anchor = function anchor(text, term) {
   a.textContent = text;
   return a;
 };
-function nick(person) {
+function nickname(person) {
   var s = _solidLogic.store.any(person, ns.foaf('nick'));
   if (s) return '' + s.value;
   return '' + label(person);
 }
 
 /**
+ * creatorAndDate
  * Displays creator and date for a chat message
  * inside the `td1` element
+ * @param td1
+ * @param creator
+ * @param date
+ * @param message
+ * @returns HTMLAnchorElement For Image
  */
 function creatorAndDate(td1, creator, date, message) {
-  var nickAnchor = td1.appendChild(anchor(nick(creator), creator));
+  var nickAnchor = td1.appendChild(anchor(nickname(creator), creator));
   if (creator.uri) {
     _solidLogic.store.fetcher.nowOrWhenFetched(creator.doc(), undefined, function (_ok, _body) {
-      nickAnchor.textContent = nick(creator);
+      nickAnchor.textContent = nickname(creator);
     });
   }
   td1.appendChild(dom.createElement('br'));
@@ -4360,14 +4363,20 @@ function creatorAndDate(td1, creator, date, message) {
 }
 
 /**
+ * creatorAndDateHorizontal
  * Horizontally displays creator and date for a chat message
  * inside the `td1` element
+ * @param td1
+ * @param creator
+ * @param date
+ * @param message
+ * @returns HTMLAnchorElement For Image
  */
 function creatorAndDateHorizontal(td1, creator, date, message) {
   var nickAnchor = td1.appendChild(anchor(label(creator), creator));
   if (creator.uri) {
     _solidLogic.store.fetcher.nowOrWhenFetched(creator.doc(), undefined, function (_ok, _body) {
-      nickAnchor.textContent = nick(creator);
+      nickAnchor.textContent = nickname(creator);
     });
   }
   var dateBit = td1.appendChild(anchor(date, message));
@@ -4377,9 +4386,17 @@ function creatorAndDateHorizontal(td1, creator, date, message) {
 }
 
 /**
+ * renderMessageRow
  * Renders a chat message, read-only mode
+ * @param channelObject
+ * @param message
+ * @param fresh
+ * @param options
+ * @param userContext
+ * @returns Message Row HTML Table Element
  */
 function renderMessageRow(channelObject, message, fresh, options, userContext) {
+  var unsignedMessage = false;
   var colorizeByAuthor = options.colorizeByAuthor === '1' || options.colorizeByAuthor === true;
   var creator = _solidLogic.store.any(message, ns.foaf('maker'));
   var date = _solidLogic.store.any(message, ns.dct('created'));
@@ -4389,7 +4406,7 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   // use latest content if same owner, else use original
   var msgId = creator.uri === latestVersionCreator.uri ? latestVersion : message;
   var content = _solidLogic.store.any(msgId, ns.sioc('content'));
-  var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "Proof")));
+  var signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "proofValue")));
 
   // set message object
   var msg = (0, _signature.getBlankMsg)();
@@ -4399,10 +4416,11 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   msg.maker = creator.uri;
 
   // unsigned message
-  if (!(signature !== null && signature !== void 0 && signature.value)) debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
-
-  // signed message, get public key and check signature
-  else {
+  if (!(signature !== null && signature !== void 0 && signature.value)) {
+    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) {
@@ -4422,6 +4440,7 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message
 
   var messageRow = dom.createElement('tr');
+  if (unsignedMessage) messageRow.setAttribute('style', 'background-color: red');
   messageRow.AJAR_date = sortDate.value;
   messageRow.AJAR_subject = message;
   var td1 = dom.createElement('td');
@@ -4510,7 +4529,8 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
     toolsTD.appendChild(tools);
   });
   return messageRow;
-}
+} // END OF RENDERMESSAGE
+
 function switchToEditor(messageRow, message, channelObject, userContext) {
   var messageTable = messageRow.parentNode;
   var editRow = renderMessageEditor(channelObject, messageTable, userContext, channelObject.options, (0, _chatLogic.mostRecentVersion)(message));
@@ -4555,8 +4575,6 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
             sendComplete = function _sendComplete(message, _text2) {
-              // const dateStamp = store.any(message, ns.dct('created'), null, message.doc())
-              // const content = $rdf.literal(text2)
               (0, _infinite.insertMessageIntoTable)(channelObject, messageTable, message, false, options, userContext); // not green
 
               if (originalMessage) {
@@ -5209,7 +5227,7 @@ function messageToolbar(message, messageRow, userContext, channelObject) {
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
-exports.SEC = exports.CERT = void 0;
+exports.SEC = void 0;
 exports.getBlankMsg = getBlankMsg;
 exports.getMsgHash = getMsgHash;
 exports.serializeMsg = serializeMsg;
@@ -5227,8 +5245,7 @@ exports.utf8Decoder = utf8Decoder;
 var utf8Encoder = new TextEncoder();
 exports.utf8Encoder = utf8Encoder;
 var SEC = 'https://w3id.org/security#'; // Proof, VerificationMethod
-exports.SEC = SEC;
-var CERT = 'http://www.w3.org/ns/auth/cert#'; // PrivateKey, PublicKey
+// export const CERT = 'http://www.w3.org/ns/auth/cert#' // PrivateKey, PublicKey, key
 
 /* eslint-disable no-unused-vars */
 /* export enum Kind {
@@ -5254,7 +5271,7 @@ var CERT = 'http://www.w3.org/ns/auth/cert#'; // PrivateKey, PublicKey
   ProfileBadge = 30009,
   Article = 30023
 } */
-exports.CERT = CERT;
+exports.SEC = SEC;
 function getBlankMsg() {
   return {
     id: '',
@@ -13259,14 +13276,12 @@ exports.pubKeyUrl = exports.privKeyUrl = exports.getPodRoot = void 0;
 var _regenerator = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/regenerator */ "./node_modules/@babel/runtime/regenerator/index.js"));
 var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/asyncToGenerator */ "./node_modules/@babel/runtime/helpers/asyncToGenerator.js"));
 var debug = _interopRequireWildcard(__webpack_require__(/*! ../../debug */ "./lib/debug.js"));
-var _signature = __webpack_require__(/*! ../../chat/signature */ "./lib/chat/signature.js");
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var ns = _interopRequireWildcard(__webpack_require__(/*! ../../ns */ "./lib/ns.js"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var getPodRoot = /*#__PURE__*/function () {
   var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var _podRoot;
     var webIdURL, storages, podRoot, path, _res$headers$get, res;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -13312,7 +13327,7 @@ var getPodRoot = /*#__PURE__*/function () {
           });
           if (!podRoot) podRoot = storages[0];
         case 21:
-          return _context.abrupt("return", (_podRoot = podRoot) === null || _podRoot === void 0 ? void 0 : _podRoot.value);
+          return _context.abrupt("return", podRoot);
         case 22:
         case "end":
           return _context.stop();
@@ -13333,7 +13348,7 @@ var pubKeyUrl = /*#__PURE__*/function () {
           _context2.next = 3;
           return getPodRoot(webId);
         case 3:
-          _context2.t0 = _context2.sent;
+          _context2.t0 = _context2.sent.value;
           return _context2.abrupt("return", _context2.t0 + 'profile/keys/publicKey.ttl');
         case 7:
           _context2.prev = 7;
@@ -13359,7 +13374,7 @@ function _getExistingPublicKey() {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
           _context4.next = 2;
-          return getKeyIfExists(webId, publicKeyUrl, 'PublicKey');
+          return getKeyIfExists(webId, publicKeyUrl, 'publicKey');
         case 2:
           return _context4.abrupt("return", _context4.sent);
         case 3:
@@ -13372,24 +13387,34 @@ function _getExistingPublicKey() {
 }
 var privKeyUrl = /*#__PURE__*/function () {
   var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
+    var _store$any, _settings;
+    var settings, _settings2, podRoot;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context3.prev = 0;
-          _context3.next = 3;
+          settings = (_store$any = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any === void 0 ? void 0 : _store$any.value;
+          settings = (_settings = settings) === null || _settings === void 0 ? void 0 : _settings.split('/').slice(0, -1).join('/');
+          _context3.prev = 2;
+          _context3.next = 5;
           return getPodRoot(webId);
-        case 3:
-          _context3.t0 = _context3.sent;
-          return _context3.abrupt("return", _context3.t0 + 'profile/keys/privateKey.ttl');
-        case 7:
-          _context3.prev = 7;
-          _context3.t1 = _context3["catch"](0);
-          throw new Error(_context3.t1);
-        case 10:
+        case 5:
+          podRoot = _context3.sent;
+          if ((_settings2 = settings) !== null && _settings2 !== void 0 && _settings2.startsWith(podRoot.value)) {
+            _context3.next = 8;
+            break;
+          }
+          throw new Error("/settings/ is expected to be in ".concat(podRoot.value));
+        case 8:
+          return _context3.abrupt("return", "".concat(settings, "/keys/privateKey.ttl"));
+        case 11:
+          _context3.prev = 11;
+          _context3.t0 = _context3["catch"](2);
+          throw new Error(_context3.t0);
+        case 14:
         case "end":
           return _context3.stop();
       }
-    }, _callee3, null, [[0, 7]]);
+    }, _callee3, null, [[2, 11]]);
   }));
   return function privKeyUrl(_x5) {
     return _ref3.apply(this, arguments);
@@ -13405,7 +13430,7 @@ function _getExistingPrivateKey() {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
           _context5.next = 2;
-          return getKeyIfExists(webId, privateKeyUrl, 'PrivateKey');
+          return getKeyIfExists(webId, privateKeyUrl, 'privateKey');
         case 2:
           return _context5.abrupt("return", _context5.sent);
         case 3:
@@ -13421,7 +13446,7 @@ function getKeyIfExists(_x8, _x9, _x10) {
 }
 function _getKeyIfExists() {
   _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(webId, keyUrl, keyType) {
-    var key, _err$response, data, contentType, response;
+    var key;
     return _regenerator["default"].wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
@@ -13429,35 +13454,33 @@ function _getKeyIfExists() {
           _context6.next = 3;
           return _solidLogic.store.fetcher.load(keyUrl);
         case 3:
-          key = _solidLogic.store.any(webId, _solidLogic.store.sym(_signature.CERT + keyType));
+          key = _solidLogic.store.any(webId, ns.solid(keyType)); // store.sym(CERT + keyType))
           return _context6.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 7:
           _context6.prev = 7;
           _context6.t0 = _context6["catch"](0);
-          if (!((_context6.t0 === null || _context6.t0 === void 0 ? void 0 : (_err$response = _context6.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
+          if (!(_context6.t0.response.status === 404)) {
             _context6.next = 24;
             break;
           }
-          _context6.prev = 10;
-          // create resource
-          data = '';
-          contentType = 'text/turtle';
-          _context6.next = 15;
+          debug.log('createIfNotExists: doc does NOT exist, will create... ' + keyUrl);
+          _context6.prev = 11;
+          _context6.next = 14;
           return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
-            data: data,
-            contentType: contentType
+            data: '',
+            contentType: 'text/turtle'
           });
-        case 15:
-          response = _context6.sent;
-          _context6.next = 22;
+        case 14:
+          _context6.next = 20;
           break;
-        case 18:
-          _context6.prev = 18;
-          _context6.t1 = _context6["catch"](10);
+        case 16:
+          _context6.prev = 16;
+          _context6.t1 = _context6["catch"](11);
           debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context6.t1);
           throw _context6.t1;
-        case 22:
+        case 20:
           delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
+          // debug.log('createIfNotExists doc created ok ' + doc)
           return _context6.abrupt("return", undefined);
         case 24:
           debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context6.t0);
@@ -13466,7 +13489,7 @@ function _getKeyIfExists() {
         case "end":
           return _context6.stop();
       }
-    }, _callee6, null, [[0, 7], [10, 18]]);
+    }, _callee6, null, [[0, 7], [11, 16]]);
   }));
   return _getKeyIfExists.apply(this, arguments);
 }
@@ -13705,10 +13728,10 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-05-17T23:36:37Z',
-  commit: 'fd5a7172c8e5cef746d9812d555a274590b70866',
+  buildTime: '2023-05-25T09:43:51Z',
+  commit: '6f763399cd83ecfe031ae11f0f50b71da1ff3bd5',
   npmInfo: {
-    'solid-ui': '2.4.27',
+    'solid-ui': '2.4.28',
     npm: '8.19.4',
     node: '16.20.0',
     v8: '9.4.146.26-node.26',