solid-ui 2.4.27-5e3807fa → 2.4.27-65a55ffc

package/dist/solid-ui.js

@@ -4065,70 +4065,65 @@ function getPublicKey(_x) {
   return _getPublicKey.apply(this, arguments);
 }
 function _getPublicKey() {
-  _getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+  _getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
     var publicKeyDoc, key;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context.next = 2;
+          _context2.next = 2;
           return _solidLogic.store.fetcher.load(webId);
         case 2:
-          _context.next = 4;
+          _context2.next = 4;
           return (0, _accessData.pubKeyUrl)(webId);
         case 4:
-          publicKeyDoc = _context.sent;
-          _context.prev = 5;
-          _context.next = 8;
+          publicKeyDoc = _context2.sent;
+          _context2.prev = 5;
+          _context2.next = 8;
           return _solidLogic.store.fetcher.load(publicKeyDoc);
         case 8:
           // url.href)
           key = _solidLogic.store.any(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
-          return _context.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+          return _context2.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 12:
-          _context.prev = 12;
-          _context.t0 = _context["catch"](5);
-          return _context.abrupt("return", undefined);
+          _context2.prev = 12;
+          _context2.t0 = _context2["catch"](5);
+          return _context2.abrupt("return", undefined);
         case 15:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee, null, [[5, 12]]);
+    }, _callee2, null, [[5, 12]]);
   }));
   return _getPublicKey.apply(this, arguments);
 }
 function getPrivateKey(_x2) {
   return _getPrivateKey.apply(this, arguments);
 }
-/**
- * delete acl if keydoc exists
- * create/edit keyDoc
- * set keyDoc acl
- */
 function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
     var publicKeyDoc, privateKeyDoc, publicKey, privateKey, validPublicKey, del, add, newPublicKey, keyContainer;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context2.next = 2;
+          _context3.next = 2;
           return _solidLogic.store.fetcher.load(webId);
         case 2:
-          _context2.next = 4;
+          _context3.next = 4;
           return (0, _accessData.pubKeyUrl)(webId);
         case 4:
-          publicKeyDoc = _context2.sent;
-          _context2.next = 7;
+          publicKeyDoc = _context3.sent;
+          _context3.next = 7;
           return (0, _accessData.privKeyUrl)(webId);
         case 7:
-          privateKeyDoc = _context2.sent;
-          _context2.next = 10;
+          privateKeyDoc = _context3.sent;
+          _context3.next = 10;
           return (0, _accessData.getExistingPublicKey)(webId, publicKeyDoc);
         case 10:
-          publicKey = _context2.sent;
-          _context2.next = 13;
+          publicKey = _context3.sent;
+          _context3.next = 13;
           return (0, _accessData.getExistingPrivateKey)(webId, privateKeyDoc);
         case 13:
-          privateKey = _context2.sent;
+          privateKey = _context3.sent;
           // is publicKey valid ?
           validPublicKey = true;
           if (privateKey && publicKey !== generatePublicKey(privateKey)) {
@@ -4137,23 +4132,23 @@ function _getPrivateKey() {
 
           // create key pair or repair publicKey
           if (!(!privateKey || !publicKey || !validPublicKey)) {
-            _context2.next = 34;
+            _context3.next = 34;
             break;
           }
           del = [];
           add = []; // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))
           if (privateKey) {
-            _context2.next = 24;
+            _context3.next = 24;
             break;
           }
           // add = []
           privateKey = generatePrivateKey();
           add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), _solidLogic.store.sym(privateKeyDoc))];
-          _context2.next = 24;
+          _context3.next = 24;
           return saveKey(privateKeyDoc, [], add, webId.uri);
         case 24:
           if (!(!publicKey || !validPublicKey)) {
-            _context2.next = 31;
+            _context3.next = 31;
             break;
           }
           del = [];
@@ -4165,83 +4160,98 @@ function _getPrivateKey() {
           // update new valid key
           newPublicKey = generatePublicKey(privateKey);
           add = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + 'PublicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
-          _context2.next = 31;
+          _context3.next = 31;
           return saveKey(publicKeyDoc, del, add);
         case 31:
           keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
-          _context2.next = 34;
+          _context3.next = 34;
           return (0, _acl.setAcl)(keyContainer, (0, _acl.keyContainerAclBody)(webId.uri));
         case 34:
-          return _context2.abrupt("return", privateKey);
+          return _context3.abrupt("return", privateKey);
         case 35:
         case "end":
-          return _context2.stop();
+          return _context3.stop();
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _getPrivateKey.apply(this, arguments);
 }
-function saveKey(_x3, _x4, _x5) {
+var deleteKey = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(keyDoc) {
+    var keyAclDoc, response;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return _solidLogic.store.fetcher.load(keyDoc);
+        case 2:
+          keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
+          if (!keyAclDoc) {
+            _context.next = 16;
+            break;
+          }
+          _context.prev = 4;
+          _context.next = 7;
+          return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+        case 7:
+          response = _context.sent;
+          // this may fail if webId is not an owner
+          debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
+          _context.next = 16;
+          break;
+        case 11:
+          _context.prev = 11;
+          _context.t0 = _context["catch"](4);
+          if (!(_context.t0.response.status !== 404)) {
+            _context.next = 15;
+            break;
+          }
+          throw new Error(_context.t0);
+        case 15:
+          debug.log('delete ' + keyAclDoc.value + ' ' + _context.t0.response.status); // should test 404 and 2xx
+        case 16:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[4, 11]]);
+  }));
+  return function deleteKey(_x3) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+/**
+ * delete acl if keydoc exists
+ * create/edit keyDoc
+ * set keyDoc acl
+ */
+function saveKey(_x4, _x5, _x6) {
   return _saveKey.apply(this, arguments);
 }
 function _saveKey() {
   _saveKey = (0, _asyncToGenerator2["default"])(function (keyDoc, del, add) {
     var me = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
-    return /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
-      var keyAclDoc, response, aclBody;
-      return _regenerator["default"].wrap(function _callee3$(_context3) {
-        while (1) switch (_context3.prev = _context3.next) {
+    return /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+      var aclBody;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
           case 0:
-            _context3.next = 2;
-            return _solidLogic.store.fetcher.load(keyDoc);
+            _context4.next = 2;
+            return deleteKey(keyDoc);
           case 2:
-            _context3.prev = 2;
-            // get keyAcldoc
-            keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
-            if (!keyAclDoc) {
-              _context3.next = 17;
-              break;
-            }
-            _context3.prev = 5;
-            _context3.next = 8;
-            return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
-          case 8:
-            response = _context3.sent;
-            // this may fail if webId is not an owner
-            debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
-            _context3.next = 17;
-            break;
-          case 12:
-            _context3.prev = 12;
-            _context3.t0 = _context3["catch"](5);
-            if (!(_context3.t0.response.status !== 404)) {
-              _context3.next = 16;
-              break;
-            }
-            throw new Error(_context3.t0);
-          case 16:
-            debug.log('delete ' + keyAclDoc.value + ' ' + _context3.t0.response.status); // should test 404 and 2xx
-          case 17:
-            _context3.next = 19;
+            _context4.next = 4;
             return _solidLogic.store.updater.updateMany(del, add);
-          case 19:
+          case 4:
             // or a promise store.updater.update ?
             // create READ only ACL
             aclBody = (0, _acl.keyAclBody)(keyDoc, me);
-            _context3.next = 22;
+            _context4.next = 7;
             return (0, _acl.setAcl)(keyDoc, aclBody);
-          case 22:
-            _context3.next = 27;
-            break;
-          case 24:
-            _context3.prev = 24;
-            _context3.t1 = _context3["catch"](2);
-            throw new Error(_context3.t1);
-          case 27:
+          case 7:
           case "end":
-            return _context3.stop();
+            return _context4.stop();
         }
-      }, _callee3, null, [[2, 24], [5, 12]]);
+      }, _callee4);
     })();
   });
   return _saveKey.apply(this, arguments);
@@ -13501,7 +13511,7 @@ function setAcl(_x, _x2) {
  */
 function _setAcl() {
   _setAcl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(keyDoc, aclBody) {
-    var keyAclDoc, response, aclResponse;
+    var keyAclDoc, _err$response;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -13519,36 +13529,28 @@ function _setAcl() {
         case 6:
           _context.prev = 6;
           _context.next = 9;
-          return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+          return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
+            data: aclBody,
+            contentType: 'text/turtle'
+          });
         case 9:
-          response = _context.sent;
-          // this may fail if webId is not an owner
-          debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
-          _context.next = 18;
+          _context.next = 16;
           break;
-        case 13:
-          _context.prev = 13;
+        case 11:
+          _context.prev = 11;
           _context.t0 = _context["catch"](6);
-          if (!(_context.t0.response.status !== 404)) {
-            _context.next = 17;
+          if (!((_context.t0 === null || _context.t0 === void 0 ? void 0 : (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) !== 404)) {
+            _context.next = 15;
             break;
           }
           throw new Error(_context.t0);
-        case 17:
+        case 15:
           debug.log('delete ' + keyAclDoc.value + ' ' + _context.t0.response.status); // should test 404 and 2xx
-        case 18:
-          _context.next = 20;
-          return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
-            data: aclBody,
-            contentType: 'text/turtle'
-          });
-        case 20:
-          aclResponse = _context.sent;
-        case 21:
+        case 16:
         case "end":
           return _context.stop();
       }
-    }, _callee, null, [[6, 13]]);
+    }, _callee, null, [[6, 11]]);
   }));
   return _setAcl.apply(this, arguments);
 }
@@ -13703,8 +13705,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-05-17T09:06:44Z',
-  commit: '5e3807fa9b6574cc4cc92b613549ec7961149a90',
+  buildTime: '2023-05-17T23:42:27Z',
+  commit: '65a55ffc694e4caccf3d1c79aea9f11bce34d651',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',