solid-ui 2.4.27-f3d1fd8f → 2.4.27-f7a2eabe

package/dist/solid-ui.js

@@ -2710,9 +2710,10 @@ var ChatChannel = /*#__PURE__*/function () {
                 msg.maker = me.uri;
                 // privateKey the cached private key of me, cached in store
                 _context2.next = 32;
-                return (0, _keys.getPrivateKey)(me.uri);
+                return (0, _keys.getPrivateKey)(me);
               case 32:
                 privateKey = _context2.sent;
+                // me.uri)
                 // const privateKey0 = 'a11bc5d2eee6cdb3b37f5473a712cad905ccfb13fb2ccdbf1be0a1ac4fdc7d2a'
                 // const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
                 pubKey = (0, _keys.getPublicKey)(me.uri);
@@ -4043,6 +4044,7 @@ var _utils = __webpack_require__(/*! @noble/hashes/utils */ "./node_modules/@nob
 var _signature = __webpack_require__(/*! ./signature */ "./lib/chat/signature.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 _cryptoKeyHelpers = __webpack_require__(/*! ../utils/cryptoKeyHelpers */ "./lib/utils/cryptoKeyHelpers.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; }
 function generatePrivateKey() {
@@ -4051,160 +4053,274 @@ function generatePrivateKey() {
 function generatePublicKey(privateKey) {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
 }
-function getPublicKey(webId) {
-  var publicKey = publicKeyExists(webId);
-  return publicKey;
+function getPublicKey(_x) {
+  return _getPublicKey.apply(this, arguments);
 }
-var pubKeyUrl = function pubKeyUrl(webId) {
-  var url = new URL(webId);
-  var publicKeyUrl = url.origin + '/profile/keys/publicKey.ttl';
-  return publicKeyUrl;
-};
-function publicKeyExists(_x) {
-  return _publicKeyExists.apply(this, arguments);
-}
-function _publicKeyExists() {
-  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var publicKey;
+function _getPublicKey() {
+  _getPublicKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKeyDoc, key;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           _context.next = 2;
-          return _solidLogic.store.fetcher.load(pubKeyUrl(webId));
+          return _solidLogic.store.fetcher.load(webId);
         case 2:
-          // url.href)
-          publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
-          return _context.abrupt("return", publicKey === null || publicKey === void 0 ? void 0 : publicKey.value);
+          _context.next = 4;
+          return (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
         case 4:
+          publicKeyDoc = _context.sent;
+          _context.prev = 5;
+          _context.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);
+        case 12:
+          _context.prev = 12;
+          _context.t0 = _context["catch"](5);
+          return _context.abrupt("return", undefined);
+        case 15:
         case "end":
           return _context.stop();
       }
-    }, _callee);
+    }, _callee, null, [[5, 12]]);
   }));
-  return _publicKeyExists.apply(this, arguments);
+  return _getPublicKey.apply(this, arguments);
 }
-var privKeyUrl = function privKeyUrl(webId) {
-  var url = new URL(webId);
-  var privateKeyUrl = url.origin + '/profile/keys/privateKey.ttl';
-  return privateKeyUrl;
-};
-function privateKeyExists(_x2) {
-  return _privateKeyExists.apply(this, arguments);
+function getPrivateKey(_x2) {
+  return _getPrivateKey.apply(this, arguments);
 }
-function _privateKeyExists() {
-  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
-    var privateKeyUrl, privateKey, _err$response, data, contentType, response;
+/**
+ * key container ACL
+ * @param me
+ * @returns aclBody
+ */
+function _getPrivateKey() {
+  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(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) {
         case 0:
-          /* const url = new URL(webId)
-          const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          privateKeyUrl = privKeyUrl(webId);
-          /* debug.warn('Alain privateKeyExists')
-          debug.warn(webId)
-          debug.warn(privateKeyUrl) */
-          _context2.prev = 1;
+          _context2.next = 2;
+          return _solidLogic.store.fetcher.load(webId);
+        case 2:
           _context2.next = 4;
-          return _solidLogic.store.fetcher.load(privateKeyUrl);
+          return (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
         case 4:
-          privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PrivateKey'));
-          return _context2.abrupt("return", privateKey === null || privateKey === void 0 ? void 0 : privateKey.value);
-        case 8:
-          _context2.prev = 8;
-          _context2.t0 = _context2["catch"](1);
-          if (!((_context2.t0 === null || _context2.t0 === void 0 ? void 0 : (_err$response = _context2.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
-            _context2.next = 25;
+          publicKeyDoc = _context2.sent;
+          _context2.next = 7;
+          return (0, _cryptoKeyHelpers.privKeyUrl)(webId);
+        case 7:
+          privateKeyDoc = _context2.sent;
+          _context2.next = 10;
+          return (0, _cryptoKeyHelpers.publicKeyExists)(webId);
+        case 10:
+          publicKey = _context2.sent;
+          _context2.next = 13;
+          return (0, _cryptoKeyHelpers.privateKeyExists)(webId);
+        case 13:
+          privateKey = _context2.sent;
+          // is publicKey valid ?
+          validPublicKey = true;
+          if (privateKey && publicKey !== generatePublicKey(privateKey)) {
+            if (confirm('This is strange the publicKey is not valid for\n' + webId + '\'shall we repair keeping the private key ?')) validPublicKey = false;
+          }
+
+          // create key pair or repair publicKey
+          if (!(!privateKey || !publicKey || !validPublicKey)) {
+            _context2.next = 34;
             break;
           }
-          _context2.prev = 11;
-          // create privateKey resource
-          data = '';
-          contentType = 'text/ttl';
-          _context2.next = 16;
-          return _solidLogic.store.fetcher.webOperation('PUT', privateKeyUrl, {
-            data: data,
-            contentType: contentType
-          });
-        case 16:
-          response = _context2.sent;
-          _context2.next = 23;
-          break;
-        case 19:
-          _context2.prev = 19;
-          _context2.t1 = _context2["catch"](11);
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t1);
-          throw _context2.t1;
-        case 23:
-          delete _solidLogic.store.fetcher.requested[privateKeyUrl]; // delete cached 404 error
-          return _context2.abrupt("return", undefined);
-        case 25:
-          debug.log('createIfNotExists doc FAILED: ' + privateKeyUrl + ': ' + _context2.t0);
-          throw _context2.t0;
-        case 27:
+          del = [];
+          add = []; // if (privateKey) del.push($rdf.st(webId, store.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), store.sym(privateKeyDoc)))
+          if (privateKey) {
+            _context2.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;
+          return saveKey(privateKeyDoc, [], add, webId.uri);
+        case 24:
+          if (!(!publicKey || !validPublicKey)) {
+            _context2.next = 31;
+            break;
+          }
+          del = [];
+          // delete invalid public key
+          if (publicKey) {
+            del = [$rdf.st(webId, _solidLogic.store.sym(_signature.CERT + '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))];
+          _context2.next = 31;
+          return saveKey(publicKeyDoc, del, add);
+        case 31:
+          keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
+          _context2.next = 34;
+          return setAcl(keyContainer, keyContainerAclBody(webId.uri));
+        case 34:
+          return _context2.abrupt("return", privateKey);
+        case 35:
         case "end":
           return _context2.stop();
       }
-    }, _callee2, null, [[1, 8], [11, 19]]);
+    }, _callee2);
   }));
-  return _privateKeyExists.apply(this, arguments);
-}
-function getPrivateKey(_x3) {
   return _getPrivateKey.apply(this, arguments);
 }
-function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
-    var publicKeyUrl, privateKeyUrl, publicKey, privateKey, del, add;
+var keyContainerAclBody = function keyContainerAclBody(me) {
+  var aclBody = "\n@prefix : <#>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix key: <./>.\n\n:ReadWrite\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agent <".concat(me, ">;\n    acl:mode acl:Read, acl:Write.\n");
+  return aclBody;
+};
+
+/**
+ * Read only ACL
+ * @param keyDoc
+ * @param me
+ * @returns aclBody
+ */
+var keyAclBody = function keyAclBody(keyDoc, me) {
+  var keyAgent = 'acl:agentClass foaf:Agent'; // publicKey
+  if (me !== null && me !== void 0 && me.length) keyAgent = "acl:agent <".concat(me, ">"); // privateKey
+  var aclBody = "\n@prefix foaf: <http://xmlns.com/foaf/0.1/>.\n@prefix acl: <http://www.w3.org/ns/auth/acl#>.\n<#Read>\n    a acl:Authorization;\n    ".concat(keyAgent, ";\n    acl:accessTo <").concat(keyDoc.split('/').pop(), ">;\n    acl:mode acl:Read.\n");
+  return aclBody;
+};
+
+/**
+ * set ACL
+ * @param keyDoc
+ * @param aclBody
+ */
+function setAcl(_x3, _x4) {
+  return _setAcl.apply(this, arguments);
+}
+/**
+ * delete acl if keydoc exists
+ * create/edit keyDoc
+ * set keyDoc acl
+ */
+function _setAcl() {
+  _setAcl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(keyDoc, aclBody) {
+    var keyAclDoc, response, aclResponse;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          /* const url = new URL(webId)
-          url.hash = '' */
-          /* const privateKeyUrl = url.protocol + '//' + url.host + '/profile/privateKey.ttl' */
-          publicKeyUrl = pubKeyUrl(webId);
-          privateKeyUrl = privKeyUrl(webId); // find publickey
-          _context3.next = 4;
-          return publicKeyExists(webId);
-        case 4:
-          publicKey = _context3.sent;
-          _context3.next = 7;
-          return privateKeyExists(webId);
-        case 7:
-          privateKey = _context3.sent;
-          // debug.warn('privateKey ' + privateKey)
-          if (privateKey && publicKey !== generatePublicKey(privateKey)) debug.warn('publicKey is not valid');
-
-          // simulate new key pair
-          /* const newPrivateKey = generatePrivateKey()
-          const newPublicKey = generatePublicKey(newPrivateKey)
-          debug.log('newPrivateKey ' + newPrivateKey)
-          debug.log('newPublicKey ' + newPublicKey) */
-
-          // create key pair
-          if (!(!privateKey || !publicKey)) {
-            _context3.next = 20;
+          _context3.next = 2;
+          return _solidLogic.store.fetcher.load(keyDoc);
+        case 2:
+          // FIXME: check the Why value on this quad:
+          debug.log(_solidLogic.store.statementsMatching(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl')));
+          keyAclDoc = _solidLogic.store.any(_solidLogic.store.sym(keyDoc), _solidLogic.store.sym('http://www.iana.org/assignments/link-relations/acl'));
+          if (keyAclDoc) {
+            _context3.next = 6;
             break;
           }
-          del = [];
-          add = [];
-          if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyUrl)));
-          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyUrl)));
-          privateKey = generatePrivateKey();
-          publicKey = generatePublicKey(privateKey);
-          /* debug.log('newPrivateKey-1 ' + privateKey)
-          debug.log('newPublicKey-1 ' + publicKey) */
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyUrl)));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(publicKey), $rdf.sym(publicKeyUrl)));
+          throw new Error('Key ACL doc not found!');
+        case 6:
+          _context3.prev = 6;
+          _context3.next = 9;
+          return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+        case 9:
+          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 = 18;
+          break;
+        case 13:
+          _context3.prev = 13;
+          _context3.t0 = _context3["catch"](6);
+          if (!(_context3.t0.response.status !== 404)) {
+            _context3.next = 17;
+            break;
+          }
+          throw new Error(_context3.t0);
+        case 17:
+          debug.log('delete ' + keyAclDoc.value + ' ' + _context3.t0.response.status); // should test 404 and 2xx
+        case 18:
           _context3.next = 20;
-          return _solidLogic.store.updater.updateMany(del, add);
+          return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
+            data: aclBody,
+            contentType: 'text/turtle'
+          });
         case 20:
-          return _context3.abrupt("return", privateKey);
+          aclResponse = _context3.sent;
         case 21:
         case "end":
           return _context3.stop();
       }
-    }, _callee3);
+    }, _callee3, null, [[6, 13]]);
   }));
-  return _getPrivateKey.apply(this, arguments);
+  return _setAcl.apply(this, arguments);
+}
+function saveKey(_x5, _x6, _x7) {
+  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 _callee4() {
+      var keyAclDoc, response, aclBody;
+      return _regenerator["default"].wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            _context4.next = 2;
+            return _solidLogic.store.fetcher.load(keyDoc);
+          case 2:
+            _context4.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) {
+              _context4.next = 17;
+              break;
+            }
+            _context4.prev = 5;
+            _context4.next = 8;
+            return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+          case 8:
+            response = _context4.sent;
+            // this may fail if webId is not an owner
+            debug.log('delete ' + keyAclDoc.value + ' ' + response.status); // should test 404 and 2xx
+            _context4.next = 17;
+            break;
+          case 12:
+            _context4.prev = 12;
+            _context4.t0 = _context4["catch"](5);
+            if (!(_context4.t0.response.status !== 404)) {
+              _context4.next = 16;
+              break;
+            }
+            throw new Error(_context4.t0);
+          case 16:
+            debug.log('delete ' + keyAclDoc.value + ' ' + _context4.t0.response.status); // should test 404 and 2xx
+          case 17:
+            _context4.next = 19;
+            return _solidLogic.store.updater.updateMany(del, add);
+          case 19:
+            // or a promise store.updater.update ?
+            // create READ only ACL
+            aclBody = keyAclBody(keyDoc, me);
+            _context4.next = 22;
+            return setAcl(keyDoc, aclBody);
+          case 22:
+            _context4.next = 27;
+            break;
+          case 24:
+            _context4.prev = 24;
+            _context4.t1 = _context4["catch"](2);
+            throw new Error(_context4.t1);
+          case 27:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[2, 24], [5, 12]]);
+    })();
+  });
+  return _saveKey.apply(this, arguments);
 }
 //# sourceMappingURL=keys.js.map
 
@@ -4335,44 +4451,37 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var date = _solidLogic.store.any(message, ns.dct('created'));
   var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
   var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
+
   // 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")));
-  debug.log('alain ' + (signature === null || signature === void 0 ? void 0 : signature.value));
 
-  // verify signature
+  // set message object
   var msg = (0, _signature.getBlankMsg)();
   msg.id = msgId.uri;
   msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
   msg.content = content.value;
   msg.maker = creator.uri;
-  try {
-    var publicKey = function publicKey(webId) {
-      var pubKey;
-      (0, _keys.getPublicKey)(webId).then(function (publicKey) {
-        debug.log('alain publicKey ' + publicKey);
-        pubKey = publicKey;
-      });
-      return pubKey;
-    };
-    var pubKey = publicKey(creator.uri); // await getPublicKey(creator.uri)
-    debug.log('alain pubKey ' + pubKey);
-    debug.log(creator.uri);
-  } catch (err) {
-    debug.warn(err);
-  }
-  try {
-    // pubKey could be store in a cache for all makers
-    /* const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
-    debug.warn('publicKeys\n' + pubKey0 + '\n' + pubKey)
-    const privKey0 = getPrivateKey(creator.uri) // alain to remove
-    // unsigned messages should be signaled as unsecured
-    debug.warn(msg)
-    debug.warn(signature?.value) */
-    if (signature !== null && signature !== void 0 && signature.value && !(0, _signature.verifySignature)(signature.value, msg, pubKey)) throw new Error('invalid signature');
-  } catch (err) {
-    debug.log(err);
+
+  // 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 {
+    (0, _keys.getPublicKey)(creator.uri).then(function (publicKey) {
+      debug.log(creator.uri + '\n' + msg.created + '\n' + msg.id + '\n' + publicKey);
+      if (!publicKey) {
+        // TODO try to recreate the publicKey
+        // if(me.uri === creator.uri) await getPrivateKey(creator)
+        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);
+    });
   }
   var originalMessage = (0, _chatLogic.originalVersion)(message);
   var edited = !message.sameTerm(originalMessage);
@@ -12474,6 +12583,251 @@ function isLight(x) {
 
 /***/ }),
 
+/***/ "./lib/utils/cryptoKeyHelpers.js":
+/*!***************************************!*\
+  !*** ./lib/utils/cryptoKeyHelpers.js ***!
+  \***************************************/
+/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+
+"use strict";
+
+
+var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");
+var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js");
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+exports.privKeyUrl = void 0;
+exports.privateKeyExists = privateKeyExists;
+exports.pubKeyUrl = void 0;
+exports.publicKeyExists = publicKeyExists;
+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) {
+        case 0:
+          webIdURL = new URL(webId.uri); // find storages in webId document
+          _context.next = 3;
+          return _solidLogic.store.fetcher.load(webId.uri);
+        case 3:
+          storages = _solidLogic.store.each(webId, ns.space('storage'), null, webId.doc());
+          if (storages !== null && storages !== void 0 && storages.length) {
+            _context.next = 19;
+            break;
+          }
+          // find storage recursively in webId URL
+          path = webIdURL.pathname;
+        case 6:
+          if (!path.length) {
+            _context.next = 17;
+            break;
+          }
+          path = path.substring(0, path.lastIndexOf('/'));
+          podRoot = _solidLogic.store.sym(webIdURL.origin + path + '/');
+          _context.next = 11;
+          return _solidLogic.store.fetcher.webOperation('HEAD', podRoot.uri);
+        case 11:
+          res = _context.sent;
+          if (!((_res$headers$get = res.headers.get('link')) !== null && _res$headers$get !== void 0 && _res$headers$get.includes(ns.space('Storage').value))) {
+            _context.next = 14;
+            break;
+          }
+          return _context.abrupt("break", 17);
+        case 14:
+          if (!path) debug.warn("Current user storage not found for\n".concat(webId));
+          _context.next = 6;
+          break;
+        case 17:
+          _context.next = 21;
+          break;
+        case 19:
+          // give preference to storage in webId root
+          podRoot = storages.find(function (storage) {
+            return webIdURL.origin === new URL(storage.value).origin;
+          });
+          if (!podRoot) podRoot = storages[0];
+        case 21:
+          return _context.abrupt("return", (_podRoot = podRoot) === null || _podRoot === void 0 ? void 0 : _podRoot.value);
+        case 22:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function getPodRoot(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
+var pubKeyUrl = /*#__PURE__*/function () {
+  var _ref2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.prev = 0;
+          _context2.next = 3;
+          return getPodRoot(webId);
+        case 3:
+          _context2.t0 = _context2.sent;
+          return _context2.abrupt("return", _context2.t0 + 'profile/keys/publicKey.ttl');
+        case 7:
+          _context2.prev = 7;
+          _context2.t1 = _context2["catch"](0);
+          throw new Error(_context2.t1);
+        case 10:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2, null, [[0, 7]]);
+  }));
+  return function pubKeyUrl(_x2) {
+    return _ref2.apply(this, arguments);
+  };
+}();
+exports.pubKeyUrl = pubKeyUrl;
+function publicKeyExists(_x3) {
+  return _publicKeyExists.apply(this, arguments);
+}
+function _publicKeyExists() {
+  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(webId) {
+    var publicKeyUrl;
+    return _regenerator["default"].wrap(function _callee4$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          _context4.next = 2;
+          return pubKeyUrl(webId);
+        case 2:
+          publicKeyUrl = _context4.sent;
+          _context4.next = 5;
+          return keyExists(webId, publicKeyUrl, 'PublicKey');
+        case 5:
+          return _context4.abrupt("return", _context4.sent);
+        case 6:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee4);
+  }));
+  return _publicKeyExists.apply(this, arguments);
+}
+var privKeyUrl = /*#__PURE__*/function () {
+  var _ref3 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId) {
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
+          _context3.next = 3;
+          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 "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 7]]);
+  }));
+  return function privKeyUrl(_x4) {
+    return _ref3.apply(this, arguments);
+  };
+}();
+exports.privKeyUrl = privKeyUrl;
+function privateKeyExists(_x5) {
+  return _privateKeyExists.apply(this, arguments);
+}
+function _privateKeyExists() {
+  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(webId) {
+    var privateKeyUrl;
+    return _regenerator["default"].wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
+        case 0:
+          _context5.next = 2;
+          return privKeyUrl(webId);
+        case 2:
+          privateKeyUrl = _context5.sent;
+          _context5.next = 5;
+          return keyExists(webId, privateKeyUrl, 'PrivateKey');
+        case 5:
+          return _context5.abrupt("return", _context5.sent);
+        case 6:
+        case "end":
+          return _context5.stop();
+      }
+    }, _callee5);
+  }));
+  return _privateKeyExists.apply(this, arguments);
+}
+function keyExists(_x6, _x7, _x8) {
+  return _keyExists.apply(this, arguments);
+}
+function _keyExists() {
+  _keyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee6(webId, keyUrl, keyType) {
+    var key, _err$response, data, contentType, response;
+    return _regenerator["default"].wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
+        case 0:
+          _context6.prev = 0;
+          _context6.next = 3;
+          return _solidLogic.store.fetcher.load(keyUrl);
+        case 3:
+          key = _solidLogic.store.any(webId, _solidLogic.store.sym(_signature.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)) {
+            _context6.next = 24;
+            break;
+          }
+          _context6.prev = 10;
+          // create privateKey resource
+          data = '';
+          contentType = 'text/turtle';
+          _context6.next = 15;
+          return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
+            data: data,
+            contentType: contentType
+          });
+        case 15:
+          response = _context6.sent;
+          _context6.next = 22;
+          break;
+        case 18:
+          _context6.prev = 18;
+          _context6.t1 = _context6["catch"](10);
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context6.t1);
+          throw _context6.t1;
+        case 22:
+          delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
+          return _context6.abrupt("return", undefined);
+        case 24:
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context6.t0);
+          throw _context6.t0;
+        case 26:
+        case "end":
+          return _context6.stop();
+      }
+    }, _callee6, null, [[0, 7], [10, 18]]);
+  }));
+  return _keyExists.apply(this, arguments);
+}
+//# sourceMappingURL=cryptoKeyHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/headerFooterHelpers.js":
 /*!******************************************!*\
   !*** ./lib/utils/headerFooterHelpers.js ***!
@@ -13320,8 +13674,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-25T08:53:47Z',
-  commit: 'f3d1fd8f49dd1c798115f2b5cb74ab29c71eb0d9',
+  buildTime: '2023-05-05T21:31:54Z',
+  commit: 'f7a2eabe0c0ad3ff6898451fb2c40a36802b4abc',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',
@@ -62007,14 +62361,17 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "createRemoteJWKSet": () => (/* binding */ createRemoteJWKSet)
 /* harmony export */ });
 /* harmony import */ var _runtime_fetch_jwks_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../runtime/fetch_jwks.js */ "./node_modules/jose/dist/browser/runtime/fetch_jwks.js");
-/* harmony import */ var _runtime_env_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../runtime/env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony import */ var _local_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./local.js */ "./node_modules/jose/dist/browser/jwks/local.js");
-
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+/* harmony import */ var _local_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./local.js */ "./node_modules/jose/dist/browser/jwks/local.js");
 
 
 
-class RemoteJWKSet extends _local_js__WEBPACK_IMPORTED_MODULE_3__.LocalJWKSet {
+function isCloudflareWorkers() {
+    return (typeof WebSocketPair !== 'undefined' ||
+        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
+        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
+}
+class RemoteJWKSet extends _local_js__WEBPACK_IMPORTED_MODULE_2__.LocalJWKSet {
     constructor(url, options) {
         super({ keys: [] });
         this._jwks = undefined;
@@ -62047,7 +62404,7 @@ class RemoteJWKSet extends _local_js__WEBPACK_IMPORTED_MODULE_3__.LocalJWKSet {
             return await super.getKey(protectedHeader, token);
         }
         catch (err) {
-            if (err instanceof _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JWKSNoMatchingKey) {
+            if (err instanceof _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JWKSNoMatchingKey) {
                 if (this.coolingDown() === false) {
                     await this.reload();
                     return super.getKey(protectedHeader, token);
@@ -62057,13 +62414,13 @@ class RemoteJWKSet extends _local_js__WEBPACK_IMPORTED_MODULE_3__.LocalJWKSet {
         }
     }
     async reload() {
-        if (this._pendingFetch && (0,_runtime_env_js__WEBPACK_IMPORTED_MODULE_1__.isCloudflareWorkers)()) {
+        if (this._pendingFetch && isCloudflareWorkers()) {
             this._pendingFetch = undefined;
         }
         this._pendingFetch || (this._pendingFetch = (0,_runtime_fetch_jwks_js__WEBPACK_IMPORTED_MODULE_0__["default"])(this._url, this._timeoutDuration, this._options)
             .then((json) => {
-            if (!(0,_local_js__WEBPACK_IMPORTED_MODULE_3__.isJWKSLike)(json)) {
-                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JWKSInvalid('JSON Web Key Set malformed');
+            if (!(0,_local_js__WEBPACK_IMPORTED_MODULE_2__.isJWKSLike)(json)) {
+                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JWKSInvalid('JSON Web Key Set malformed');
             }
             this._jwks = { keys: json.keys };
             this._jwksTimestamp = Date.now();
@@ -63251,8 +63608,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "checkEncCryptoKey": () => (/* binding */ checkEncCryptoKey),
 /* harmony export */   "checkSigCryptoKey": () => (/* binding */ checkSigCryptoKey)
 /* harmony export */ });
-/* harmony import */ var _runtime_env_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../runtime/env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-
 function unusable(name, prop = 'algorithm.name') {
     return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`);
 }
@@ -63327,11 +63682,6 @@ function checkSigCryptoKey(key, alg, ...usages) {
         }
         case 'EdDSA': {
             if (key.algorithm.name !== 'Ed25519' && key.algorithm.name !== 'Ed448') {
-                if ((0,_runtime_env_js__WEBPACK_IMPORTED_MODULE_0__.isCloudflareWorkers)()) {
-                    if (isAlgorithm(key.algorithm, 'NODE-ED25519'))
-                        break;
-                    throw unusable('Ed25519, Ed448, or NODE-ED25519');
-                }
                 throw unusable('Ed25519 or Ed448');
             }
             break;
@@ -64162,14 +64512,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "toPKCS8": () => (/* binding */ toPKCS8),
 /* harmony export */   "toSPKI": () => (/* binding */ toSPKI)
 /* harmony export */ });
-/* harmony import */ var _env_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
-/* harmony import */ var _lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../lib/invalid_key_input.js */ "./node_modules/jose/dist/browser/lib/invalid_key_input.js");
-/* harmony import */ var _base64url_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./base64url.js */ "./node_modules/jose/dist/browser/runtime/base64url.js");
-/* harmony import */ var _lib_format_pem_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../lib/format_pem.js */ "./node_modules/jose/dist/browser/lib/format_pem.js");
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony import */ var _is_key_like_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./is_key_like.js */ "./node_modules/jose/dist/browser/runtime/is_key_like.js");
-
+/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
+/* harmony import */ var _lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../lib/invalid_key_input.js */ "./node_modules/jose/dist/browser/lib/invalid_key_input.js");
+/* harmony import */ var _base64url_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base64url.js */ "./node_modules/jose/dist/browser/runtime/base64url.js");
+/* harmony import */ var _lib_format_pem_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../lib/format_pem.js */ "./node_modules/jose/dist/browser/lib/format_pem.js");
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+/* harmony import */ var _is_key_like_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./is_key_like.js */ "./node_modules/jose/dist/browser/runtime/is_key_like.js");
 
 
 
@@ -64177,8 +64525,8 @@ __webpack_require__.r(__webpack_exports__);
 
 
 const genericExport = async (keyType, keyFormat, key) => {
-    if (!(0,_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__.isCryptoKey)(key)) {
-        throw new TypeError((0,_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_2__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_6__.types));
+    if (!(0,_webcrypto_js__WEBPACK_IMPORTED_MODULE_0__.isCryptoKey)(key)) {
+        throw new TypeError((0,_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_1__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_5__.types));
     }
     if (!key.extractable) {
         throw new TypeError('CryptoKey is not extractable');
@@ -64186,7 +64534,7 @@ const genericExport = async (keyType, keyFormat, key) => {
     if (key.type !== keyType) {
         throw new TypeError(`key is not a ${keyType} key`);
     }
-    return (0,_lib_format_pem_js__WEBPACK_IMPORTED_MODULE_4__["default"])((0,_base64url_js__WEBPACK_IMPORTED_MODULE_3__.encodeBase64)(new Uint8Array(await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.exportKey(keyFormat, key))), `${keyType.toUpperCase()} KEY`);
+    return (0,_lib_format_pem_js__WEBPACK_IMPORTED_MODULE_3__["default"])((0,_base64url_js__WEBPACK_IMPORTED_MODULE_2__.encodeBase64)(new Uint8Array(await _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.exportKey(keyFormat, key))), `${keyType.toUpperCase()} KEY`);
 };
 const toSPKI = (key) => {
     return genericExport('public', 'spki', key);
@@ -64224,11 +64572,11 @@ const getNamedCurve = (keyData) => {
         case findOid(keyData, [0x2b, 0x65, 0x71]):
             return 'Ed448';
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__.JOSENotSupported('Invalid or unsupported EC Key Curve or OKP Key Sub Type');
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_4__.JOSENotSupported('Invalid or unsupported EC Key Curve or OKP Key Sub Type');
     }
 };
 const genericImport = async (replace, keyFormat, pem, alg, options) => {
-    var _a, _b;
+    var _a;
     let algorithm;
     let keyUsages;
     const keyData = new Uint8Array(atob(pem.replace(replace, ''))
@@ -64284,20 +64632,9 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
             keyUsages = isPublic ? ['verify'] : ['sign'];
             break;
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__.JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
-    }
-    try {
-        return await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.importKey(keyFormat, keyData, algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            (0,_env_js__WEBPACK_IMPORTED_MODULE_0__.isCloudflareWorkers)()) {
-            algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.importKey(keyFormat, keyData, algorithm, (_b = options === null || options === void 0 ? void 0 : options.extractable) !== null && _b !== void 0 ? _b : false, keyUsages);
-        }
-        throw err;
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_4__.JOSENotSupported('Invalid or unsupported "alg" (Algorithm) value');
     }
+    return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.importKey(keyFormat, keyData, algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
 };
 const fromPKCS8 = (pem, alg, options) => {
     return genericImport(/(?:-----(?:BEGIN|END) PRIVATE KEY-----|\s)/g, 'pkcs8', pem, alg, options);
@@ -64366,12 +64703,12 @@ function parseElement(bytes) {
 }
 function spkiFromX509(buf) {
     const tbsCertificate = getElement(getElement(parseElement(buf).contents)[0].contents);
-    return (0,_base64url_js__WEBPACK_IMPORTED_MODULE_3__.encodeBase64)(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
+    return (0,_base64url_js__WEBPACK_IMPORTED_MODULE_2__.encodeBase64)(tbsCertificate[tbsCertificate[0].raw[0] === 0xa0 ? 6 : 5].raw);
 }
 function getSPKI(x509) {
     const pem = x509.replace(/(?:-----(?:BEGIN|END) CERTIFICATE-----|\s)/g, '');
-    const raw = (0,_base64url_js__WEBPACK_IMPORTED_MODULE_3__.decodeBase64)(pem);
-    return (0,_lib_format_pem_js__WEBPACK_IMPORTED_MODULE_4__["default"])(spkiFromX509(raw), 'PUBLIC KEY');
+    const raw = (0,_base64url_js__WEBPACK_IMPORTED_MODULE_2__.decodeBase64)(pem);
+    return (0,_lib_format_pem_js__WEBPACK_IMPORTED_MODULE_3__["default"])(spkiFromX509(raw), 'PUBLIC KEY');
 }
 const fromX509 = (pem, alg, options) => {
     let spki;
@@ -64799,26 +65136,6 @@ const encrypt = async (enc, plaintext, cek, iv, aad) => {
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (encrypt);
 
 
-/***/ }),
-
-/***/ "./node_modules/jose/dist/browser/runtime/env.js":
-/*!*******************************************************!*\
-  !*** ./node_modules/jose/dist/browser/runtime/env.js ***!
-  \*******************************************************/
-/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
-
-"use strict";
-__webpack_require__.r(__webpack_exports__);
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "isCloudflareWorkers": () => (/* binding */ isCloudflareWorkers)
-/* harmony export */ });
-function isCloudflareWorkers() {
-    return (typeof WebSocketPair !== 'undefined' ||
-        (typeof navigator !== 'undefined' && navigator.userAgent === 'Cloudflare-Workers') ||
-        (typeof EdgeRuntime !== 'undefined' && EdgeRuntime === 'vercel'));
-}
-
-
 /***/ }),
 
 /***/ "./node_modules/jose/dist/browser/runtime/fetch_jwks.js":
@@ -64883,11 +65200,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "generateKeyPair": () => (/* binding */ generateKeyPair),
 /* harmony export */   "generateSecret": () => (/* binding */ generateSecret)
 /* harmony export */ });
-/* harmony import */ var _env_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony import */ var _random_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./random.js */ "./node_modules/jose/dist/browser/runtime/random.js");
-
+/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+/* harmony import */ var _random_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./random.js */ "./node_modules/jose/dist/browser/runtime/random.js");
 
 
 
@@ -64908,7 +65223,7 @@ async function generateSecret(alg, options) {
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
             length = parseInt(alg.slice(-3), 10);
-            return (0,_random_js__WEBPACK_IMPORTED_MODULE_3__["default"])(new Uint8Array(length >> 3));
+            return (0,_random_js__WEBPACK_IMPORTED_MODULE_2__["default"])(new Uint8Array(length >> 3));
         case 'A128KW':
         case 'A192KW':
         case 'A256KW':
@@ -64927,20 +65242,20 @@ async function generateSecret(alg, options) {
             keyUsages = ['encrypt', 'decrypt'];
             break;
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
-    return _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.generateKey(algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
+    return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.generateKey(algorithm, (_a = options === null || options === void 0 ? void 0 : options.extractable) !== null && _a !== void 0 ? _a : false, keyUsages);
 }
 function getModulusLengthOption(options) {
     var _a;
     const modulusLength = (_a = options === null || options === void 0 ? void 0 : options.modulusLength) !== null && _a !== void 0 ? _a : 2048;
     if (typeof modulusLength !== 'number' || modulusLength < 2048) {
-        throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported modulusLength option provided, 2048 bits or larger keys must be used');
+        throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported modulusLength option provided, 2048 bits or larger keys must be used');
     }
     return modulusLength;
 }
 async function generateKeyPair(alg, options) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     let algorithm;
     let keyUsages;
     switch (alg) {
@@ -64999,7 +65314,7 @@ async function generateKeyPair(alg, options) {
                     algorithm = { name: crv };
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported crv option provided');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported crv option provided');
             }
             break;
         case 'ECDH-ES':
@@ -65020,25 +65335,14 @@ async function generateKeyPair(alg, options) {
                     algorithm = { name: crv };
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, X25519, and X448');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported crv option provided, supported values are P-256, P-384, P-521, X25519, and X448');
             }
             break;
         }
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
-    }
-    try {
-        return (await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            (0,_env_js__WEBPACK_IMPORTED_MODULE_0__.isCloudflareWorkers)()) {
-            algorithm = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return (await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.generateKey(algorithm, (_d = options === null || options === void 0 ? void 0 : options.extractable) !== null && _d !== void 0 ? _d : false, keyUsages));
-        }
-        throw err;
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
     }
+    return (_webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.generateKey(algorithm, (_c = options === null || options === void 0 ? void 0 : options.extractable) !== null && _c !== void 0 ? _c : false, keyUsages));
 }
 
 
@@ -65113,11 +65417,9 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (__WEBPACK_DEFAULT_EXPORT__)
 /* harmony export */ });
-/* harmony import */ var _env_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony import */ var _base64url_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./base64url.js */ "./node_modules/jose/dist/browser/runtime/base64url.js");
-
+/* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+/* harmony import */ var _base64url_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./base64url.js */ "./node_modules/jose/dist/browser/runtime/base64url.js");
 
 
 
@@ -65136,7 +65438,7 @@ function subtleMapping(jwk) {
                 case 'A128CBC-HS256':
                 case 'A192CBC-HS384':
                 case 'A256CBC-HS512':
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported(`${jwk.alg} keys cannot be imported as CryptoKey instances`);
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported(`${jwk.alg} keys cannot be imported as CryptoKey instances`);
                 case 'A128GCM':
                 case 'A192GCM':
                 case 'A256GCM':
@@ -65159,7 +65461,7 @@ function subtleMapping(jwk) {
                     keyUsages = ['deriveBits'];
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
             }
             break;
         }
@@ -65188,7 +65490,7 @@ function subtleMapping(jwk) {
                     keyUsages = jwk.d ? ['decrypt', 'unwrapKey'] : ['encrypt', 'wrapKey'];
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
             }
             break;
         }
@@ -65214,7 +65516,7 @@ function subtleMapping(jwk) {
                     keyUsages = jwk.d ? ['deriveBits'] : [];
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
             }
             break;
         }
@@ -65232,12 +65534,12 @@ function subtleMapping(jwk) {
                     keyUsages = jwk.d ? ['deriveBits'] : [];
                     break;
                 default:
-                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
+                    throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "alg" (Algorithm) Parameter value');
             }
             break;
         }
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__.JOSENotSupported('Invalid or unsupported JWK "kty" (Key Type) Parameter value');
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported('Invalid or unsupported JWK "kty" (Key Type) Parameter value');
     }
     return { algorithm, keyUsages };
 }
@@ -65253,23 +65555,12 @@ const parse = async (jwk) => {
         (_b = jwk.key_ops) !== null && _b !== void 0 ? _b : keyUsages,
     ];
     if (algorithm.name === 'PBKDF2') {
-        return _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.importKey('raw', (0,_base64url_js__WEBPACK_IMPORTED_MODULE_3__.decode)(jwk.k), ...rest);
+        return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.importKey('raw', (0,_base64url_js__WEBPACK_IMPORTED_MODULE_2__.decode)(jwk.k), ...rest);
     }
     const keyData = { ...jwk };
     delete keyData.alg;
     delete keyData.use;
-    try {
-        return await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.importKey('jwk', keyData, ...rest);
-    }
-    catch (err) {
-        if (algorithm.name === 'Ed25519' &&
-            (err === null || err === void 0 ? void 0 : err.name) === 'NotSupportedError' &&
-            (0,_env_js__WEBPACK_IMPORTED_MODULE_0__.isCloudflareWorkers)()) {
-            rest[0] = { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            return await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.importKey('jwk', keyData, ...rest);
-        }
-        throw err;
-    }
+    return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.importKey('jwk', keyData, ...rest);
 };
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (parse);
 
@@ -65511,9 +65802,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "default": () => (/* binding */ subtleDsa)
 /* harmony export */ });
-/* harmony import */ var _env_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
 
 function subtleDsa(alg, algorithm) {
     const hash = `SHA-${alg.slice(-3)}`;
@@ -65535,12 +65824,9 @@ function subtleDsa(alg, algorithm) {
         case 'ES512':
             return { hash, name: 'ECDSA', namedCurve: algorithm.namedCurve };
         case 'EdDSA':
-            if ((0,_env_js__WEBPACK_IMPORTED_MODULE_0__.isCloudflareWorkers)() && algorithm.name === 'NODE-ED25519') {
-                return { name: 'NODE-ED25519', namedCurve: 'NODE-ED25519' };
-            }
             return { name: algorithm.name };
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__.JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_0__.JOSENotSupported(`alg ${alg} is not supported either by JOSE or your javascript runtime`);
     }
 }