solid-ui 2.4.27-6c8461c9 → 2.4.27-7184a38a

package/dist/solid-ui.js

@@ -2655,7 +2655,7 @@ var ChatChannel = /*#__PURE__*/function () {
         var oldMsg = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
         var deleteIt = arguments.length > 2 ? arguments[2] : undefined;
         return /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
-          var sts, now, timestamp, dateStamp, chatDocument, message, me, msg, privateKey, errMsg;
+          var sts, now, timestamp, dateStamp, chatDocument, message, me, msg, oldMsgMaker, errMsg, privateKey, pubKey, sig, _errMsg;
           return _regenerator["default"].wrap(function _callee2$(_context2) {
             while (1) switch (_context2.prev = _context2.next) {
               case 0:
@@ -2666,57 +2666,83 @@ var ChatChannel = /*#__PURE__*/function () {
                 chatDocument = oldMsg ? oldMsg.doc() : _this.dateFolder.leafDocumentFromDate(now);
                 message = _solidLogic.store.sym(chatDocument.uri + '#' + 'Msg' + timestamp); // const content = store.literal(text)
                 me = _solidLogic.authn.currentUser(); // If already logged on
-                msg = _signature.getBlankMsg;
-                msg.id = message;
-                if (oldMsg) {
-                  // edit message replaces old one
-                  sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument));
-                  // do we need to rebuild oldMsg signaturen ?
-                  if (deleteIt) {
-                    sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument));
-                    msg.dateDeleted = dateStamp;
-                  }
-                } else {
-                  // link new message to channel
-                  sts.push($rdf.st(_this.channel, ns.wf('message'), message, chatDocument));
+                msg = (0, _signature.getBlankMsg)();
+                msg.id = message.uri;
+                if (!oldMsg) {
+                  _context2.next = 22;
+                  break;
+                }
+                // edit message replaces old one
+                oldMsgMaker = _solidLogic.store.any(oldMsg, ns.foaf('maker')); // may not be needed here, but needed on READ
+                if (!(oldMsgMaker.uri === me.uri)) {
+                  _context2.next = 16;
+                  break;
+                }
+                sts.push($rdf.st(mostRecentVersion(oldMsg), ns.dct('isReplacedBy'), message, chatDocument));
+                if (deleteIt) {
+                  // we need to add a specific signature, else anyone can delete a msg ?
+                  sts.push($rdf.st(message, ns.schema('dateDeleted'), dateStamp, chatDocument));
+                  // msg.dateDeleted = dateStamp
                 }
+                _context2.next = 20;
+                break;
+              case 16:
+                errMsg = 'Error you cannot delete/edit a message from someone else : \n' + oldMsgMaker.uri;
+                debug.warn(errMsg);
+                alert(errMsg);
+                throw new Error(errMsg);
+              case 20:
+                _context2.next = 23;
+                break;
+              case 22:
+                // link new message to channel
+                sts.push($rdf.st(_this.channel, ns.wf('message'), message, chatDocument));
+              case 23:
                 sts.push($rdf.st(message, ns.sioc('content'), _solidLogic.store.literal(text), chatDocument));
                 msg.content = text;
                 sts.push($rdf.st(message, ns.dct('created'), dateStamp, chatDocument));
-                msg.created = dateStamp;
+                msg.created = dateStamp.value;
                 if (!me) {
-                  _context2.next = 21;
+                  _context2.next = 36;
                   break;
                 }
                 sts.push($rdf.st(message, ns.foaf('maker'), me, chatDocument));
-                msg.maker = me;
-                // privateKey the cached private key of me, cache should be deleted after a certain time
-                _context2.next = 19;
-                return (0, _keys.getPrivateKey)(me);
-              case 19:
+                msg.maker = me.uri;
+                // privateKey the cached private key of me, cached in store
+                _context2.next = 32;
+                return (0, _keys.getPrivateKey)(me.uri);
+              case 32:
                 privateKey = _context2.sent;
-                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "Proof")), $rdf.sym((0, _signature.signMsg)(msg, privateKey), chatDocument)));
-              case 21:
-                _context2.prev = 21;
-                _context2.next = 24;
+                // const privateKey0 = 'a11bc5d2eee6cdb3b37f5473a712cad905ccfb13fb2ccdbf1be0a1ac4fdc7d2a'
+                // const pubKey0 = '023a9da707bee1302f66083c9d95673ff969b41607a66f52686fa774d64ceb87'
+                pubKey = (0, _keys.getPublicKey)(me.uri);
+                sig = (0, _signature.signMsg)(msg, privateKey);
+                /* const verify = verifySignature(sig, msg, pubKey) // alain to remove
+                debug.warn('sig ' + sig)
+                debug.warn('verifySign ' + verify)
+                debug.warn(msg) */
+                sts.push($rdf.st(message, $rdf.sym("".concat(_signature.SEC, "Proof")), $rdf.lit(sig), chatDocument));
+              case 36:
+                _context2.prev = 36;
+                _context2.next = 39;
                 return _solidLogic.store.updater.update([], sts);
-              case 24:
-                _context2.next = 32;
+              case 39:
+                _context2.next = 47;
                 break;
-              case 26:
-                _context2.prev = 26;
-                _context2.t0 = _context2["catch"](21);
-                errMsg = 'Error saving chat message: ' + _context2.t0;
-                debug.warn(errMsg);
-                alert(errMsg);
-                throw new Error(errMsg);
-              case 32:
+              case 41:
+                _context2.prev = 41;
+                _context2.t0 = _context2["catch"](36);
+                _errMsg = 'Error saving chat message: ' + _context2.t0;
+                debug.warn(_errMsg);
+                alert(_errMsg);
+                throw new Error(_errMsg);
+              case 47:
                 return _context2.abrupt("return", message);
-              case 33:
+              case 48:
               case "end":
                 return _context2.stop();
             }
-          }, _callee2, null, [[21, 26]]);
+          }, _callee2, null, [[36, 41]]);
         })();
       });
       function updateMessage(_x2) {
@@ -4011,82 +4037,239 @@ exports.getPrivateKey = getPrivateKey;
 exports.getPublicKey = getPublicKey;
 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 _secp256k = __webpack_require__(/*! @noble/curves/secp256k1 */ "./node_modules/@noble/curves/secp256k1.js");
 var _utils = __webpack_require__(/*! @noble/hashes/utils */ "./node_modules/@noble/hashes/utils.js");
 var _signature = __webpack_require__(/*! ./signature */ "./lib/chat/signature.js");
 var _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; }
-// should have webcrypto.getRandomValues defined
-
 function generatePrivateKey() {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.utils.randomPrivateKey());
 }
 function generatePublicKey(privateKey) {
   return (0, _utils.bytesToHex)(_secp256k.schnorr.getPublicKey(privateKey));
 }
-function getPublicKey(webId) {
-  // find publickey
-  /* const url = new URL(webId)
-  url.hash = ''
-  store.fetcher.load(url.href)
-  let publicKey = store.any(store.sym(webId), store.sym(CERT +'publicKey')) */
-  var publicKey = publicKeyExists(webId);
-  return publicKey === null || publicKey === void 0 ? void 0 : publicKey.uri;
-}
-function publicKeyExists(webId) {
-  // find publickey
-  var url = new URL(webId);
-  url.hash = '';
-  _solidLogic.store.fetcher.load(url.href);
-  var publicKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'publicKey'));
-  return publicKey;
+function getPublicKey(_x) {
+  return _getPublicKey.apply(this, arguments);
 }
-function privateKeyExists(webId) {
-  var url = new URL(webId);
-  var privateKeyUrl = url.hostname + '/profile/privateKey.ttl';
-  _solidLogic.store.fetcher.load(privateKeyUrl);
-  var privateKey = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'privateKey'));
-  return privateKey;
+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(webId);
+        case 2:
+          publicKeyDoc = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          _context.prev = 3;
+          _context.next = 6;
+          return _solidLogic.store.fetcher.load(publicKeyDoc);
+        case 6:
+          // url.href)
+          key = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + 'PublicKey'));
+          return _context.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+        case 10:
+          _context.prev = 10;
+          _context.t0 = _context["catch"](3);
+          return _context.abrupt("return", undefined);
+        case 13:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee, null, [[3, 10]]);
+  }));
+  return _getPublicKey.apply(this, arguments);
 }
-function getPrivateKey(_x) {
+function getPrivateKey(_x2) {
   return _getPrivateKey.apply(this, arguments);
 }
 function _getPrivateKey() {
-  _getPrivateKey = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
-    var url, privateKeyUrl, publicKey, privateKey, del, add;
-    return _regenerator["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
+  _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:
-          url = new URL(webId);
-          privateKeyUrl = url.hostname + '/profile/privateKey.ttl'; // find publickey
-          publicKey = publicKeyExists(webId); // find privateKey
-          privateKey = privateKeyExists(webId); // create key pair
-          if (!(!privateKey || !publicKey)) {
-            _context.next = 15;
+          _context2.next = 2;
+          return _solidLogic.store.fetcher.load(webId);
+        case 2:
+          // find keys url's
+          publicKeyDoc = (0, _cryptoKeyHelpers.pubKeyUrl)(webId);
+          privateKeyDoc = (0, _cryptoKeyHelpers.privKeyUrl)(webId); // find key pair
+          _context2.next = 6;
+          return (0, _cryptoKeyHelpers.publicKeyExists)(webId);
+        case 6:
+          publicKey = _context2.sent;
+          _context2.next = 9;
+          return (0, _cryptoKeyHelpers.privateKeyExists)(webId);
+        case 9:
+          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 = 30;
             break;
           }
           del = [];
-          add = [];
-          if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'privateKey'), privateKey, $rdf.sym(privateKeyUrl)));
-          if (publicKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'publicKey'), publicKey, $rdf.sym(url.href)));
-          privateKey = _solidLogic.store.sym(generatePrivateKey());
-          publicKey = _solidLogic.store.sym(generatePublicKey(privateKey.uri));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'privateKey'), $rdf.literal(privateKey.uri), $rdf.sym(privateKeyUrl)));
-          add.push($rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'publicKey'), $rdf.literal(publicKey.uri), $rdf.sym(url.href)));
-          _context.next = 15;
-          return _solidLogic.store.updater.updateMany(del, add);
-        case 15:
-          return _context.abrupt("return", privateKey.uri);
-        case 16:
+          add = []; // if (privateKey) del.push($rdf.st($rdf.sym(webId), $rdf.sym(CERT + 'PrivateKey'), $rdf.lit(privateKey), $rdf.sym(privateKeyDoc)))
+          if (privateKey) {
+            _context2.next = 20;
+            break;
+          }
+          // add = []
+          privateKey = generatePrivateKey();
+          add = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PrivateKey'), $rdf.literal(privateKey), $rdf.sym(privateKeyDoc))];
+          _context2.next = 20;
+          return saveKey(privateKeyDoc, [], add, webId);
+        case 20:
+          if (!(!publicKey || !validPublicKey)) {
+            _context2.next = 27;
+            break;
+          }
+          del = [];
+          // delete invalid public key
+          if (publicKey) {
+            del = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.lit(publicKey), $rdf.sym(publicKeyDoc))];
+            debug.log(del);
+          }
+          // update new valid key
+          newPublicKey = generatePublicKey(privateKey);
+          add = [$rdf.st($rdf.sym(webId), $rdf.sym(_signature.CERT + 'PublicKey'), $rdf.literal(newPublicKey), $rdf.sym(publicKeyDoc))];
+          _context2.next = 27;
+          return saveKey(publicKeyDoc, del, add);
+        case 27:
+          keyContainer = privateKeyDoc.substring(0, privateKeyDoc.lastIndexOf('/') + 1);
+          _context2.next = 30;
+          return setAcl(keyContainer, keyContainerAclBody(webId));
+        case 30:
+          return _context2.abrupt("return", privateKey);
+        case 31:
         case "end":
-          return _context.stop();
+          return _context2.stop();
       }
-    }, _callee);
+    }, _callee2);
   }));
   return _getPrivateKey.apply(this, arguments);
 }
+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:agent <".concat(me, ">;\n    acl:mode acl:Read, acl:Write.\n:Read\n    a acl:Authorization;\n    acl:accessTo key:;\n    acl:default key:;\n    acl:agentClass foaf:Agent;\n    acl:mode acl:Read.\n");
+  return 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, acl:Control. # NSS issue: missing acl link header with READ only\n");
+  return aclBody;
+};
+function setAcl(_x3, _x4) {
+  return _setAcl.apply(this, arguments);
+}
+function _setAcl() {
+  _setAcl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(keyDoc, aclBody) {
+    var keyAclDoc, aclResponse;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.next = 2;
+          return _solidLogic.store.fetcher.load(keyDoc);
+        case 2:
+          // FIXME: check the Why value on this quad:
+          keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
+          if (keyAclDoc) {
+            _context3.next = 5;
+            break;
+          }
+          throw new Error('Key ACL doc not found!');
+        case 5:
+          _context3.next = 7;
+          return _solidLogic.store.fetcher.webOperation('PUT', keyAclDoc.value, {
+            data: aclBody,
+            contentType: 'text/turtle'
+          });
+        case 7:
+          aclResponse = _context3.sent;
+        case 8:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  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.updater.updateMany(del, add);
+          case 2:
+            _context4.next = 4;
+            return _solidLogic.store.fetcher.load(keyDoc);
+          case 4:
+            _context4.prev = 4;
+            // get keyAcldoc
+            keyAclDoc = _solidLogic.store.any($rdf.sym(keyDoc), $rdf.sym('http://www.iana.org/assignments/link-relations/acl'));
+            if (keyAclDoc) {
+              _context4.next = 8;
+              break;
+            }
+            throw new Error("".concat(keyDoc, " ACL doc not found!"));
+          case 8:
+            _context4.prev = 8;
+            _context4.next = 11;
+            return _solidLogic.store.fetcher.webOperation('DELETE', keyAclDoc.value);
+          case 11:
+            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 = 20;
+            break;
+          case 15:
+            _context4.prev = 15;
+            _context4.t0 = _context4["catch"](8);
+            if (!(_context4.t0.response.status !== 404)) {
+              _context4.next = 19;
+              break;
+            }
+            throw new Error(_context4.t0);
+          case 19:
+            debug.log('delete ' + keyAclDoc.value + ' ' + _context4.t0.response.status); // should test 404 and 2xx
+          case 20:
+            // create READ only ACL
+            aclBody = keyAclBody(keyDoc, me);
+            _context4.next = 23;
+            return setAcl(keyDoc, aclBody);
+          case 23:
+            _context4.next = 28;
+            break;
+          case 25:
+            _context4.prev = 25;
+            _context4.t1 = _context4["catch"](4);
+            throw new Error(_context4.t1);
+          case 28:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4, null, [[4, 25], [8, 15]]);
+    })();
+  });
+  return _saveKey.apply(this, arguments);
+}
 //# sourceMappingURL=keys.js.map
 
 /***/ }),
@@ -4215,21 +4398,39 @@ function renderMessageRow(channelObject, message, fresh, options, userContext) {
   var creator = _solidLogic.store.any(message, ns.foaf('maker'));
   var date = _solidLogic.store.any(message, ns.dct('created'));
   var latestVersion = (0, _chatLogic.mostRecentVersion)(message);
-  var content = _solidLogic.store.any(latestVersion, ns.sioc('content'));
-  var signature = _solidLogic.store.any(message, $rdf.sym("".concat(_signature.SEC, "Proof")));
+  var latestVersionCreator = _solidLogic.store.any(latestVersion, ns.foaf('maker'));
 
-  // verify signature
+  // 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")));
+
+  // set message object
   var msg = (0, _signature.getBlankMsg)();
-  msg.id = message;
-  msg.created = date;
-  // this is not correct.
-  // If the message has been edited/deleted we must verify the latest message and may be the intermediate ones
-  msg.content = content;
-  msg.maker = creator;
-
-  // pubKey could be store in a cache for all makers
-  var pubKey = (0, _keys.getPublicKey)(creator); // alain no
-  if (!(0, _signature.verifySignature)(signature, msg, pubKey)) throw new Error();
+  msg.id = msgId.uri;
+  msg.created = _solidLogic.store.any(msgId, ns.dct('created')).value;
+  msg.content = content.value;
+  msg.maker = creator.uri;
+
+  // unsigned message
+  if (!(signature !== null && signature !== void 0 && signature.value)) debug.warn(msgId.uri + ' is unsigned'); // TODO replace with UI (colored message ?)
+
+  // signed message, get public key and check signature
+  else {
+    (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.uri)
+        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);
   var sortDate = _solidLogic.store.the(originalMessage, ns.dct('created'), null, originalMessage.doc()); // In message
@@ -5032,8 +5233,8 @@ exports.utf8Encoder = exports.utf8Decoder = void 0;
 exports.validateMsg = validateMsg;
 exports.verifySignature = verifySignature;
 var _secp256k = __webpack_require__(/*! @noble/curves/secp256k1 */ "./node_modules/@noble/curves/secp256k1.js");
-var _sha = __webpack_require__(/*! @noble/hashes/sha256 */ "./node_modules/@noble/hashes/sha256.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'
 
@@ -5043,7 +5244,7 @@ var utf8Encoder = new TextEncoder();
 exports.utf8Encoder = utf8Encoder;
 var SEC = 'https://w3id.org/security#'; // Proof, VerificationMethod
 exports.SEC = SEC;
-var CERT = 'http://www.w3.org/ns/auth/cert#'; // PrivatKey, PublicKey
+var CERT = 'http://www.w3.org/ns/auth/cert#'; // PrivateKey, PublicKey
 
 /* eslint-disable no-unused-vars */
 /* export enum Kind {
@@ -12330,6 +12531,173 @@ 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");
+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; }
+// find podRoot from space:storage for subdomain/suffix podServers
+/* export const podRoot = (webId: string) => {
+  await store.fetcher.load(webId)
+  const url = new URL(webId)
+  // find storage in webId
+  const storage = store.each(store.sym(webId), store.sym('http://www.w3.org/ns/pim/space#storage'))
+  const pod = storage.length === 1 ? storage : storage.find(node => url.origin === new URL(node.value).origin)
+  const podRoot = Array.isArray(pod) ? pod[0] : pod
+  if (!podRoot?.value) throw Error('No space:storage in ' + webId)
+  return podRoot.value
+} */
+
+var pubKeyUrl = function pubKeyUrl(webId) {
+  var url = new URL(webId);
+  // find storage in webId
+  var storage = _solidLogic.store.each(_solidLogic.store.sym(webId), _solidLogic.store.sym('http://www.w3.org/ns/pim/space#storage'));
+  var pod = storage.length === 1 ? storage : storage.find(function (node) {
+    return url.origin === new URL(node.value).origin;
+  });
+  var podUrl = Array.isArray(pod) ? pod[0] : pod;
+  if (!(podUrl !== null && podUrl !== void 0 && podUrl.value)) throw Error('No space:storage in ' + webId);
+  var publicKeyUrl = (podUrl === null || podUrl === void 0 ? void 0 : podUrl.value) + 'profile/keys/publicKey.ttl';
+  return publicKeyUrl;
+};
+exports.pubKeyUrl = pubKeyUrl;
+function publicKeyExists(_x) {
+  return _publicKeyExists.apply(this, arguments);
+}
+function _publicKeyExists() {
+  _publicKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(webId) {
+    var publicKeyUrl;
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          // find publickey
+          publicKeyUrl = pubKeyUrl(webId);
+          _context.next = 3;
+          return keyExists(webId, publicKeyUrl, 'PublicKey');
+        case 3:
+          return _context.abrupt("return", _context.sent);
+        case 4:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _publicKeyExists.apply(this, arguments);
+}
+var privKeyUrl = function privKeyUrl(webId) {
+  var url = new URL(webId);
+  // find storage in webId
+  var storage = _solidLogic.store.each(_solidLogic.store.sym(webId), _solidLogic.store.sym('http://www.w3.org/ns/pim/space#storage'));
+  var pod = storage.length === 1 ? storage : storage.find(function (node) {
+    return url.origin === new URL(node.value).origin;
+  });
+  var podUrl = Array.isArray(pod) ? pod[0] : pod;
+  if (!(podUrl !== null && podUrl !== void 0 && podUrl.value)) throw Error('Expected space:storage in ' + webId);
+  var privateKeyUrl = (podUrl === null || podUrl === void 0 ? void 0 : podUrl.value) + 'profile/keys/privateKey.ttl';
+  return privateKeyUrl;
+};
+exports.privKeyUrl = privKeyUrl;
+function privateKeyExists(_x2) {
+  return _privateKeyExists.apply(this, arguments);
+}
+function _privateKeyExists() {
+  _privateKeyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(webId) {
+    var privateKeyUrl;
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // find privateKey
+          privateKeyUrl = privKeyUrl(webId);
+          _context2.next = 3;
+          return keyExists(webId, privateKeyUrl, 'PrivateKey');
+        case 3:
+          return _context2.abrupt("return", _context2.sent);
+        case 4:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _privateKeyExists.apply(this, arguments);
+}
+function keyExists(_x3, _x4, _x5) {
+  return _keyExists.apply(this, arguments);
+}
+function _keyExists() {
+  _keyExists = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(webId, keyUrl, keyType) {
+    var key, _err$response, data, contentType, response;
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          _context3.prev = 0;
+          _context3.next = 3;
+          return _solidLogic.store.fetcher.load(keyUrl);
+        case 3:
+          key = _solidLogic.store.any(_solidLogic.store.sym(webId), _solidLogic.store.sym(_signature.CERT + keyType));
+          return _context3.abrupt("return", key === null || key === void 0 ? void 0 : key.value);
+        case 7:
+          _context3.prev = 7;
+          _context3.t0 = _context3["catch"](0);
+          if (!((_context3.t0 === null || _context3.t0 === void 0 ? void 0 : (_err$response = _context3.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status) === 404)) {
+            _context3.next = 24;
+            break;
+          }
+          _context3.prev = 10;
+          // create privateKey resource
+          data = '';
+          contentType = 'text/turtle';
+          _context3.next = 15;
+          return _solidLogic.store.fetcher.webOperation('PUT', keyUrl, {
+            data: data,
+            contentType: contentType
+          });
+        case 15:
+          response = _context3.sent;
+          _context3.next = 22;
+          break;
+        case 18:
+          _context3.prev = 18;
+          _context3.t1 = _context3["catch"](10);
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t1);
+          throw _context3.t1;
+        case 22:
+          delete _solidLogic.store.fetcher.requested[keyUrl]; // delete cached 404 error
+          return _context3.abrupt("return", undefined);
+        case 24:
+          debug.log('createIfNotExists doc FAILED: ' + keyUrl + ': ' + _context3.t0);
+          throw _context3.t0;
+        case 26:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3, null, [[0, 7], [10, 18]]);
+  }));
+  return _keyExists.apply(this, arguments);
+}
+//# sourceMappingURL=cryptoKeyHelpers.js.map
+
+/***/ }),
+
 /***/ "./lib/utils/headerFooterHelpers.js":
 /*!******************************************!*\
   !*** ./lib/utils/headerFooterHelpers.js ***!
@@ -13176,8 +13544,8 @@ Object.defineProperty(exports, "__esModule", ({
 }));
 exports.versionInfo = void 0;
 var versionInfo = {
-  buildTime: '2023-04-18T15:43:25Z',
-  commit: '6c8461c90348c12751456ce058874760f5b987aa',
+  buildTime: '2023-04-30T22:04:08Z',
+  commit: '7184a38ab5fc3b8a1be713169d0ef99666aad8a7',
   npmInfo: {
     'solid-ui': '2.4.27',
     npm: '8.19.4',
@@ -25340,6 +25708,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _inrupt_oidc_client__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! @inrupt/oidc-client */ "./node_modules/@inrupt/oidc-client/lib/oidc-client.min.js");
 /* harmony import */ var _inrupt_oidc_client__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_inrupt_oidc_client__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var _inrupt_solid_client_authn_core__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.mjs");
+/* harmony import */ var _inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.mjs");
+
 
 
 
@@ -25493,7 +25863,7 @@ async function getTokens(issuer, client, data, dpop) {
         headers,
         body: new URLSearchParams(requestBody).toString(),
     };
-    const rawTokenResponse = await await fetch(issuer.tokenEndpoint, tokenRequestInit);
+    const rawTokenResponse = await (0,_inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__.fetch)(issuer.tokenEndpoint, tokenRequestInit);
     const jsonTokenResponse = (await rawTokenResponse.json());
     const tokenResponse = validateTokenEndpointResponse(jsonTokenResponse, dpop);
     const webId = await (0,_inrupt_solid_client_authn_core__WEBPACK_IMPORTED_MODULE_1__.getWebidFromTokenPayload)(tokenResponse.id_token, issuer.jwksUri, issuer.issuer, client.clientId);
@@ -25577,7 +25947,7 @@ async function refresh(refreshToken, issuer, client, dpopKey) {
     else if (isValidUrl(client.clientId)) {
         requestBody.client_id = client.clientId;
     }
-    const rawResponse = await fetch(issuer.tokenEndpoint, {
+    const rawResponse = await (0,_inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__.fetch)(issuer.tokenEndpoint, {
         method: "POST",
         body: new URLSearchParams(requestBody).toString(),
         headers: {
@@ -25692,8 +26062,9 @@ e.read=function(t,e,r,n,i){var o,s,a=8*i-n-1,u=(1<<a)-1,c=u>>1,h=-7,l=r?i-1:0,f=
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 const solid_client_authn_core_1 = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.js");
+const universal_fetch_1 = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js");
 const oidc_client_ext_1 = __webpack_require__(/*! @inrupt/oidc-client-ext */ "./node_modules/@inrupt/oidc-client-ext/dist/index.es.js");
-const globalFetch = (request, init) => window.fetch(request, init);
+const globalFetch = (request, init) => (0, universal_fetch_1.fetch)(request, init);
 class ClientAuthentication {
     constructor(loginHandler, redirectHandler, logoutHandler, sessionInfoManager, issuerConfigFetcher) {
         this.loginHandler = loginHandler;
@@ -26187,6 +26558,7 @@ exports["default"] = ClientRegistrar;
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.WELL_KNOWN_OPENID_CONFIG = void 0;
 const solid_client_authn_core_1 = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.js");
+const universal_fetch_1 = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js");
 exports.WELL_KNOWN_OPENID_CONFIG = ".well-known/openid-configuration";
 const issuerConfigKeyMap = {
     issuer: {
@@ -26293,7 +26665,7 @@ class IssuerConfigFetcher {
     async fetchConfig(issuer) {
         let issuerConfig;
         const openIdConfigUrl = new URL(exports.WELL_KNOWN_OPENID_CONFIG, issuer.endsWith("/") ? issuer : `${issuer}/`).href;
-        const issuerConfigRequestBody = await window.fetch(openIdConfigUrl);
+        const issuerConfigRequestBody = await (0, universal_fetch_1.fetch)(openIdConfigUrl);
         try {
             issuerConfig = processConfig(await issuerConfigRequestBody.json());
         }
@@ -26396,6 +26768,7 @@ exports["default"] = Redirector;
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.AuthCodeRedirectHandler = void 0;
+const universal_fetch_1 = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js");
 const solid_client_authn_core_1 = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.js");
 const oidc_client_ext_1 = __webpack_require__(/*! @inrupt/oidc-client-ext */ "./node_modules/@inrupt/oidc-client-ext/dist/index.es.js");
 class AuthCodeRedirectHandler {
@@ -26459,7 +26832,7 @@ class AuthCodeRedirectHandler {
                 tokenRefresher: this.tokerRefresher,
             };
         }
-        const authFetch = await (0, solid_client_authn_core_1.buildAuthenticatedFetch)(fetch, tokens.accessToken, {
+        const authFetch = await (0, solid_client_authn_core_1.buildAuthenticatedFetch)(universal_fetch_1.fetch, tokens.accessToken, {
             dpopKey: tokens.dpopKey,
             refreshOptions,
             eventEmitter,
@@ -26697,11 +27070,12 @@ exports.SessionInfoManager = exports.clear = exports.getUnauthenticatedSession =
 const solid_client_authn_core_1 = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.js");
 const uuid_1 = __webpack_require__(/*! uuid */ "./node_modules/@inrupt/solid-client-authn-browser/node_modules/uuid/dist/commonjs-browser/index.js");
 const oidc_client_ext_1 = __webpack_require__(/*! @inrupt/oidc-client-ext */ "./node_modules/@inrupt/oidc-client-ext/dist/index.es.js");
+const universal_fetch_1 = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js");
 function getUnauthenticatedSession() {
     return {
         isLoggedIn: false,
         sessionId: (0, uuid_1.v4)(),
-        fetch,
+        fetch: universal_fetch_1.fetch,
     };
 }
 exports.getUnauthenticatedSession = getUnauthenticatedSession;
@@ -27854,513 +28228,513 @@ exports["default"] = _default;
 
 
 var events = __webpack_require__(/*! events */ "./node_modules/events/events.js");
-var crossFetch = __webpack_require__(/*! cross-fetch */ "./node_modules/cross-fetch/dist/browser-ponyfill.js");
+var universalFetch = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js");
 var jose = __webpack_require__(/*! jose */ "./node_modules/jose/dist/browser/index.js");
 var uuid = __webpack_require__(/*! uuid */ "./node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/commonjs-browser/index.js");
 
-const SOLID_CLIENT_AUTHN_KEY_PREFIX = "solidClientAuthn:";
-const PREFERRED_SIGNING_ALG = ["ES256", "RS256"];
-const EVENTS = {
-    ERROR: "error",
-    LOGIN: "login",
-    LOGOUT: "logout",
-    NEW_REFRESH_TOKEN: "newRefreshToken",
-    SESSION_EXPIRED: "sessionExpired",
-    SESSION_EXTENDED: "sessionExtended",
-    SESSION_RESTORED: "sessionRestore",
-    TIMEOUT_SET: "timeoutSet",
-};
-const REFRESH_BEFORE_EXPIRATION_SECONDS = 5;
-const SCOPE_OPENID = "openid";
-const SCOPE_OFFLINE = "offline_access";
-const SCOPE_WEBID = "webid";
+const SOLID_CLIENT_AUTHN_KEY_PREFIX = "solidClientAuthn:";
+const PREFERRED_SIGNING_ALG = ["ES256", "RS256"];
+const EVENTS = {
+    ERROR: "error",
+    LOGIN: "login",
+    LOGOUT: "logout",
+    NEW_REFRESH_TOKEN: "newRefreshToken",
+    SESSION_EXPIRED: "sessionExpired",
+    SESSION_EXTENDED: "sessionExtended",
+    SESSION_RESTORED: "sessionRestore",
+    TIMEOUT_SET: "timeoutSet",
+};
+const REFRESH_BEFORE_EXPIRATION_SECONDS = 5;
+const SCOPE_OPENID = "openid";
+const SCOPE_OFFLINE = "offline_access";
+const SCOPE_WEBID = "webid";
 const DEFAULT_SCOPES = [SCOPE_OPENID, SCOPE_OFFLINE, SCOPE_WEBID].join(" ");
 
-const buildProxyHandler = (toExclude, errorMessage) => ({
-    get(target, prop, receiver) {
-        if (!Object.getOwnPropertyNames(events.EventEmitter).includes(prop) &&
-            Object.getOwnPropertyNames(toExclude).includes(prop)) {
-            throw new Error(`${errorMessage}: [${prop}] is not supported`);
-        }
-        return Reflect.get(target, prop, receiver);
-    },
+const buildProxyHandler = (toExclude, errorMessage) => ({
+    get(target, prop, receiver) {
+        if (!Object.getOwnPropertyNames(events.EventEmitter).includes(prop) &&
+            Object.getOwnPropertyNames(toExclude).includes(prop)) {
+            throw new Error(`${errorMessage}: [${prop}] is not supported`);
+        }
+        return Reflect.get(target, prop, receiver);
+    },
 });
 
-class AggregateHandler {
-    constructor(handleables) {
-        this.handleables = handleables;
-    }
-    async getProperHandler(params) {
-        const canHandleList = await Promise.all(this.handleables.map((handleable) => handleable.canHandle(...params)));
-        for (let i = 0; i < canHandleList.length; i += 1) {
-            if (canHandleList[i]) {
-                return this.handleables[i];
-            }
-        }
-        return null;
-    }
-    async canHandle(...params) {
-        return (await this.getProperHandler(params)) !== null;
-    }
-    async handle(...params) {
-        const handler = await this.getProperHandler(params);
-        if (handler) {
-            return handler.handle(...params);
-        }
-        throw new Error(`[${this.constructor.name}] cannot find a suitable handler for: ${params
-            .map((param) => {
-            try {
-                return JSON.stringify(param);
-            }
-            catch (err) {
-                return param.toString();
-            }
-        })
-            .join(", ")}`);
-    }
+class AggregateHandler {
+    constructor(handleables) {
+        this.handleables = handleables;
+    }
+    async getProperHandler(params) {
+        const canHandleList = await Promise.all(this.handleables.map((handleable) => handleable.canHandle(...params)));
+        for (let i = 0; i < canHandleList.length; i += 1) {
+            if (canHandleList[i]) {
+                return this.handleables[i];
+            }
+        }
+        return null;
+    }
+    async canHandle(...params) {
+        return (await this.getProperHandler(params)) !== null;
+    }
+    async handle(...params) {
+        const handler = await this.getProperHandler(params);
+        if (handler) {
+            return handler.handle(...params);
+        }
+        throw new Error(`[${this.constructor.name}] cannot find a suitable handler for: ${params
+            .map((param) => {
+            try {
+                return JSON.stringify(param);
+            }
+            catch (err) {
+                return param.toString();
+            }
+        })
+            .join(", ")}`);
+    }
 }
 
-async function fetchJwks(jwksIri, issuerIri) {
-    const jwksResponse = await crossFetch.fetch(jwksIri);
-    if (jwksResponse.status !== 200) {
-        throw new Error(`Could not fetch JWKS for [${issuerIri}] at [${jwksIri}]: ${jwksResponse.status} ${jwksResponse.statusText}`);
-    }
-    let jwk;
-    try {
-        jwk = (await jwksResponse.json()).keys[0];
-    }
-    catch (e) {
-        throw new Error(`Malformed JWKS for [${issuerIri}] at [${jwksIri}]: ${e.message}`);
-    }
-    return jwk;
-}
-async function getWebidFromTokenPayload(idToken, jwksIri, issuerIri, clientId) {
-    const jwk = await fetchJwks(jwksIri, issuerIri);
-    let payload;
-    try {
-        const { payload: verifiedPayload } = await jose.jwtVerify(idToken, await jose.importJWK(jwk), {
-            issuer: issuerIri,
-            audience: clientId,
-        });
-        payload = verifiedPayload;
-    }
-    catch (e) {
-        throw new Error(`Token verification failed: ${e.stack}`);
-    }
-    if (typeof payload.webid === "string") {
-        return payload.webid;
-    }
-    if (typeof payload.sub !== "string") {
-        throw new Error(`The token ${JSON.stringify(payload)} is invalid: it has no 'webid' claim and no 'sub' claim.`);
-    }
-    try {
-        new URL(payload.sub);
-        return payload.sub;
-    }
-    catch (e) {
-        throw new Error(`The token has no 'webid' claim, and its 'sub' claim of [${payload.sub}] is invalid as a URL - error [${e}].`);
-    }
+async function fetchJwks(jwksIri, issuerIri) {
+    const jwksResponse = await universalFetch.fetch(jwksIri);
+    if (jwksResponse.status !== 200) {
+        throw new Error(`Could not fetch JWKS for [${issuerIri}] at [${jwksIri}]: ${jwksResponse.status} ${jwksResponse.statusText}`);
+    }
+    let jwk;
+    try {
+        jwk = (await jwksResponse.json()).keys[0];
+    }
+    catch (e) {
+        throw new Error(`Malformed JWKS for [${issuerIri}] at [${jwksIri}]: ${e.message}`);
+    }
+    return jwk;
+}
+async function getWebidFromTokenPayload(idToken, jwksIri, issuerIri, clientId) {
+    const jwk = await fetchJwks(jwksIri, issuerIri);
+    let payload;
+    try {
+        const { payload: verifiedPayload } = await jose.jwtVerify(idToken, await jose.importJWK(jwk), {
+            issuer: issuerIri,
+            audience: clientId,
+        });
+        payload = verifiedPayload;
+    }
+    catch (e) {
+        throw new Error(`Token verification failed: ${e.stack}`);
+    }
+    if (typeof payload.webid === "string") {
+        return payload.webid;
+    }
+    if (typeof payload.sub !== "string") {
+        throw new Error(`The token ${JSON.stringify(payload)} is invalid: it has no 'webid' claim and no 'sub' claim.`);
+    }
+    try {
+        new URL(payload.sub);
+        return payload.sub;
+    }
+    catch (e) {
+        throw new Error(`The token has no 'webid' claim, and its 'sub' claim of [${payload.sub}] is invalid as a URL - error [${e}].`);
+    }
 }
 
-function isValidRedirectUrl(redirectUrl) {
-    try {
-        const urlObject = new URL(redirectUrl);
-        return urlObject.hash === "";
-    }
-    catch (e) {
-        return false;
-    }
+function isValidRedirectUrl(redirectUrl) {
+    try {
+        const urlObject = new URL(redirectUrl);
+        return urlObject.hash === "";
+    }
+    catch (e) {
+        return false;
+    }
 }
 
-function isSupportedTokenType(token) {
-    return typeof token === "string" && ["DPoP", "Bearer"].includes(token);
+function isSupportedTokenType(token) {
+    return typeof token === "string" && ["DPoP", "Bearer"].includes(token);
 }
 
 const USER_SESSION_PREFIX = "solidClientAuthenticationUser";
 
-function isValidUrl(url) {
-    try {
-        new URL(url);
-        return true;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-function determineSigningAlg(supported, preferred) {
-    var _a;
-    return ((_a = preferred.find((signingAlg) => {
-        return supported.includes(signingAlg);
-    })) !== null && _a !== void 0 ? _a : null);
-}
-function determineClientType(options, issuerConfig) {
-    if (options.clientId !== undefined && !isValidUrl(options.clientId)) {
-        return "static";
-    }
-    if (issuerConfig.scopesSupported.includes("webid") &&
-        options.clientId !== undefined &&
-        isValidUrl(options.clientId)) {
-        return "solid-oidc";
-    }
-    return "dynamic";
-}
-async function handleRegistration(options, issuerConfig, storageUtility, clientRegistrar) {
-    const clientType = determineClientType(options, issuerConfig);
-    if (clientType === "dynamic") {
-        return clientRegistrar.getClient({
-            sessionId: options.sessionId,
-            clientName: options.clientName,
-            redirectUrl: options.redirectUrl,
-        }, issuerConfig);
-    }
-    await storageUtility.setForUser(options.sessionId, {
-        clientId: options.clientId,
-    });
-    if (options.clientSecret) {
-        await storageUtility.setForUser(options.sessionId, {
-            clientSecret: options.clientSecret,
-        });
-    }
-    if (options.clientName) {
-        await storageUtility.setForUser(options.sessionId, {
-            clientName: options.clientName,
-        });
-    }
-    return {
-        clientId: options.clientId,
-        clientSecret: options.clientSecret,
-        clientName: options.clientName,
-        clientType,
-    };
+function isValidUrl(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+function determineSigningAlg(supported, preferred) {
+    var _a;
+    return ((_a = preferred.find((signingAlg) => {
+        return supported.includes(signingAlg);
+    })) !== null && _a !== void 0 ? _a : null);
+}
+function determineClientType(options, issuerConfig) {
+    if (options.clientId !== undefined && !isValidUrl(options.clientId)) {
+        return "static";
+    }
+    if (issuerConfig.scopesSupported.includes("webid") &&
+        options.clientId !== undefined &&
+        isValidUrl(options.clientId)) {
+        return "solid-oidc";
+    }
+    return "dynamic";
+}
+async function handleRegistration(options, issuerConfig, storageUtility, clientRegistrar) {
+    const clientType = determineClientType(options, issuerConfig);
+    if (clientType === "dynamic") {
+        return clientRegistrar.getClient({
+            sessionId: options.sessionId,
+            clientName: options.clientName,
+            redirectUrl: options.redirectUrl,
+        }, issuerConfig);
+    }
+    await storageUtility.setForUser(options.sessionId, {
+        clientId: options.clientId,
+    });
+    if (options.clientSecret) {
+        await storageUtility.setForUser(options.sessionId, {
+            clientSecret: options.clientSecret,
+        });
+    }
+    if (options.clientName) {
+        await storageUtility.setForUser(options.sessionId, {
+            clientName: options.clientName,
+        });
+    }
+    return {
+        clientId: options.clientId,
+        clientSecret: options.clientSecret,
+        clientName: options.clientName,
+        clientType,
+    };
 }
 
-async function getSessionIdFromOauthState(storageUtility, oauthState) {
-    return storageUtility.getForUser(oauthState, "sessionId");
-}
-async function loadOidcContextFromStorage(sessionId, storageUtility, configFetcher) {
-    try {
-        const [issuerIri, codeVerifier, storedRedirectIri, dpop] = await Promise.all([
-            storageUtility.getForUser(sessionId, "issuer", {
-                errorIfNull: true,
-            }),
-            storageUtility.getForUser(sessionId, "codeVerifier"),
-            storageUtility.getForUser(sessionId, "redirectUrl"),
-            storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
-        ]);
-        await storageUtility.deleteForUser(sessionId, "codeVerifier");
-        const issuerConfig = await configFetcher.fetchConfig(issuerIri);
-        return {
-            codeVerifier,
-            redirectUrl: storedRedirectIri,
-            issuerConfig,
-            dpop: dpop === "true",
-        };
-    }
-    catch (e) {
-        throw new Error(`Failed to retrieve OIDC context from storage associated with session [${sessionId}]: ${e}`);
-    }
-}
-async function saveSessionInfoToStorage(storageUtility, sessionId, webId, isLoggedIn, refreshToken, secure, dpopKey) {
-    if (refreshToken !== undefined) {
-        await storageUtility.setForUser(sessionId, { refreshToken }, { secure });
-    }
-    if (webId !== undefined) {
-        await storageUtility.setForUser(sessionId, { webId }, { secure });
-    }
-    if (isLoggedIn !== undefined) {
-        await storageUtility.setForUser(sessionId, { isLoggedIn }, { secure });
-    }
-    if (dpopKey !== undefined) {
-        await storageUtility.setForUser(sessionId, {
-            publicKey: JSON.stringify(dpopKey.publicKey),
-            privateKey: JSON.stringify(await jose.exportJWK(dpopKey.privateKey)),
-        }, { secure });
-    }
-}
-class StorageUtility {
-    constructor(secureStorage, insecureStorage) {
-        this.secureStorage = secureStorage;
-        this.insecureStorage = insecureStorage;
-    }
-    getKey(userId) {
-        return `solidClientAuthenticationUser:${userId}`;
-    }
-    async getUserData(userId, secure) {
-        const stored = await (secure
-            ? this.secureStorage
-            : this.insecureStorage).get(this.getKey(userId));
-        if (stored === undefined) {
-            return {};
-        }
-        try {
-            return JSON.parse(stored);
-        }
-        catch (err) {
-            throw new Error(`Data for user [${userId}] in [${secure ? "secure" : "unsecure"}] storage is corrupted - expected valid JSON, but got: ${stored}`);
-        }
-    }
-    async setUserData(userId, data, secure) {
-        await (secure ? this.secureStorage : this.insecureStorage).set(this.getKey(userId), JSON.stringify(data));
-    }
-    async get(key, options) {
-        const value = await ((options === null || options === void 0 ? void 0 : options.secure)
-            ? this.secureStorage
-            : this.insecureStorage).get(key);
-        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
-            throw new Error(`[${key}] is not stored`);
-        }
-        return value;
-    }
-    async set(key, value, options) {
-        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).set(key, value);
-    }
-    async delete(key, options) {
-        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(key);
-    }
-    async getForUser(userId, key, options) {
-        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        let value;
-        if (!userData || !userData[key]) {
-            value = undefined;
-        }
-        value = userData[key];
-        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
-            throw new Error(`Field [${key}] for user [${userId}] is not stored`);
-        }
-        return value || undefined;
-    }
-    async setForUser(userId, values, options) {
-        let userData;
-        try {
-            userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        }
-        catch (_a) {
-            userData = {};
-        }
-        await this.setUserData(userId, { ...userData, ...values }, options === null || options === void 0 ? void 0 : options.secure);
-    }
-    async deleteForUser(userId, key, options) {
-        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        delete userData[key];
-        await this.setUserData(userId, userData, options === null || options === void 0 ? void 0 : options.secure);
-    }
-    async deleteAllUserData(userId, options) {
-        await ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(this.getKey(userId));
-    }
+async function getSessionIdFromOauthState(storageUtility, oauthState) {
+    return storageUtility.getForUser(oauthState, "sessionId");
+}
+async function loadOidcContextFromStorage(sessionId, storageUtility, configFetcher) {
+    try {
+        const [issuerIri, codeVerifier, storedRedirectIri, dpop] = await Promise.all([
+            storageUtility.getForUser(sessionId, "issuer", {
+                errorIfNull: true,
+            }),
+            storageUtility.getForUser(sessionId, "codeVerifier"),
+            storageUtility.getForUser(sessionId, "redirectUrl"),
+            storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
+        ]);
+        await storageUtility.deleteForUser(sessionId, "codeVerifier");
+        const issuerConfig = await configFetcher.fetchConfig(issuerIri);
+        return {
+            codeVerifier,
+            redirectUrl: storedRedirectIri,
+            issuerConfig,
+            dpop: dpop === "true",
+        };
+    }
+    catch (e) {
+        throw new Error(`Failed to retrieve OIDC context from storage associated with session [${sessionId}]: ${e}`);
+    }
+}
+async function saveSessionInfoToStorage(storageUtility, sessionId, webId, isLoggedIn, refreshToken, secure, dpopKey) {
+    if (refreshToken !== undefined) {
+        await storageUtility.setForUser(sessionId, { refreshToken }, { secure });
+    }
+    if (webId !== undefined) {
+        await storageUtility.setForUser(sessionId, { webId }, { secure });
+    }
+    if (isLoggedIn !== undefined) {
+        await storageUtility.setForUser(sessionId, { isLoggedIn }, { secure });
+    }
+    if (dpopKey !== undefined) {
+        await storageUtility.setForUser(sessionId, {
+            publicKey: JSON.stringify(dpopKey.publicKey),
+            privateKey: JSON.stringify(await jose.exportJWK(dpopKey.privateKey)),
+        }, { secure });
+    }
+}
+class StorageUtility {
+    constructor(secureStorage, insecureStorage) {
+        this.secureStorage = secureStorage;
+        this.insecureStorage = insecureStorage;
+    }
+    getKey(userId) {
+        return `solidClientAuthenticationUser:${userId}`;
+    }
+    async getUserData(userId, secure) {
+        const stored = await (secure
+            ? this.secureStorage
+            : this.insecureStorage).get(this.getKey(userId));
+        if (stored === undefined) {
+            return {};
+        }
+        try {
+            return JSON.parse(stored);
+        }
+        catch (err) {
+            throw new Error(`Data for user [${userId}] in [${secure ? "secure" : "unsecure"}] storage is corrupted - expected valid JSON, but got: ${stored}`);
+        }
+    }
+    async setUserData(userId, data, secure) {
+        await (secure ? this.secureStorage : this.insecureStorage).set(this.getKey(userId), JSON.stringify(data));
+    }
+    async get(key, options) {
+        const value = await ((options === null || options === void 0 ? void 0 : options.secure)
+            ? this.secureStorage
+            : this.insecureStorage).get(key);
+        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
+            throw new Error(`[${key}] is not stored`);
+        }
+        return value;
+    }
+    async set(key, value, options) {
+        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).set(key, value);
+    }
+    async delete(key, options) {
+        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(key);
+    }
+    async getForUser(userId, key, options) {
+        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        let value;
+        if (!userData || !userData[key]) {
+            value = undefined;
+        }
+        value = userData[key];
+        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
+            throw new Error(`Field [${key}] for user [${userId}] is not stored`);
+        }
+        return value || undefined;
+    }
+    async setForUser(userId, values, options) {
+        let userData;
+        try {
+            userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        }
+        catch (_a) {
+            userData = {};
+        }
+        await this.setUserData(userId, { ...userData, ...values }, options === null || options === void 0 ? void 0 : options.secure);
+    }
+    async deleteForUser(userId, key, options) {
+        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        delete userData[key];
+        await this.setUserData(userId, userData, options === null || options === void 0 ? void 0 : options.secure);
+    }
+    async deleteAllUserData(userId, options) {
+        await ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(this.getKey(userId));
+    }
 }
 
-class InMemoryStorage {
-    constructor() {
-        this.map = {};
-    }
-    async get(key) {
-        return this.map[key] || undefined;
-    }
-    async set(key, value) {
-        this.map[key] = value;
-    }
-    async delete(key) {
-        delete this.map[key];
-    }
+class InMemoryStorage {
+    constructor() {
+        this.map = {};
+    }
+    async get(key) {
+        return this.map[key] || undefined;
+    }
+    async set(key, value) {
+        this.map[key] = value;
+    }
+    async delete(key) {
+        delete this.map[key];
+    }
 }
 
-class ConfigurationError extends Error {
-    constructor(message) {
-        super(message);
-    }
+class ConfigurationError extends Error {
+    constructor(message) {
+        super(message);
+    }
 }
 
-class NotImplementedError extends Error {
-    constructor(methodName) {
-        super(`[${methodName}] is not implemented`);
-    }
+class NotImplementedError extends Error {
+    constructor(methodName) {
+        super(`[${methodName}] is not implemented`);
+    }
 }
 
-class InvalidResponseError extends Error {
-    constructor(missingFields) {
-        super(`Invalid response from OIDC provider: missing fields ${missingFields}`);
-        this.missingFields = missingFields;
-    }
+class InvalidResponseError extends Error {
+    constructor(missingFields) {
+        super(`Invalid response from OIDC provider: missing fields ${missingFields}`);
+        this.missingFields = missingFields;
+    }
 }
 
-class OidcProviderError extends Error {
-    constructor(message, error, errorDescription) {
-        super(message);
-        this.error = error;
-        this.errorDescription = errorDescription;
-    }
+class OidcProviderError extends Error {
+    constructor(message, error, errorDescription) {
+        super(message);
+        this.error = error;
+        this.errorDescription = errorDescription;
+    }
 }
 
-function normalizeHTU(audience) {
-    const audienceUrl = new URL(audience);
-    return new URL(audienceUrl.pathname, audienceUrl.origin).toString();
-}
-async function createDpopHeader(audience, method, dpopKey) {
-    return new jose.SignJWT({
-        htu: normalizeHTU(audience),
-        htm: method.toUpperCase(),
-        jti: uuid.v4(),
-    })
-        .setProtectedHeader({
-        alg: PREFERRED_SIGNING_ALG[0],
-        jwk: dpopKey.publicKey,
-        typ: "dpop+jwt",
-    })
-        .setIssuedAt()
-        .sign(dpopKey.privateKey, {});
-}
-async function generateDpopKeyPair() {
-    const { privateKey, publicKey } = await jose.generateKeyPair(PREFERRED_SIGNING_ALG[0]);
-    const dpopKeyPair = {
-        privateKey,
-        publicKey: await jose.exportJWK(publicKey),
-    };
-    [dpopKeyPair.publicKey.alg] = PREFERRED_SIGNING_ALG;
-    return dpopKeyPair;
+function normalizeHTU(audience) {
+    const audienceUrl = new URL(audience);
+    return new URL(audienceUrl.pathname, audienceUrl.origin).toString();
+}
+async function createDpopHeader(audience, method, dpopKey) {
+    return new jose.SignJWT({
+        htu: normalizeHTU(audience),
+        htm: method.toUpperCase(),
+        jti: uuid.v4(),
+    })
+        .setProtectedHeader({
+        alg: PREFERRED_SIGNING_ALG[0],
+        jwk: dpopKey.publicKey,
+        typ: "dpop+jwt",
+    })
+        .setIssuedAt()
+        .sign(dpopKey.privateKey, {});
+}
+async function generateDpopKeyPair() {
+    const { privateKey, publicKey } = await jose.generateKeyPair(PREFERRED_SIGNING_ALG[0]);
+    const dpopKeyPair = {
+        privateKey,
+        publicKey: await jose.exportJWK(publicKey),
+    };
+    [dpopKeyPair.publicKey.alg] = PREFERRED_SIGNING_ALG;
+    return dpopKeyPair;
 }
 
-const DEFAULT_EXPIRATION_TIME_SECONDS = 600;
-function isExpectedAuthError(statusCode) {
-    return [401, 403].includes(statusCode);
-}
-async function buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions) {
-    var _a;
-    const headers = new crossFetch.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
-    headers.set("Authorization", `DPoP ${authToken}`);
-    headers.set("DPoP", await createDpopHeader(targetUrl, (_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.method) !== null && _a !== void 0 ? _a : "get", dpopKey));
-    return {
-        ...defaultOptions,
-        headers,
-    };
-}
-async function buildAuthenticatedHeaders(targetUrl, authToken, dpopKey, defaultOptions) {
-    if (dpopKey !== undefined) {
-        return buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions);
-    }
-    const headers = new crossFetch.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
-    headers.set("Authorization", `Bearer ${authToken}`);
-    return {
-        ...defaultOptions,
-        headers,
-    };
-}
-async function makeAuthenticatedRequest(unauthFetch, accessToken, url, defaultRequestInit, dpopKey) {
-    return unauthFetch(url, await buildAuthenticatedHeaders(url.toString(), accessToken, dpopKey, defaultRequestInit));
-}
-async function refreshAccessToken(refreshOptions, dpopKey, eventEmitter) {
-    var _a;
-    const tokenSet = await refreshOptions.tokenRefresher.refresh(refreshOptions.sessionId, refreshOptions.refreshToken, dpopKey);
-    eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.SESSION_EXTENDED, (_a = tokenSet.expiresIn) !== null && _a !== void 0 ? _a : DEFAULT_EXPIRATION_TIME_SECONDS);
-    if (typeof tokenSet.refreshToken === "string") {
-        eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.NEW_REFRESH_TOKEN, tokenSet.refreshToken);
-    }
-    return {
-        accessToken: tokenSet.accessToken,
-        refreshToken: tokenSet.refreshToken,
-        expiresIn: tokenSet.expiresIn,
-    };
-}
-const computeRefreshDelay = (expiresIn) => {
-    if (expiresIn !== undefined) {
-        return expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS > 0
-            ?
-                expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS
-            : expiresIn;
-    }
-    return DEFAULT_EXPIRATION_TIME_SECONDS;
-};
-async function buildAuthenticatedFetch(unauthFetch, accessToken, options) {
-    var _a;
-    let currentAccessToken = accessToken;
-    let latestTimeout;
-    const currentRefreshOptions = options === null || options === void 0 ? void 0 : options.refreshOptions;
-    if (currentRefreshOptions !== undefined) {
-        const proactivelyRefreshToken = async () => {
-            var _a, _b, _c, _d;
-            try {
-                const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, options.dpopKey, options.eventEmitter);
-                currentAccessToken = refreshedAccessToken;
-                if (refreshToken !== undefined) {
-                    currentRefreshOptions.refreshToken = refreshToken;
-                }
-                clearTimeout(latestTimeout);
-                latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
-                (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
-            }
-            catch (e) {
-                if (e instanceof OidcProviderError) {
-                    (_b = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(EVENTS.ERROR, e.error, e.errorDescription);
-                    (_c = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _c === void 0 ? void 0 : _c.emit(EVENTS.SESSION_EXPIRED);
-                }
-                if (e instanceof InvalidResponseError &&
-                    e.missingFields.includes("access_token")) {
-                    (_d = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _d === void 0 ? void 0 : _d.emit(EVENTS.SESSION_EXPIRED);
-                }
-            }
-        };
-        latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(options.expiresIn) * 1000);
-        (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
-    }
-    else if (options !== undefined && options.eventEmitter !== undefined) {
-        const expirationTimeout = setTimeout(() => {
-            options.eventEmitter.emit(EVENTS.SESSION_EXPIRED);
-        }, computeRefreshDelay(options.expiresIn) * 1000);
-        options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
-    }
-    return async (url, requestInit) => {
-        let response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, url, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
-        const failedButNotExpectedAuthError = !response.ok && !isExpectedAuthError(response.status);
-        if (response.ok || failedButNotExpectedAuthError) {
-            return response;
-        }
-        const hasBeenRedirected = response.url !== url;
-        if (hasBeenRedirected && (options === null || options === void 0 ? void 0 : options.dpopKey) !== undefined) {
-            response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, response.url, requestInit, options.dpopKey);
-        }
-        return response;
-    };
+const DEFAULT_EXPIRATION_TIME_SECONDS = 600;
+function isExpectedAuthError(statusCode) {
+    return [401, 403].includes(statusCode);
+}
+async function buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions) {
+    var _a;
+    const headers = new universalFetch.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
+    headers.set("Authorization", `DPoP ${authToken}`);
+    headers.set("DPoP", await createDpopHeader(targetUrl, (_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.method) !== null && _a !== void 0 ? _a : "get", dpopKey));
+    return {
+        ...defaultOptions,
+        headers,
+    };
+}
+async function buildAuthenticatedHeaders(targetUrl, authToken, dpopKey, defaultOptions) {
+    if (dpopKey !== undefined) {
+        return buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions);
+    }
+    const headers = new universalFetch.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
+    headers.set("Authorization", `Bearer ${authToken}`);
+    return {
+        ...defaultOptions,
+        headers,
+    };
+}
+async function makeAuthenticatedRequest(unauthFetch, accessToken, url, defaultRequestInit, dpopKey) {
+    return unauthFetch(url, await buildAuthenticatedHeaders(url.toString(), accessToken, dpopKey, defaultRequestInit));
+}
+async function refreshAccessToken(refreshOptions, dpopKey, eventEmitter) {
+    var _a;
+    const tokenSet = await refreshOptions.tokenRefresher.refresh(refreshOptions.sessionId, refreshOptions.refreshToken, dpopKey);
+    eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.SESSION_EXTENDED, (_a = tokenSet.expiresIn) !== null && _a !== void 0 ? _a : DEFAULT_EXPIRATION_TIME_SECONDS);
+    if (typeof tokenSet.refreshToken === "string") {
+        eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.NEW_REFRESH_TOKEN, tokenSet.refreshToken);
+    }
+    return {
+        accessToken: tokenSet.accessToken,
+        refreshToken: tokenSet.refreshToken,
+        expiresIn: tokenSet.expiresIn,
+    };
+}
+const computeRefreshDelay = (expiresIn) => {
+    if (expiresIn !== undefined) {
+        return expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS > 0
+            ?
+                expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS
+            : expiresIn;
+    }
+    return DEFAULT_EXPIRATION_TIME_SECONDS;
+};
+async function buildAuthenticatedFetch(unauthFetch, accessToken, options) {
+    var _a;
+    let currentAccessToken = accessToken;
+    let latestTimeout;
+    const currentRefreshOptions = options === null || options === void 0 ? void 0 : options.refreshOptions;
+    if (currentRefreshOptions !== undefined) {
+        const proactivelyRefreshToken = async () => {
+            var _a, _b, _c, _d;
+            try {
+                const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, options.dpopKey, options.eventEmitter);
+                currentAccessToken = refreshedAccessToken;
+                if (refreshToken !== undefined) {
+                    currentRefreshOptions.refreshToken = refreshToken;
+                }
+                clearTimeout(latestTimeout);
+                latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
+                (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+            }
+            catch (e) {
+                if (e instanceof OidcProviderError) {
+                    (_b = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(EVENTS.ERROR, e.error, e.errorDescription);
+                    (_c = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _c === void 0 ? void 0 : _c.emit(EVENTS.SESSION_EXPIRED);
+                }
+                if (e instanceof InvalidResponseError &&
+                    e.missingFields.includes("access_token")) {
+                    (_d = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _d === void 0 ? void 0 : _d.emit(EVENTS.SESSION_EXPIRED);
+                }
+            }
+        };
+        latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(options.expiresIn) * 1000);
+        (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+    }
+    else if (options !== undefined && options.eventEmitter !== undefined) {
+        const expirationTimeout = setTimeout(() => {
+            options.eventEmitter.emit(EVENTS.SESSION_EXPIRED);
+        }, computeRefreshDelay(options.expiresIn) * 1000);
+        options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
+    }
+    return async (url, requestInit) => {
+        let response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, url, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
+        const failedButNotExpectedAuthError = !response.ok && !isExpectedAuthError(response.status);
+        if (response.ok || failedButNotExpectedAuthError) {
+            return response;
+        }
+        const hasBeenRedirected = response.url !== url;
+        if (hasBeenRedirected && (options === null || options === void 0 ? void 0 : options.dpopKey) !== undefined) {
+            response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, response.url, requestInit, options.dpopKey);
+        }
+        return response;
+    };
 }
 
-const StorageUtilityGetResponse = "getResponse";
-const StorageUtilityMock = {
-    get: async (key, options) => StorageUtilityGetResponse,
-    set: async (key, value) => {
-    },
-    delete: async (key) => {
-    },
-    getForUser: async (userId, key, options) => StorageUtilityGetResponse,
-    setForUser: async (userId, values, options) => {
-    },
-    deleteForUser: async (userId, key, options) => {
-    },
-    deleteAllUserData: async (userId, options) => {
-    },
-};
-const mockStorage = (stored) => {
-    const store = stored;
-    return {
-        get: async (key) => {
-            if (store[key] === undefined) {
-                return undefined;
-            }
-            if (typeof store[key] === "string") {
-                return store[key];
-            }
-            return JSON.stringify(store[key]);
-        },
-        set: async (key, value) => {
-            store[key] = value;
-        },
-        delete: async (key) => {
-            delete store[key];
-        },
-    };
-};
-const mockStorageUtility = (stored, isSecure = false) => {
-    if (isSecure) {
-        return new StorageUtility(mockStorage(stored), mockStorage({}));
-    }
-    return new StorageUtility(mockStorage({}), mockStorage(stored));
+const StorageUtilityGetResponse = "getResponse";
+const StorageUtilityMock = {
+    get: async (key, options) => StorageUtilityGetResponse,
+    set: async (key, value) => {
+    },
+    delete: async (key) => {
+    },
+    getForUser: async (userId, key, options) => StorageUtilityGetResponse,
+    setForUser: async (userId, values, options) => {
+    },
+    deleteForUser: async (userId, key, options) => {
+    },
+    deleteAllUserData: async (userId, options) => {
+    },
+};
+const mockStorage = (stored) => {
+    const store = stored;
+    return {
+        get: async (key) => {
+            if (store[key] === undefined) {
+                return undefined;
+            }
+            if (typeof store[key] === "string") {
+                return store[key];
+            }
+            return JSON.stringify(store[key]);
+        },
+        set: async (key, value) => {
+            store[key] = value;
+        },
+        delete: async (key) => {
+            delete store[key];
+        },
+    };
+};
+const mockStorageUtility = (stored, isSecure = false) => {
+    if (isSecure) {
+        return new StorageUtility(mockStorage(stored), mockStorage({}));
+    }
+    return new StorageUtility(mockStorage({}), mockStorage(stored));
 };
 
 exports.AggregateHandler = AggregateHandler;
@@ -29584,6 +29958,29 @@ function validate(uuid) {
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (validate);
 
+/***/ }),
+
+/***/ "./node_modules/@inrupt/universal-fetch/dist/index-browser.js":
+/*!********************************************************************!*\
+  !*** ./node_modules/@inrupt/universal-fetch/dist/index-browser.js ***!
+  \********************************************************************/
+/***/ ((__unused_webpack_module, exports) => {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({ value: true }));
+
+var indexBrowser = globalThis.fetch;
+const { fetch, Response, Request, Headers } = globalThis;
+
+exports.Headers = Headers;
+exports.Request = Request;
+exports.Response = Response;
+exports["default"] = indexBrowser;
+exports.fetch = fetch;
+
+
 /***/ }),
 
 /***/ "./node_modules/@noble/curves/_shortw_utils.js":
@@ -60228,518 +60625,541 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "saveSessionInfoToStorage": () => (/* binding */ saveSessionInfoToStorage)
 /* harmony export */ });
 /* harmony import */ var events__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! events */ "./node_modules/events/events.js");
-/* harmony import */ var cross_fetch__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! cross-fetch */ "./node_modules/cross-fetch/dist/browser-ponyfill.js");
-/* harmony import */ var jose__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! jose */ "./node_modules/jose/dist/browser/index.js");
+/* harmony import */ var _inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! @inrupt/universal-fetch */ "./node_modules/@inrupt/universal-fetch/dist/index-browser.mjs");
+/* harmony import */ var jose__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! jose */ "./node_modules/jose/dist/browser/index.js");
 /* harmony import */ var uuid__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! uuid */ "./node_modules/@inrupt/solid-client-authn-core/node_modules/uuid/dist/esm-browser/v4.js");
 
 
 
 
 
-const SOLID_CLIENT_AUTHN_KEY_PREFIX = "solidClientAuthn:";
-const PREFERRED_SIGNING_ALG = ["ES256", "RS256"];
-const EVENTS = {
-    ERROR: "error",
-    LOGIN: "login",
-    LOGOUT: "logout",
-    NEW_REFRESH_TOKEN: "newRefreshToken",
-    SESSION_EXPIRED: "sessionExpired",
-    SESSION_EXTENDED: "sessionExtended",
-    SESSION_RESTORED: "sessionRestore",
-    TIMEOUT_SET: "timeoutSet",
-};
-const REFRESH_BEFORE_EXPIRATION_SECONDS = 5;
-const SCOPE_OPENID = "openid";
-const SCOPE_OFFLINE = "offline_access";
-const SCOPE_WEBID = "webid";
+const SOLID_CLIENT_AUTHN_KEY_PREFIX = "solidClientAuthn:";
+const PREFERRED_SIGNING_ALG = ["ES256", "RS256"];
+const EVENTS = {
+    ERROR: "error",
+    LOGIN: "login",
+    LOGOUT: "logout",
+    NEW_REFRESH_TOKEN: "newRefreshToken",
+    SESSION_EXPIRED: "sessionExpired",
+    SESSION_EXTENDED: "sessionExtended",
+    SESSION_RESTORED: "sessionRestore",
+    TIMEOUT_SET: "timeoutSet",
+};
+const REFRESH_BEFORE_EXPIRATION_SECONDS = 5;
+const SCOPE_OPENID = "openid";
+const SCOPE_OFFLINE = "offline_access";
+const SCOPE_WEBID = "webid";
 const DEFAULT_SCOPES = [SCOPE_OPENID, SCOPE_OFFLINE, SCOPE_WEBID].join(" ");
 
-const buildProxyHandler = (toExclude, errorMessage) => ({
-    get(target, prop, receiver) {
-        if (!Object.getOwnPropertyNames(events__WEBPACK_IMPORTED_MODULE_0__.EventEmitter).includes(prop) &&
-            Object.getOwnPropertyNames(toExclude).includes(prop)) {
-            throw new Error(`${errorMessage}: [${prop}] is not supported`);
-        }
-        return Reflect.get(target, prop, receiver);
-    },
+const buildProxyHandler = (toExclude, errorMessage) => ({
+    get(target, prop, receiver) {
+        if (!Object.getOwnPropertyNames(events__WEBPACK_IMPORTED_MODULE_0__.EventEmitter).includes(prop) &&
+            Object.getOwnPropertyNames(toExclude).includes(prop)) {
+            throw new Error(`${errorMessage}: [${prop}] is not supported`);
+        }
+        return Reflect.get(target, prop, receiver);
+    },
 });
 
-class AggregateHandler {
-    constructor(handleables) {
-        this.handleables = handleables;
-    }
-    async getProperHandler(params) {
-        const canHandleList = await Promise.all(this.handleables.map((handleable) => handleable.canHandle(...params)));
-        for (let i = 0; i < canHandleList.length; i += 1) {
-            if (canHandleList[i]) {
-                return this.handleables[i];
-            }
-        }
-        return null;
-    }
-    async canHandle(...params) {
-        return (await this.getProperHandler(params)) !== null;
-    }
-    async handle(...params) {
-        const handler = await this.getProperHandler(params);
-        if (handler) {
-            return handler.handle(...params);
-        }
-        throw new Error(`[${this.constructor.name}] cannot find a suitable handler for: ${params
-            .map((param) => {
-            try {
-                return JSON.stringify(param);
-            }
-            catch (err) {
-                return param.toString();
-            }
-        })
-            .join(", ")}`);
-    }
+class AggregateHandler {
+    constructor(handleables) {
+        this.handleables = handleables;
+    }
+    async getProperHandler(params) {
+        const canHandleList = await Promise.all(this.handleables.map((handleable) => handleable.canHandle(...params)));
+        for (let i = 0; i < canHandleList.length; i += 1) {
+            if (canHandleList[i]) {
+                return this.handleables[i];
+            }
+        }
+        return null;
+    }
+    async canHandle(...params) {
+        return (await this.getProperHandler(params)) !== null;
+    }
+    async handle(...params) {
+        const handler = await this.getProperHandler(params);
+        if (handler) {
+            return handler.handle(...params);
+        }
+        throw new Error(`[${this.constructor.name}] cannot find a suitable handler for: ${params
+            .map((param) => {
+            try {
+                return JSON.stringify(param);
+            }
+            catch (err) {
+                return param.toString();
+            }
+        })
+            .join(", ")}`);
+    }
 }
 
-async function fetchJwks(jwksIri, issuerIri) {
-    const jwksResponse = await (0,cross_fetch__WEBPACK_IMPORTED_MODULE_1__.fetch)(jwksIri);
-    if (jwksResponse.status !== 200) {
-        throw new Error(`Could not fetch JWKS for [${issuerIri}] at [${jwksIri}]: ${jwksResponse.status} ${jwksResponse.statusText}`);
-    }
-    let jwk;
-    try {
-        jwk = (await jwksResponse.json()).keys[0];
-    }
-    catch (e) {
-        throw new Error(`Malformed JWKS for [${issuerIri}] at [${jwksIri}]: ${e.message}`);
-    }
-    return jwk;
-}
-async function getWebidFromTokenPayload(idToken, jwksIri, issuerIri, clientId) {
-    const jwk = await fetchJwks(jwksIri, issuerIri);
-    let payload;
-    try {
-        const { payload: verifiedPayload } = await (0,jose__WEBPACK_IMPORTED_MODULE_2__.jwtVerify)(idToken, await (0,jose__WEBPACK_IMPORTED_MODULE_2__.importJWK)(jwk), {
-            issuer: issuerIri,
-            audience: clientId,
-        });
-        payload = verifiedPayload;
-    }
-    catch (e) {
-        throw new Error(`Token verification failed: ${e.stack}`);
-    }
-    if (typeof payload.webid === "string") {
-        return payload.webid;
-    }
-    if (typeof payload.sub !== "string") {
-        throw new Error(`The token ${JSON.stringify(payload)} is invalid: it has no 'webid' claim and no 'sub' claim.`);
-    }
-    try {
-        new URL(payload.sub);
-        return payload.sub;
-    }
-    catch (e) {
-        throw new Error(`The token has no 'webid' claim, and its 'sub' claim of [${payload.sub}] is invalid as a URL - error [${e}].`);
-    }
+async function fetchJwks(jwksIri, issuerIri) {
+    const jwksResponse = await (0,_inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__.fetch)(jwksIri);
+    if (jwksResponse.status !== 200) {
+        throw new Error(`Could not fetch JWKS for [${issuerIri}] at [${jwksIri}]: ${jwksResponse.status} ${jwksResponse.statusText}`);
+    }
+    let jwk;
+    try {
+        jwk = (await jwksResponse.json()).keys[0];
+    }
+    catch (e) {
+        throw new Error(`Malformed JWKS for [${issuerIri}] at [${jwksIri}]: ${e.message}`);
+    }
+    return jwk;
+}
+async function getWebidFromTokenPayload(idToken, jwksIri, issuerIri, clientId) {
+    const jwk = await fetchJwks(jwksIri, issuerIri);
+    let payload;
+    try {
+        const { payload: verifiedPayload } = await (0,jose__WEBPACK_IMPORTED_MODULE_1__.jwtVerify)(idToken, await (0,jose__WEBPACK_IMPORTED_MODULE_1__.importJWK)(jwk), {
+            issuer: issuerIri,
+            audience: clientId,
+        });
+        payload = verifiedPayload;
+    }
+    catch (e) {
+        throw new Error(`Token verification failed: ${e.stack}`);
+    }
+    if (typeof payload.webid === "string") {
+        return payload.webid;
+    }
+    if (typeof payload.sub !== "string") {
+        throw new Error(`The token ${JSON.stringify(payload)} is invalid: it has no 'webid' claim and no 'sub' claim.`);
+    }
+    try {
+        new URL(payload.sub);
+        return payload.sub;
+    }
+    catch (e) {
+        throw new Error(`The token has no 'webid' claim, and its 'sub' claim of [${payload.sub}] is invalid as a URL - error [${e}].`);
+    }
 }
 
-function isValidRedirectUrl(redirectUrl) {
-    try {
-        const urlObject = new URL(redirectUrl);
-        return urlObject.hash === "";
-    }
-    catch (e) {
-        return false;
-    }
+function isValidRedirectUrl(redirectUrl) {
+    try {
+        const urlObject = new URL(redirectUrl);
+        return urlObject.hash === "";
+    }
+    catch (e) {
+        return false;
+    }
 }
 
-function isSupportedTokenType(token) {
-    return typeof token === "string" && ["DPoP", "Bearer"].includes(token);
+function isSupportedTokenType(token) {
+    return typeof token === "string" && ["DPoP", "Bearer"].includes(token);
 }
 
 const USER_SESSION_PREFIX = "solidClientAuthenticationUser";
 
-function isValidUrl(url) {
-    try {
-        new URL(url);
-        return true;
-    }
-    catch (_a) {
-        return false;
-    }
-}
-function determineSigningAlg(supported, preferred) {
-    var _a;
-    return ((_a = preferred.find((signingAlg) => {
-        return supported.includes(signingAlg);
-    })) !== null && _a !== void 0 ? _a : null);
-}
-function determineClientType(options, issuerConfig) {
-    if (options.clientId !== undefined && !isValidUrl(options.clientId)) {
-        return "static";
-    }
-    if (issuerConfig.scopesSupported.includes("webid") &&
-        options.clientId !== undefined &&
-        isValidUrl(options.clientId)) {
-        return "solid-oidc";
-    }
-    return "dynamic";
-}
-async function handleRegistration(options, issuerConfig, storageUtility, clientRegistrar) {
-    const clientType = determineClientType(options, issuerConfig);
-    if (clientType === "dynamic") {
-        return clientRegistrar.getClient({
-            sessionId: options.sessionId,
-            clientName: options.clientName,
-            redirectUrl: options.redirectUrl,
-        }, issuerConfig);
-    }
-    await storageUtility.setForUser(options.sessionId, {
-        clientId: options.clientId,
-    });
-    if (options.clientSecret) {
-        await storageUtility.setForUser(options.sessionId, {
-            clientSecret: options.clientSecret,
-        });
-    }
-    if (options.clientName) {
-        await storageUtility.setForUser(options.sessionId, {
-            clientName: options.clientName,
-        });
-    }
-    return {
-        clientId: options.clientId,
-        clientSecret: options.clientSecret,
-        clientName: options.clientName,
-        clientType,
-    };
+function isValidUrl(url) {
+    try {
+        new URL(url);
+        return true;
+    }
+    catch (_a) {
+        return false;
+    }
+}
+function determineSigningAlg(supported, preferred) {
+    var _a;
+    return ((_a = preferred.find((signingAlg) => {
+        return supported.includes(signingAlg);
+    })) !== null && _a !== void 0 ? _a : null);
+}
+function determineClientType(options, issuerConfig) {
+    if (options.clientId !== undefined && !isValidUrl(options.clientId)) {
+        return "static";
+    }
+    if (issuerConfig.scopesSupported.includes("webid") &&
+        options.clientId !== undefined &&
+        isValidUrl(options.clientId)) {
+        return "solid-oidc";
+    }
+    return "dynamic";
+}
+async function handleRegistration(options, issuerConfig, storageUtility, clientRegistrar) {
+    const clientType = determineClientType(options, issuerConfig);
+    if (clientType === "dynamic") {
+        return clientRegistrar.getClient({
+            sessionId: options.sessionId,
+            clientName: options.clientName,
+            redirectUrl: options.redirectUrl,
+        }, issuerConfig);
+    }
+    await storageUtility.setForUser(options.sessionId, {
+        clientId: options.clientId,
+    });
+    if (options.clientSecret) {
+        await storageUtility.setForUser(options.sessionId, {
+            clientSecret: options.clientSecret,
+        });
+    }
+    if (options.clientName) {
+        await storageUtility.setForUser(options.sessionId, {
+            clientName: options.clientName,
+        });
+    }
+    return {
+        clientId: options.clientId,
+        clientSecret: options.clientSecret,
+        clientName: options.clientName,
+        clientType,
+    };
 }
 
-async function getSessionIdFromOauthState(storageUtility, oauthState) {
-    return storageUtility.getForUser(oauthState, "sessionId");
-}
-async function loadOidcContextFromStorage(sessionId, storageUtility, configFetcher) {
-    try {
-        const [issuerIri, codeVerifier, storedRedirectIri, dpop] = await Promise.all([
-            storageUtility.getForUser(sessionId, "issuer", {
-                errorIfNull: true,
-            }),
-            storageUtility.getForUser(sessionId, "codeVerifier"),
-            storageUtility.getForUser(sessionId, "redirectUrl"),
-            storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
-        ]);
-        await storageUtility.deleteForUser(sessionId, "codeVerifier");
-        const issuerConfig = await configFetcher.fetchConfig(issuerIri);
-        return {
-            codeVerifier,
-            redirectUrl: storedRedirectIri,
-            issuerConfig,
-            dpop: dpop === "true",
-        };
-    }
-    catch (e) {
-        throw new Error(`Failed to retrieve OIDC context from storage associated with session [${sessionId}]: ${e}`);
-    }
-}
-async function saveSessionInfoToStorage(storageUtility, sessionId, webId, isLoggedIn, refreshToken, secure, dpopKey) {
-    if (refreshToken !== undefined) {
-        await storageUtility.setForUser(sessionId, { refreshToken }, { secure });
-    }
-    if (webId !== undefined) {
-        await storageUtility.setForUser(sessionId, { webId }, { secure });
-    }
-    if (isLoggedIn !== undefined) {
-        await storageUtility.setForUser(sessionId, { isLoggedIn }, { secure });
-    }
-    if (dpopKey !== undefined) {
-        await storageUtility.setForUser(sessionId, {
-            publicKey: JSON.stringify(dpopKey.publicKey),
-            privateKey: JSON.stringify(await (0,jose__WEBPACK_IMPORTED_MODULE_2__.exportJWK)(dpopKey.privateKey)),
-        }, { secure });
-    }
-}
-class StorageUtility {
-    constructor(secureStorage, insecureStorage) {
-        this.secureStorage = secureStorage;
-        this.insecureStorage = insecureStorage;
-    }
-    getKey(userId) {
-        return `solidClientAuthenticationUser:${userId}`;
-    }
-    async getUserData(userId, secure) {
-        const stored = await (secure
-            ? this.secureStorage
-            : this.insecureStorage).get(this.getKey(userId));
-        if (stored === undefined) {
-            return {};
-        }
-        try {
-            return JSON.parse(stored);
-        }
-        catch (err) {
-            throw new Error(`Data for user [${userId}] in [${secure ? "secure" : "unsecure"}] storage is corrupted - expected valid JSON, but got: ${stored}`);
-        }
-    }
-    async setUserData(userId, data, secure) {
-        await (secure ? this.secureStorage : this.insecureStorage).set(this.getKey(userId), JSON.stringify(data));
-    }
-    async get(key, options) {
-        const value = await ((options === null || options === void 0 ? void 0 : options.secure)
-            ? this.secureStorage
-            : this.insecureStorage).get(key);
-        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
-            throw new Error(`[${key}] is not stored`);
-        }
-        return value;
-    }
-    async set(key, value, options) {
-        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).set(key, value);
-    }
-    async delete(key, options) {
-        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(key);
-    }
-    async getForUser(userId, key, options) {
-        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        let value;
-        if (!userData || !userData[key]) {
-            value = undefined;
-        }
-        value = userData[key];
-        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
-            throw new Error(`Field [${key}] for user [${userId}] is not stored`);
-        }
-        return value || undefined;
-    }
-    async setForUser(userId, values, options) {
-        let userData;
-        try {
-            userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        }
-        catch (_a) {
-            userData = {};
-        }
-        await this.setUserData(userId, { ...userData, ...values }, options === null || options === void 0 ? void 0 : options.secure);
-    }
-    async deleteForUser(userId, key, options) {
-        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
-        delete userData[key];
-        await this.setUserData(userId, userData, options === null || options === void 0 ? void 0 : options.secure);
-    }
-    async deleteAllUserData(userId, options) {
-        await ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(this.getKey(userId));
-    }
+async function getSessionIdFromOauthState(storageUtility, oauthState) {
+    return storageUtility.getForUser(oauthState, "sessionId");
+}
+async function loadOidcContextFromStorage(sessionId, storageUtility, configFetcher) {
+    try {
+        const [issuerIri, codeVerifier, storedRedirectIri, dpop] = await Promise.all([
+            storageUtility.getForUser(sessionId, "issuer", {
+                errorIfNull: true,
+            }),
+            storageUtility.getForUser(sessionId, "codeVerifier"),
+            storageUtility.getForUser(sessionId, "redirectUrl"),
+            storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
+        ]);
+        await storageUtility.deleteForUser(sessionId, "codeVerifier");
+        const issuerConfig = await configFetcher.fetchConfig(issuerIri);
+        return {
+            codeVerifier,
+            redirectUrl: storedRedirectIri,
+            issuerConfig,
+            dpop: dpop === "true",
+        };
+    }
+    catch (e) {
+        throw new Error(`Failed to retrieve OIDC context from storage associated with session [${sessionId}]: ${e}`);
+    }
+}
+async function saveSessionInfoToStorage(storageUtility, sessionId, webId, isLoggedIn, refreshToken, secure, dpopKey) {
+    if (refreshToken !== undefined) {
+        await storageUtility.setForUser(sessionId, { refreshToken }, { secure });
+    }
+    if (webId !== undefined) {
+        await storageUtility.setForUser(sessionId, { webId }, { secure });
+    }
+    if (isLoggedIn !== undefined) {
+        await storageUtility.setForUser(sessionId, { isLoggedIn }, { secure });
+    }
+    if (dpopKey !== undefined) {
+        await storageUtility.setForUser(sessionId, {
+            publicKey: JSON.stringify(dpopKey.publicKey),
+            privateKey: JSON.stringify(await (0,jose__WEBPACK_IMPORTED_MODULE_1__.exportJWK)(dpopKey.privateKey)),
+        }, { secure });
+    }
+}
+class StorageUtility {
+    constructor(secureStorage, insecureStorage) {
+        this.secureStorage = secureStorage;
+        this.insecureStorage = insecureStorage;
+    }
+    getKey(userId) {
+        return `solidClientAuthenticationUser:${userId}`;
+    }
+    async getUserData(userId, secure) {
+        const stored = await (secure
+            ? this.secureStorage
+            : this.insecureStorage).get(this.getKey(userId));
+        if (stored === undefined) {
+            return {};
+        }
+        try {
+            return JSON.parse(stored);
+        }
+        catch (err) {
+            throw new Error(`Data for user [${userId}] in [${secure ? "secure" : "unsecure"}] storage is corrupted - expected valid JSON, but got: ${stored}`);
+        }
+    }
+    async setUserData(userId, data, secure) {
+        await (secure ? this.secureStorage : this.insecureStorage).set(this.getKey(userId), JSON.stringify(data));
+    }
+    async get(key, options) {
+        const value = await ((options === null || options === void 0 ? void 0 : options.secure)
+            ? this.secureStorage
+            : this.insecureStorage).get(key);
+        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
+            throw new Error(`[${key}] is not stored`);
+        }
+        return value;
+    }
+    async set(key, value, options) {
+        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).set(key, value);
+    }
+    async delete(key, options) {
+        return ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(key);
+    }
+    async getForUser(userId, key, options) {
+        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        let value;
+        if (!userData || !userData[key]) {
+            value = undefined;
+        }
+        value = userData[key];
+        if (value === undefined && (options === null || options === void 0 ? void 0 : options.errorIfNull)) {
+            throw new Error(`Field [${key}] for user [${userId}] is not stored`);
+        }
+        return value || undefined;
+    }
+    async setForUser(userId, values, options) {
+        let userData;
+        try {
+            userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        }
+        catch (_a) {
+            userData = {};
+        }
+        await this.setUserData(userId, { ...userData, ...values }, options === null || options === void 0 ? void 0 : options.secure);
+    }
+    async deleteForUser(userId, key, options) {
+        const userData = await this.getUserData(userId, options === null || options === void 0 ? void 0 : options.secure);
+        delete userData[key];
+        await this.setUserData(userId, userData, options === null || options === void 0 ? void 0 : options.secure);
+    }
+    async deleteAllUserData(userId, options) {
+        await ((options === null || options === void 0 ? void 0 : options.secure) ? this.secureStorage : this.insecureStorage).delete(this.getKey(userId));
+    }
 }
 
-class InMemoryStorage {
-    constructor() {
-        this.map = {};
-    }
-    async get(key) {
-        return this.map[key] || undefined;
-    }
-    async set(key, value) {
-        this.map[key] = value;
-    }
-    async delete(key) {
-        delete this.map[key];
-    }
+class InMemoryStorage {
+    constructor() {
+        this.map = {};
+    }
+    async get(key) {
+        return this.map[key] || undefined;
+    }
+    async set(key, value) {
+        this.map[key] = value;
+    }
+    async delete(key) {
+        delete this.map[key];
+    }
 }
 
-class ConfigurationError extends Error {
-    constructor(message) {
-        super(message);
-    }
+class ConfigurationError extends Error {
+    constructor(message) {
+        super(message);
+    }
 }
 
-class NotImplementedError extends Error {
-    constructor(methodName) {
-        super(`[${methodName}] is not implemented`);
-    }
+class NotImplementedError extends Error {
+    constructor(methodName) {
+        super(`[${methodName}] is not implemented`);
+    }
 }
 
-class InvalidResponseError extends Error {
-    constructor(missingFields) {
-        super(`Invalid response from OIDC provider: missing fields ${missingFields}`);
-        this.missingFields = missingFields;
-    }
+class InvalidResponseError extends Error {
+    constructor(missingFields) {
+        super(`Invalid response from OIDC provider: missing fields ${missingFields}`);
+        this.missingFields = missingFields;
+    }
 }
 
-class OidcProviderError extends Error {
-    constructor(message, error, errorDescription) {
-        super(message);
-        this.error = error;
-        this.errorDescription = errorDescription;
-    }
+class OidcProviderError extends Error {
+    constructor(message, error, errorDescription) {
+        super(message);
+        this.error = error;
+        this.errorDescription = errorDescription;
+    }
 }
 
-function normalizeHTU(audience) {
-    const audienceUrl = new URL(audience);
-    return new URL(audienceUrl.pathname, audienceUrl.origin).toString();
-}
-async function createDpopHeader(audience, method, dpopKey) {
-    return new jose__WEBPACK_IMPORTED_MODULE_2__.SignJWT({
-        htu: normalizeHTU(audience),
-        htm: method.toUpperCase(),
-        jti: (0,uuid__WEBPACK_IMPORTED_MODULE_3__["default"])(),
-    })
-        .setProtectedHeader({
-        alg: PREFERRED_SIGNING_ALG[0],
-        jwk: dpopKey.publicKey,
-        typ: "dpop+jwt",
-    })
-        .setIssuedAt()
-        .sign(dpopKey.privateKey, {});
-}
-async function generateDpopKeyPair() {
-    const { privateKey, publicKey } = await (0,jose__WEBPACK_IMPORTED_MODULE_2__.generateKeyPair)(PREFERRED_SIGNING_ALG[0]);
-    const dpopKeyPair = {
-        privateKey,
-        publicKey: await (0,jose__WEBPACK_IMPORTED_MODULE_2__.exportJWK)(publicKey),
-    };
-    [dpopKeyPair.publicKey.alg] = PREFERRED_SIGNING_ALG;
-    return dpopKeyPair;
+function normalizeHTU(audience) {
+    const audienceUrl = new URL(audience);
+    return new URL(audienceUrl.pathname, audienceUrl.origin).toString();
+}
+async function createDpopHeader(audience, method, dpopKey) {
+    return new jose__WEBPACK_IMPORTED_MODULE_1__.SignJWT({
+        htu: normalizeHTU(audience),
+        htm: method.toUpperCase(),
+        jti: (0,uuid__WEBPACK_IMPORTED_MODULE_3__["default"])(),
+    })
+        .setProtectedHeader({
+        alg: PREFERRED_SIGNING_ALG[0],
+        jwk: dpopKey.publicKey,
+        typ: "dpop+jwt",
+    })
+        .setIssuedAt()
+        .sign(dpopKey.privateKey, {});
+}
+async function generateDpopKeyPair() {
+    const { privateKey, publicKey } = await (0,jose__WEBPACK_IMPORTED_MODULE_1__.generateKeyPair)(PREFERRED_SIGNING_ALG[0]);
+    const dpopKeyPair = {
+        privateKey,
+        publicKey: await (0,jose__WEBPACK_IMPORTED_MODULE_1__.exportJWK)(publicKey),
+    };
+    [dpopKeyPair.publicKey.alg] = PREFERRED_SIGNING_ALG;
+    return dpopKeyPair;
 }
 
-const DEFAULT_EXPIRATION_TIME_SECONDS = 600;
-function isExpectedAuthError(statusCode) {
-    return [401, 403].includes(statusCode);
-}
-async function buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions) {
-    var _a;
-    const headers = new cross_fetch__WEBPACK_IMPORTED_MODULE_1__.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
-    headers.set("Authorization", `DPoP ${authToken}`);
-    headers.set("DPoP", await createDpopHeader(targetUrl, (_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.method) !== null && _a !== void 0 ? _a : "get", dpopKey));
-    return {
-        ...defaultOptions,
-        headers,
-    };
-}
-async function buildAuthenticatedHeaders(targetUrl, authToken, dpopKey, defaultOptions) {
-    if (dpopKey !== undefined) {
-        return buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions);
-    }
-    const headers = new cross_fetch__WEBPACK_IMPORTED_MODULE_1__.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
-    headers.set("Authorization", `Bearer ${authToken}`);
-    return {
-        ...defaultOptions,
-        headers,
-    };
-}
-async function makeAuthenticatedRequest(unauthFetch, accessToken, url, defaultRequestInit, dpopKey) {
-    return unauthFetch(url, await buildAuthenticatedHeaders(url.toString(), accessToken, dpopKey, defaultRequestInit));
-}
-async function refreshAccessToken(refreshOptions, dpopKey, eventEmitter) {
-    var _a;
-    const tokenSet = await refreshOptions.tokenRefresher.refresh(refreshOptions.sessionId, refreshOptions.refreshToken, dpopKey);
-    eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.SESSION_EXTENDED, (_a = tokenSet.expiresIn) !== null && _a !== void 0 ? _a : DEFAULT_EXPIRATION_TIME_SECONDS);
-    if (typeof tokenSet.refreshToken === "string") {
-        eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.NEW_REFRESH_TOKEN, tokenSet.refreshToken);
-    }
-    return {
-        accessToken: tokenSet.accessToken,
-        refreshToken: tokenSet.refreshToken,
-        expiresIn: tokenSet.expiresIn,
-    };
-}
-const computeRefreshDelay = (expiresIn) => {
-    if (expiresIn !== undefined) {
-        return expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS > 0
-            ?
-                expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS
-            : expiresIn;
-    }
-    return DEFAULT_EXPIRATION_TIME_SECONDS;
-};
-async function buildAuthenticatedFetch(unauthFetch, accessToken, options) {
-    var _a;
-    let currentAccessToken = accessToken;
-    let latestTimeout;
-    const currentRefreshOptions = options === null || options === void 0 ? void 0 : options.refreshOptions;
-    if (currentRefreshOptions !== undefined) {
-        const proactivelyRefreshToken = async () => {
-            var _a, _b, _c, _d;
-            try {
-                const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, options.dpopKey, options.eventEmitter);
-                currentAccessToken = refreshedAccessToken;
-                if (refreshToken !== undefined) {
-                    currentRefreshOptions.refreshToken = refreshToken;
-                }
-                clearTimeout(latestTimeout);
-                latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
-                (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
-            }
-            catch (e) {
-                if (e instanceof OidcProviderError) {
-                    (_b = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(EVENTS.ERROR, e.error, e.errorDescription);
-                    (_c = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _c === void 0 ? void 0 : _c.emit(EVENTS.SESSION_EXPIRED);
-                }
-                if (e instanceof InvalidResponseError &&
-                    e.missingFields.includes("access_token")) {
-                    (_d = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _d === void 0 ? void 0 : _d.emit(EVENTS.SESSION_EXPIRED);
-                }
-            }
-        };
-        latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(options.expiresIn) * 1000);
-        (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
-    }
-    else if (options !== undefined && options.eventEmitter !== undefined) {
-        const expirationTimeout = setTimeout(() => {
-            options.eventEmitter.emit(EVENTS.SESSION_EXPIRED);
-        }, computeRefreshDelay(options.expiresIn) * 1000);
-        options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
-    }
-    return async (url, requestInit) => {
-        let response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, url, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
-        const failedButNotExpectedAuthError = !response.ok && !isExpectedAuthError(response.status);
-        if (response.ok || failedButNotExpectedAuthError) {
-            return response;
-        }
-        const hasBeenRedirected = response.url !== url;
-        if (hasBeenRedirected && (options === null || options === void 0 ? void 0 : options.dpopKey) !== undefined) {
-            response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, response.url, requestInit, options.dpopKey);
-        }
-        return response;
-    };
+const DEFAULT_EXPIRATION_TIME_SECONDS = 600;
+function isExpectedAuthError(statusCode) {
+    return [401, 403].includes(statusCode);
+}
+async function buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions) {
+    var _a;
+    const headers = new _inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
+    headers.set("Authorization", `DPoP ${authToken}`);
+    headers.set("DPoP", await createDpopHeader(targetUrl, (_a = defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.method) !== null && _a !== void 0 ? _a : "get", dpopKey));
+    return {
+        ...defaultOptions,
+        headers,
+    };
+}
+async function buildAuthenticatedHeaders(targetUrl, authToken, dpopKey, defaultOptions) {
+    if (dpopKey !== undefined) {
+        return buildDpopFetchOptions(targetUrl, authToken, dpopKey, defaultOptions);
+    }
+    const headers = new _inrupt_universal_fetch__WEBPACK_IMPORTED_MODULE_2__.Headers(defaultOptions === null || defaultOptions === void 0 ? void 0 : defaultOptions.headers);
+    headers.set("Authorization", `Bearer ${authToken}`);
+    return {
+        ...defaultOptions,
+        headers,
+    };
+}
+async function makeAuthenticatedRequest(unauthFetch, accessToken, url, defaultRequestInit, dpopKey) {
+    return unauthFetch(url, await buildAuthenticatedHeaders(url.toString(), accessToken, dpopKey, defaultRequestInit));
+}
+async function refreshAccessToken(refreshOptions, dpopKey, eventEmitter) {
+    var _a;
+    const tokenSet = await refreshOptions.tokenRefresher.refresh(refreshOptions.sessionId, refreshOptions.refreshToken, dpopKey);
+    eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.SESSION_EXTENDED, (_a = tokenSet.expiresIn) !== null && _a !== void 0 ? _a : DEFAULT_EXPIRATION_TIME_SECONDS);
+    if (typeof tokenSet.refreshToken === "string") {
+        eventEmitter === null || eventEmitter === void 0 ? void 0 : eventEmitter.emit(EVENTS.NEW_REFRESH_TOKEN, tokenSet.refreshToken);
+    }
+    return {
+        accessToken: tokenSet.accessToken,
+        refreshToken: tokenSet.refreshToken,
+        expiresIn: tokenSet.expiresIn,
+    };
+}
+const computeRefreshDelay = (expiresIn) => {
+    if (expiresIn !== undefined) {
+        return expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS > 0
+            ?
+                expiresIn - REFRESH_BEFORE_EXPIRATION_SECONDS
+            : expiresIn;
+    }
+    return DEFAULT_EXPIRATION_TIME_SECONDS;
+};
+async function buildAuthenticatedFetch(unauthFetch, accessToken, options) {
+    var _a;
+    let currentAccessToken = accessToken;
+    let latestTimeout;
+    const currentRefreshOptions = options === null || options === void 0 ? void 0 : options.refreshOptions;
+    if (currentRefreshOptions !== undefined) {
+        const proactivelyRefreshToken = async () => {
+            var _a, _b, _c, _d;
+            try {
+                const { accessToken: refreshedAccessToken, refreshToken, expiresIn, } = await refreshAccessToken(currentRefreshOptions, options.dpopKey, options.eventEmitter);
+                currentAccessToken = refreshedAccessToken;
+                if (refreshToken !== undefined) {
+                    currentRefreshOptions.refreshToken = refreshToken;
+                }
+                clearTimeout(latestTimeout);
+                latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(expiresIn) * 1000);
+                (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+            }
+            catch (e) {
+                if (e instanceof OidcProviderError) {
+                    (_b = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _b === void 0 ? void 0 : _b.emit(EVENTS.ERROR, e.error, e.errorDescription);
+                    (_c = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _c === void 0 ? void 0 : _c.emit(EVENTS.SESSION_EXPIRED);
+                }
+                if (e instanceof InvalidResponseError &&
+                    e.missingFields.includes("access_token")) {
+                    (_d = options === null || options === void 0 ? void 0 : options.eventEmitter) === null || _d === void 0 ? void 0 : _d.emit(EVENTS.SESSION_EXPIRED);
+                }
+            }
+        };
+        latestTimeout = setTimeout(proactivelyRefreshToken, computeRefreshDelay(options.expiresIn) * 1000);
+        (_a = options.eventEmitter) === null || _a === void 0 ? void 0 : _a.emit(EVENTS.TIMEOUT_SET, latestTimeout);
+    }
+    else if (options !== undefined && options.eventEmitter !== undefined) {
+        const expirationTimeout = setTimeout(() => {
+            options.eventEmitter.emit(EVENTS.SESSION_EXPIRED);
+        }, computeRefreshDelay(options.expiresIn) * 1000);
+        options.eventEmitter.emit(EVENTS.TIMEOUT_SET, expirationTimeout);
+    }
+    return async (url, requestInit) => {
+        let response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, url, requestInit, options === null || options === void 0 ? void 0 : options.dpopKey);
+        const failedButNotExpectedAuthError = !response.ok && !isExpectedAuthError(response.status);
+        if (response.ok || failedButNotExpectedAuthError) {
+            return response;
+        }
+        const hasBeenRedirected = response.url !== url;
+        if (hasBeenRedirected && (options === null || options === void 0 ? void 0 : options.dpopKey) !== undefined) {
+            response = await makeAuthenticatedRequest(unauthFetch, currentAccessToken, response.url, requestInit, options.dpopKey);
+        }
+        return response;
+    };
 }
 
-const StorageUtilityGetResponse = "getResponse";
-const StorageUtilityMock = {
-    get: async (key, options) => StorageUtilityGetResponse,
-    set: async (key, value) => {
-    },
-    delete: async (key) => {
-    },
-    getForUser: async (userId, key, options) => StorageUtilityGetResponse,
-    setForUser: async (userId, values, options) => {
-    },
-    deleteForUser: async (userId, key, options) => {
-    },
-    deleteAllUserData: async (userId, options) => {
-    },
-};
-const mockStorage = (stored) => {
-    const store = stored;
-    return {
-        get: async (key) => {
-            if (store[key] === undefined) {
-                return undefined;
-            }
-            if (typeof store[key] === "string") {
-                return store[key];
-            }
-            return JSON.stringify(store[key]);
-        },
-        set: async (key, value) => {
-            store[key] = value;
-        },
-        delete: async (key) => {
-            delete store[key];
-        },
-    };
-};
-const mockStorageUtility = (stored, isSecure = false) => {
-    if (isSecure) {
-        return new StorageUtility(mockStorage(stored), mockStorage({}));
-    }
-    return new StorageUtility(mockStorage({}), mockStorage(stored));
+const StorageUtilityGetResponse = "getResponse";
+const StorageUtilityMock = {
+    get: async (key, options) => StorageUtilityGetResponse,
+    set: async (key, value) => {
+    },
+    delete: async (key) => {
+    },
+    getForUser: async (userId, key, options) => StorageUtilityGetResponse,
+    setForUser: async (userId, values, options) => {
+    },
+    deleteForUser: async (userId, key, options) => {
+    },
+    deleteAllUserData: async (userId, options) => {
+    },
 };
+const mockStorage = (stored) => {
+    const store = stored;
+    return {
+        get: async (key) => {
+            if (store[key] === undefined) {
+                return undefined;
+            }
+            if (typeof store[key] === "string") {
+                return store[key];
+            }
+            return JSON.stringify(store[key]);
+        },
+        set: async (key, value) => {
+            store[key] = value;
+        },
+        delete: async (key) => {
+            delete store[key];
+        },
+    };
+};
+const mockStorageUtility = (stored, isSecure = false) => {
+    if (isSecure) {
+        return new StorageUtility(mockStorage(stored), mockStorage({}));
+    }
+    return new StorageUtility(mockStorage({}), mockStorage(stored));
+};
+
+
+
+
+/***/ }),
+
+/***/ "./node_modules/@inrupt/universal-fetch/dist/index-browser.mjs":
+/*!*********************************************************************!*\
+  !*** ./node_modules/@inrupt/universal-fetch/dist/index-browser.mjs ***!
+  \*********************************************************************/
+/***/ ((__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   "Headers": () => (/* binding */ Headers),
+/* harmony export */   "Request": () => (/* binding */ Request),
+/* harmony export */   "Response": () => (/* binding */ Response),
+/* harmony export */   "default": () => (/* binding */ indexBrowser),
+/* harmony export */   "fetch": () => (/* binding */ fetch)
+/* harmony export */ });
+var indexBrowser = globalThis.fetch;
+const { fetch, Response, Request, Headers } = globalThis;
 
 
 
@@ -61811,14 +62231,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;
@@ -61851,7 +62274,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);
@@ -61861,13 +62284,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();
@@ -63055,8 +63478,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}`);
 }
@@ -63131,11 +63552,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;
@@ -63966,14 +64382,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");
 
 
 
@@ -63981,8 +64395,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');
@@ -63990,7 +64404,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);
@@ -64028,11 +64442,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, ''))
@@ -64088,20 +64502,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);
@@ -64170,12 +64573,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;
@@ -64603,26 +65006,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":
@@ -64687,11 +65070,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");
 
 
 
@@ -64712,7 +65093,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':
@@ -64731,20 +65112,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) {
@@ -64803,7 +65184,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':
@@ -64824,25 +65205,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));
 }
 
 
@@ -64917,11 +65287,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");
 
 
 
@@ -64940,7 +65308,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':
@@ -64963,7 +65331,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;
         }
@@ -64992,7 +65360,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;
         }
@@ -65018,7 +65386,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;
         }
@@ -65036,12 +65404,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 };
 }
@@ -65057,23 +65425,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);
 
@@ -65315,9 +65672,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)}`;
@@ -65339,12 +65694,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`);
     }
 }