solid-ui 2.4.28-6a319caf → 2.4.28-7b1c0b2d

package/dist/solid-ui.js

@@ -4415,10 +4415,13 @@ var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_m
 Object.defineProperty(exports, "__esModule", ({
   value: true
 }));
+exports.createAndSaveKeyPairs = createAndSaveKeyPairs;
+exports.generateAndStorePublicKey = generateAndStorePublicKey;
 exports.generatePrivateKey = generatePrivateKey;
 exports.generatePublicKey = generatePublicKey;
 exports.getPrivateKey = getPrivateKey;
 exports.getPublicKey = getPublicKey;
+exports.validPublicKey = validPublicKey;
 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"));
@@ -4454,109 +4457,150 @@ function _getPublicKey() {
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context2.next = 2;
+          _context2.prev = 0;
+          _context2.next = 3;
           return _solidLogic.store.fetcher.load(webId);
-        case 2:
-          _context2.next = 4;
+        case 3:
+          _context2.next = 5;
           return (0, _accessData.pubKeyUrl)(webId);
-        case 4:
+        case 5:
           publicKeyDoc = _context2.sent;
-          _context2.prev = 5;
-          _context2.next = 8;
+          _context2.prev = 6;
+          _context2.next = 9;
           return _solidLogic.store.fetcher.load(publicKeyDoc);
-        case 8:
+        case 9:
           // url.href)
           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;
-          _context2.t0 = _context2["catch"](5);
+        case 13:
+          _context2.prev = 13;
+          _context2.t0 = _context2["catch"](6);
+          debug.error(_context2.t0);
           return _context2.abrupt("return", undefined);
-        case 15:
+        case 17:
+          _context2.next = 23;
+          break;
+        case 19:
+          _context2.prev = 19;
+          _context2.t1 = _context2["catch"](0);
+          debug.error(_context2.t1);
+          return _context2.abrupt("return", undefined);
+        case 23:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[5, 12]]);
+    }, _callee2, null, [[0, 19], [6, 13]]);
   }));
   return _getPublicKey.apply(this, arguments);
 }
-function getPrivateKey(_x2) {
-  return _getPrivateKey.apply(this, arguments);
+function validPublicKey(webId, publicKey, privateKey) {
+  if (privateKey && publicKey !== generatePublicKey(privateKey)) {
+    if (confirm('This is strange the publicKey is not valid for\n' + (webId === null || webId === void 0 ? void 0 : webId.uri) + '\'shall we repair keeping the private key ?')) return false;
+  }
+  return true;
 }
-function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
-    var publicKeyDoc, privateKeyDoc, publicKey, privateKey, validPublicKey, del, add, newPublicKey, keyContainer;
+function generateAndStorePublicKey(_x2, _x3, _x4, _x5) {
+  return _generateAndStorePublicKey.apply(this, arguments);
+}
+function _generateAndStorePublicKey() {
+  _generateAndStorePublicKey = (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) {
         case 0:
-          _context3.next = 2;
+          del = [$rdf.st(webId, ns.solid('publicKey'), $rdf.lit(publicKey || ''), _solidLogic.store.sym(publicKeyDoc))];
+          newPublicKey = generatePublicKey(privateKey);
+          add = [$rdf.st(webId, ns.solid('publicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
+          _context3.next = 5;
+          return saveKeyAndHandleAcl(publicKeyDoc, del, add);
+        case 5:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _generateAndStorePublicKey.apply(this, arguments);
+}
+function createAndSaveKeyPairs(_x6, _x7, _x8, _x9) {
+  return _createAndSaveKeyPairs.apply(this, arguments);
+}
+function _createAndSaveKeyPairs() {
+  _createAndSaveKeyPairs = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(webId, publicKey, privateKeyDoc, publicKeyDoc) {
+    var privateKey, add;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          privateKey = generatePrivateKey();
+          add = [$rdf.st(webId, ns.solid('privateKey'), $rdf.literal(privateKey), _solidLogic.store.sym(privateKeyDoc))];
+          _context4.next = 4;
+          return saveKeyAndHandleAcl(privateKeyDoc, [], add, webId.uri);
+        case 4:
+          _context4.next = 6;
+          return generateAndStorePublicKey(webId, privateKey, publicKey, publicKeyDoc);
+        case 6:
+          return _context4.abrupt("return", privateKey);
+        case 7:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _createAndSaveKeyPairs.apply(this, arguments);
+}
+function getPrivateKey(_x10) {
+  return _getPrivateKey.apply(this, arguments);
+}
+function _getPrivateKey() {
+  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(webId) {
+    var publicKeyDoc, privateKeyDoc, publicKey, privateKey, keyContainer;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
           return _solidLogic.store.fetcher.load(webId);
         case 2:
-          _context3.next = 4;
+          _context5.next = 4;
           return (0, _accessData.pubKeyUrl)(webId);
         case 4:
-          publicKeyDoc = _context3.sent;
-          _context3.next = 7;
+          publicKeyDoc = _context5.sent;
+          _context5.next = 7;
           return (0, _accessData.privKeyUrl)(webId);
         case 7:
-          privateKeyDoc = _context3.sent;
-          _context3.next = 10;
+          privateKeyDoc = _context5.sent;
+          _context5.next = 10;
           return (0, _accessData.getExistingPublicKey)(webId, publicKeyDoc);
         case 10:
-          publicKey = _context3.sent;
-          _context3.next = 13;
+          publicKey = _context5.sent;
+          _context5.next = 13;
           return (0, _accessData.getExistingPrivateKey)(webId, privateKeyDoc);
         case 13:
-          privateKey = _context3.sent;
-          // is publicKey valid ?
-          validPublicKey = true;
-          if (privateKey && publicKey !== generatePublicKey(privateKey)) {
-            if (confirm('This is strange the publicKey is not valid for\n' + (webId === null || webId === void 0 ? void 0 : webId.uri) + '\'shall we repair keeping the private key ?')) validPublicKey = false;
-          }
-
-          // create key pair or repair publicKey
-          if (!(!privateKey || !publicKey || !validPublicKey)) {
-            _context3.next = 34;
-            break;
-          }
-          del = [];
-          add = [];
+          privateKey = _context5.sent;
           if (privateKey) {
-            _context3.next = 24;
+            _context5.next = 18;
             break;
           }
-          // add = []
-          privateKey = generatePrivateKey();
-          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:
-          if (!(!publicKey || !validPublicKey)) {
-            _context3.next = 31;
+          _context5.next = 17;
+          return createAndSaveKeyPairs(webId, publicKey, privateKeyDoc, publicKeyDoc);
+        case 17:
+          privateKey = _context5.sent;
+        case 18:
+          if (validPublicKey(webId, publicKey, privateKey)) {
+            _context5.next = 21;
             break;
           }
-          del = [];
-          // delete invalid public key
-          if (publicKey) {
-            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, ns.solid('publicKey'), $rdf.literal(newPublicKey), _solidLogic.store.sym(publicKeyDoc))];
-          _context3.next = 31;
-          return saveKey(publicKeyDoc, del, add);
-        case 31:
+          _context5.next = 21;
+          return generateAndStorePublicKey(webId, privateKey, publicKey, publicKeyDoc);
+        case 21:
           keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
-          _context3.next = 34;
+          _context5.next = 24;
           return (0, _acl.setAcl)(keyContainer, (0, _acl.keyContainerAclBody)(webId.uri));
-        case 34:
-          return _context3.abrupt("return", privateKey);
-        case 35:
+        case 24:
+          return _context5.abrupt("return", privateKey);
+        case 25:
         case "end":
-          return _context3.stop();
+          return _context5.stop();
       }
-    }, _callee3);
+    }, _callee5);
   }));
   return _getPrivateKey.apply(this, arguments);
 }
@@ -4599,7 +4643,7 @@ var deleteKeyAcl = /*#__PURE__*/function () {
       }
     }, _callee, null, [[4, 11]]);
   }));
-  return function deleteKeyAcl(_x3) {
+  return function deleteKeyAcl(_x11) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4609,36 +4653,36 @@ var deleteKeyAcl = /*#__PURE__*/function () {
  * create/edit keyDoc
  * set keyDoc acl
  */
-function saveKey(_x4, _x5, _x6) {
-  return _saveKey.apply(this, arguments);
+function saveKeyAndHandleAcl(_x12, _x13, _x14) {
+  return _saveKeyAndHandleAcl.apply(this, arguments);
 }
-function _saveKey() {
-  _saveKey = (0, _asyncToGenerator2["default"])(function (keyDoc, del, add) {
+function _saveKeyAndHandleAcl() {
+  _saveKeyAndHandleAcl = (0, _asyncToGenerator2["default"])(function (keyDoc, del, add) {
     var me = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
-    return /*#__PURE__*/_regenerator["default"].mark(function _callee4() {
+    return /*#__PURE__*/_regenerator["default"].mark(function _callee6() {
       var aclBody;
-      return _regenerator["default"].wrap(function _callee4$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      return _regenerator["default"].wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context4.next = 2;
+            _context6.next = 2;
             return deleteKeyAcl(keyDoc);
           case 2:
-            _context4.next = 4;
+            _context6.next = 4;
             return _solidLogic.store.updater.updateMany(del, add);
           case 4:
             // or a promise store.updater.update ?
             // create READ only ACL
             aclBody = (0, _acl.keyAclBody)(keyDoc, me);
-            _context4.next = 7;
+            _context6.next = 7;
             return (0, _acl.setAcl)(keyDoc, aclBody);
           case 7:
           case "end":
-            return _context4.stop();
+            return _context6.stop();
         }
-      }, _callee4);
+      }, _callee6);
     })();
   });
-  return _saveKey.apply(this, arguments);
+  return _saveKeyAndHandleAcl.apply(this, arguments);
 }
 //# sourceMappingURL=keys.js.map
 
@@ -14324,8 +14368,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-06-03T23:48:25Z',
-  commit: '6a319caf69ef4ecc171a5adcb375dea108d002c2',
+  buildTime: '2023-06-06T08:34:10Z',
+  commit: '7b1c0b2d7ab8de07add05b789f87dfdbeb68b960',
   npmInfo: {
     'solid-ui': '2.4.28',
     npm: '8.19.4',