solid-ui 2.4.28-21f105c8 → 2.4.28-44bfba6e

package/dist/solid-ui.js

@@ -4127,32 +4127,39 @@ function _infiniteMessageArea() {
                     date = extremity.messageTable.date; // day in mssecs
                     // Are we at the top of a thread?
                     if (!(backwards && earliest.limit && date <= earliest.limit)) {
-                      _context4.next = 4;
+                      _context4.next = 7;
                       break;
                     }
+                    if (liveMessageTable) {
+                      _context4.next = 6;
+                      break;
+                    }
+                    _context4.next = 6;
+                    return appendCurrentMessages();
+                  case 6:
                     return _context4.abrupt("return", true);
-                  case 4:
+                  case 7:
                     debug.log(' insertPreviousMessages:  loadPrevious given date ' + date);
-                    _context4.next = 7;
+                    _context4.next = 10;
                     return dateFolder.loadPrevious(date, backwards);
-                  case 7:
+                  case 10:
                     date = _context4.sent;
                     // backwards
                     debug.log(' insertPreviousMessages:  loadPrevious returns date ' + date);
                     debug.log("insertPreviousMessages: from ".concat(backwards ? 'backwards' : 'forwards', " loadPrevious: ").concat(date));
                     if (!(!date && !backwards && !liveMessageTable)) {
-                      _context4.next = 13;
+                      _context4.next = 16;
                       break;
                     }
-                    _context4.next = 13;
+                    _context4.next = 16;
                     return appendCurrentMessages();
-                  case 13:
+                  case 16:
                     if (date) {
-                      _context4.next = 15;
+                      _context4.next = 18;
                       break;
                     }
                     return _context4.abrupt("return", true);
-                  case 15:
+                  case 18:
                     // done
                     live = false;
                     if (!backwards) {
@@ -4160,9 +4167,9 @@ function _infiniteMessageArea() {
                       doc = dateFolder.leafDocumentFromDate(date);
                       live = doc.sameTerm(todayDoc); // Is this todays?
                     }
-                    _context4.next = 19;
+                    _context4.next = 22;
                     return createMessageTable(date, live);
-                  case 19:
+                  case 22:
                     newMessageTable = _context4.sent;
                     extremity.messageTable = newMessageTable; // move pointer to earliest
                     if (backwards ? newestFirst : !newestFirst) {
@@ -4173,7 +4180,7 @@ function _infiniteMessageArea() {
                       div.insertBefore(newMessageTable, div.firstChild);
                     }
                     return _context4.abrupt("return", live);
-                  case 23:
+                  case 26:
                   case "end":
                     return _context4.stop();
                 }
@@ -4408,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"));
@@ -4447,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);
 }
@@ -4592,7 +4643,7 @@ var deleteKeyAcl = /*#__PURE__*/function () {
       }
     }, _callee, null, [[4, 11]]);
   }));
-  return function deleteKeyAcl(_x3) {
+  return function deleteKeyAcl(_x11) {
     return _ref.apply(this, arguments);
   };
 }();
@@ -4602,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
 
@@ -4848,13 +4899,13 @@ function _renderMessageRow() {
           if (straightReplies.length > 1) {
             debug.log('renderMessageRow: found normal replies: ', straightReplies);
           }
-          debug.log('@@@@ alain thread');
-          // debug.log(replies)
-          // debug.log(thread)
-          thread = _solidLogic.store.any(msgId, ns.sioc('has_reply')); // if (!thread)
-          debug.log(thread);
+          debug.log('@@@@ is thread');
+          if (!thread) {
+            // thread = store.any(message, ns.sioc('has_reply'))
+            thread = _solidLogic.store.any(null, ns.sioc('has_member'), message);
+          }
           // get signature
-          signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "proofValue"))); // set message object
+          signature = _solidLogic.store.any(msgId, $rdf.sym("".concat(_signature.SEC, "proofValue"))); // set proof message object
           msg = (0, _signature.getBlankMsg)();
           msg.id = msgId.uri;
           msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
@@ -4880,9 +4931,9 @@ function _renderMessageRow() {
               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);
             });
           }
-          _context10.next = 39;
+          _context10.next = 38;
           return (0, _chatLogic.originalVersion)(message);
-        case 39:
+        case 38:
           originalMessage = _context10.sent;
           edited = !message.sameTerm(originalMessage); // @@ load it first  @@   Or display the new data at the old date.
           // @@@ kludge!
@@ -4939,9 +4990,9 @@ function _renderMessageRow() {
             bgcolor = colorizeByAuthor ? pad.lightColorHash(creator) : getBgColor(fresh);
             para.setAttribute('style', messageBodyStyle + 'background-color: ' + bgcolor + ';');
           }
-          _context10.next = 60;
+          _context10.next = 59;
           return (0, _messageTools.sentimentStripLinked)(message, message.doc());
-        case 60:
+        case 59:
           strip = _context10.sent;
           if (strip.children.length) {
             td2.appendChild(dom.createElement('br'));
@@ -5006,7 +5057,7 @@ function _renderMessageRow() {
             }));
           }
           return _context10.abrupt("return", messageRow);
-        case 69:
+        case 68:
         case "end":
           return _context10.stop();
       }
@@ -5946,96 +5997,27 @@ exports.verifySignature = verifySignature;
 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 _sha = __webpack_require__(/*! @noble/hashes/sha256 */ "./node_modules/@noble/hashes/sha256.js");
-// import {utf8Encoder} from './utils'
-// import { getPublicKey } from './keys'
-
 var utf8Decoder = new TextDecoder('utf-8');
 exports.utf8Decoder = utf8Decoder;
 var utf8Encoder = new TextEncoder();
 exports.utf8Encoder = utf8Encoder;
 var SEC = 'https://w3id.org/security#'; // Proof, VerificationMethod
-// export const CERT = 'http://www.w3.org/ns/auth/cert#' // PrivateKey, PublicKey, key
-
-/* eslint-disable no-unused-vars */
-/* export enum Kind {
-  Metadata = 0,
-  Text = 1,
-  RecommendRelay = 2,
-  Contacts = 3,
-  EncryptedDirectMessage = 4,
-  EventDeletion = 5,
-  Reaction = 7,
-  BadgeAward = 8,
-  ChannelCreation = 40,
-  ChannelMetadata = 41,
-  ChannelMessage = 42,
-  ChannelHideMessage = 43,
-  ChannelMuteUser = 44,
-  Report = 1984,
-  ZapRequest = 9734,
-  Zap = 9735,
-  RelayList = 10002,
-  ClientAuth = 22242,
-  BadgeDefinition = 30008,
-  ProfileBadge = 30009,
-  Article = 30023
-} */
 exports.SEC = SEC;
 function getBlankMsg() {
   return {
     id: '',
     created: '',
-    dateDeleted: '',
-    // TODO to remove if not used
     content: '',
-    maker: '',
-    sig: '' // TODO to remove if not used
+    maker: ''
   };
 }
-
-/* export function finishMsg (t: MsgTemplate, privateKey: string): Message {
-  // to update to chat message triples
-  const message = t as Message
-  // message.pubkey = getPublicKey(privateKey)
-  message.id = getMsgHash(message)
-  message.sig = signMsg(message, privateKey)
-  return message
-} */
-
 function serializeMsg(msg) {
-  // to update to chat messages triples
-  /* if (!validateMsg(msg))
-    throw new Error("can't serialize message with wrong or missing properties") */
-
   return JSON.stringify(msg);
 }
 function getMsgHash(message) {
   var msgHash = (0, _sha.sha256)(utf8Encoder.encode(serializeMsg(message)));
   return (0, _utils.bytesToHex)(msgHash);
 }
-
-// const isRecord = (obj: unknown): obj is Record<string, unknown> => obj instanceof Object
-
-/* export function validateMsg<T> (message: T): message is T & UnsignedMsg {
-  if (!isRecord(message)) return false
-  if (typeof message.kind !== 'number') return false
-  if (typeof message.content !== 'string') return false
-  if (typeof message.created_at !== 'number') return false
-  if (typeof message.pubkey !== 'string') return false
-  if (!message.pubkey.match(/^[a-f0-9]{64}$/)) return false
-
-  if (!Array.isArray(message.tags)) return false
-  for (let i = 0; i < message.tags.length; i++) {
-    let tag = message.tags[i]
-    if (!Array.isArray(tag)) return false
-    for (let j = 0; j < tag.length; j++) {
-      if (typeof tag[j] === 'object') return false
-    }
-  }
-
-  return true
-} */
-
 function verifySignature(sig, message, pubKey) {
   return _secp256k.schnorr.verify(sig, getMsgHash(message), pubKey);
 }
@@ -14025,176 +14007,96 @@ var _asyncToGenerator2 = _interopRequireDefault(__webpack_require__(/*! @babel/r
 var debug = _interopRequireWildcard(__webpack_require__(/*! ../../debug */ "./lib/debug.js"));
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 var ns = _interopRequireWildcard(__webpack_require__(/*! ../../ns */ "./lib/ns.js"));
+var _otherHelpers = __webpack_require__(/*! ./otherHelpers */ "./lib/utils/keyHelpers/otherHelpers.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; }
-/* export const getPodRoot = async (webId: NamedNode) => {
-  const webIdURL = new URL(webId.uri)
-  // find storages in webId document
-  await store.fetcher.load(webId.uri)
-  const storages = store.each(webId, ns.space('storage'), null, webId.doc())
-  var podRoot: NamedNode | undefined
-  if (!storages?.length) {
-    // find storage recursively in webId URL
-    let path = webIdURL.pathname
-    while (path.length) {
-      path = path.substring(0, path.lastIndexOf('/'))
-      podRoot = store.sym(webIdURL.origin + path + '/')
-      const res = await store.fetcher.webOperation('HEAD', podRoot.uri)
-      if (res.headers.get('link')?.includes(ns.space('Storage').value)) break
-      if (!path) debug.warn(`Current user storage not found for\n${webId}`)
-    }
-  } else {
-    // give preference to storage in webId root
-    podRoot = storages.find((storage) => webIdURL.origin === new URL(storage.value).origin) as NamedNode
-    if (!podRoot) podRoot = storages[0] as NamedNode
+var pubKeyUrl = function pubKeyUrl(webId) {
+  var url;
+  try {
+    var root = (0, _otherHelpers.getRootIfPreferencesExist)(webId);
+    url = "".concat(root, "/profile/keys/publicKey.ttl");
+  } catch (err) {
+    debug.error(err);
   }
-
-  return podRoot as NamedNode
-} */
-
-var pubKeyUrl = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var _store$any, _parentSettings;
-    var parentSettings;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          parentSettings = (_store$any = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any === void 0 ? void 0 : _store$any.value;
-          parentSettings = (_parentSettings = parentSettings) === null || _parentSettings === void 0 ? void 0 : _parentSettings.split('/').slice(0, -2).join('/');
-          if (parentSettings) {
-            _context.next = 4;
-            break;
-          }
-          throw new Error("prefererencesFile is expected to exist in ".concat(webId.doc));
-        case 4:
-          return _context.abrupt("return", "".concat(parentSettings, "/profile/keys/publicKey.ttl"));
-        case 5:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function pubKeyUrl(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
+  return url;
+};
 exports.pubKeyUrl = pubKeyUrl;
-function getExistingPublicKey(_x2, _x3) {
+var privKeyUrl = function privKeyUrl(webId) {
+  var url;
+  try {
+    var root = (0, _otherHelpers.getRootIfPreferencesExist)(webId);
+    url = "".concat(root, "/keys/privateKey.ttl");
+  } catch (err) {
+    debug.error(err);
+  }
+  return url;
+};
+exports.privKeyUrl = privKeyUrl;
+function getExistingPublicKey(_x, _x2) {
   return _getExistingPublicKey.apply(this, arguments);
 }
 function _getExistingPublicKey() {
-  _getExistingPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, publicKeyUrl) {
-    return _regenerator["default"].wrap(function _callee3$(_context3) {
-      while (1) switch (_context3.prev = _context3.next) {
+  _getExistingPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId, publicKeyUrl) {
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
-          _context3.next = 2;
+          _context.next = 2;
           return getKeyIfExists(webId, publicKeyUrl, 'publicKey');
         case 2:
-          return _context3.abrupt("return", _context3.sent);
+          return _context.abrupt("return", _context.sent);
         case 3:
         case "end":
-          return _context3.stop();
+          return _context.stop();
       }
-    }, _callee3);
+    }, _callee);
   }));
   return _getExistingPublicKey.apply(this, arguments);
 }
-var privKeyUrl = /*#__PURE__*/function () {
-  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var _store$any2, _settings;
-    var settings;
-    return _regenerator["default"].wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
-        case 0:
-          settings = (_store$any2 = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any2 === void 0 ? void 0 : _store$any2.value;
-          settings = (_settings = settings) === null || _settings === void 0 ? void 0 : _settings.split('/').slice(0, -1).join('/');
-          if (settings) {
-            _context2.next = 4;
-            break;
-          }
-          throw new Error("prefererencesFile is expected to exist in ".concat(webId.doc));
-        case 4:
-          return _context2.abrupt("return", "".concat(settings, "/keys/privateKey.ttl"));
-        case 5:
-        case "end":
-          return _context2.stop();
-      }
-    }, _callee2);
-  }));
-  return function privKeyUrl(_x4) {
-    return _ref2.apply(this, arguments);
-  };
-}();
-exports.privKeyUrl = privKeyUrl;
-function getExistingPrivateKey(_x5, _x6) {
+function getExistingPrivateKey(_x3, _x4) {
   return _getExistingPrivateKey.apply(this, arguments);
 }
 function _getExistingPrivateKey() {
-  _getExistingPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(webId, privateKeyUrl) {
-    return _regenerator["default"].wrap(function _callee4$(_context4) {
-      while (1) switch (_context4.prev = _context4.next) {
+  _getExistingPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId, privateKeyUrl) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          _context4.next = 2;
+          _context2.next = 2;
           return getKeyIfExists(webId, privateKeyUrl, 'privateKey');
         case 2:
-          return _context4.abrupt("return", _context4.sent);
+          return _context2.abrupt("return", _context2.sent);
         case 3:
         case "end":
-          return _context4.stop();
+          return _context2.stop();
       }
-    }, _callee4);
+    }, _callee2);
   }));
   return _getExistingPrivateKey.apply(this, arguments);
 }
-function getKeyIfExists(_x7, _x8, _x9) {
+function getKeyIfExists(_x5, _x6, _x7) {
   return _getKeyIfExists.apply(this, arguments);
 }
 function _getKeyIfExists() {
-  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(webId, keyUrl, keyType) {
+  _getKeyIfExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, keyUrl, keyType) {
     var key;
-    return _regenerator["default"].wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          _context5.prev = 0;
-          _context5.next = 3;
+          _context3.prev = 0;
+          _context3.next = 3;
           return _solidLogic.store.fetcher.load(keyUrl);
         case 3:
           key = _solidLogic.store.any(webId, ns.solid(keyType)); // store.sym(CERT + keyType))
-          return _context5.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+          return _context3.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
         case 7:
-          _context5.prev = 7;
-          _context5.t0 = _context5["catch"](0);
-          if (!(_context5.t0.response.status === 404)) {
-            _context5.next = 24;
-            break;
-          }
-          debug.log('createIfNotExists: doc does NOT exist, will create... ' + keyUrl);
-          _context5.prev = 11;
-          _context5.next = 14;
-          return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
-            data: '',
-            contentType: 'text/turtle'
-          });
-        case 14:
-          _context5.next = 20;
-          break;
-        case 16:
-          _context5.prev = 16;
-          _context5.t1 = _context5["catch"](11);
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context5.t1);
-          throw _context5.t1;
-        case 20:
-          delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
-          // debug.log('createIfNotExists doc created ok ' + doc)
-          return _context5.abrupt("return", undefined);
-        case 24:
-          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context5.t0);
-          throw _context5.t0;
-        case 26:
+          _context3.prev = 7;
+          _context3.t0 = _context3["catch"](0);
+          debug.error('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t0);
+          return _context3.abrupt("return", undefined);
+        case 11:
         case "end":
-          return _context5.stop();
+          return _context3.stop();
       }
-    }, _callee5, null, [[0, 7], [11, 16]]);
+    }, _callee3, null, [[0, 7]]);
   }));
   return _getKeyIfExists.apply(this, arguments);
 }
@@ -14305,6 +14207,39 @@ exports.keyAclBody = keyAclBody;
 
 /***/ }),
 
+/***/ "./lib/utils/keyHelpers/otherHelpers.js":
+/*!**********************************************!*\
+  !*** ./lib/utils/keyHelpers/otherHelpers.js ***!
+  \**********************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.getRootIfPreferencesExist = void 0;
+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; }
+// Will rename this file later. We will probably be using solid-logic anyway
+// moved it out so I can mock
+
+var getRootIfPreferencesExist = function getRootIfPreferencesExist(webId) {
+  var _store$any, _root;
+  var root = (_store$any = _solidLogic.store.any(webId, ns.space('preferencesFile'), null, webId.doc())) === null || _store$any === void 0 ? void 0 : _store$any.value;
+  root = (_root = root) === null || _root === void 0 ? void 0 : _root.split('/').slice(0, -2).join('/');
+  if (!root) throw new Error("prefererencesFile is expected to exist in ".concat(webId));
+  return root;
+};
+exports.getRootIfPreferencesExist = getRootIfPreferencesExist;
+//# sourceMappingURL=otherHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/label.js":
 /*!****************************!*\
   !*** ./lib/utils/label.js ***!
@@ -14433,8 +14368,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-05-29T17:22:09Z',
-  commit: '21f105c85cf152232421970c17d78f5c8cfa3d20',
+  buildTime: '2023-06-06T08:34:20Z',
+  commit: '44bfba6e5d833499af54ef66004e9ada0cd53220',
   npmInfo: {
     'solid-ui': '2.4.28',
     npm: '8.19.4',