solid-ui 2.4.16-9d8eda18 → 2.4.16-d98dff7d

package/lib/webpack-bundle.js

@@ -2252,7 +2252,7 @@ var AddAgentButtons = /*#__PURE__*/function () {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return (0, _login.logInLoadProfile)(eventContext);
+                return (0, _login.ensureLoadedProfile)(eventContext);
 
               case 2:
                 trustedApps = this.groupList.store.each(eventContext.me, ns.acl('trustedApp')); // @@ TODO fix as
@@ -4938,6 +4938,8 @@ var _iconBase = __webpack_require__(/*! ../iconBase */ "./lib/iconBase.js");
 
 var _solidLogic = __webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js");
 
+var _login = __webpack_require__(/*! ../login/login */ "./lib/login/login.js");
+
 var _index = __webpack_require__(/*! ../media/index */ "./lib/media/index.js");
 
 var ns = _interopRequireWildcard(__webpack_require__(/*! ../ns */ "./lib/ns.js"));
@@ -5544,15 +5546,13 @@ function renderMessageEditor(channelObject, messageTable, userContext, options,
     div: middle,
     dom: dom
   };
-
-  _solidLogic.authn.logIn(context).then(function (context) {
+  (0, _login.ensureLoggedIn)(context).then(function (context) {
     // me = context.me
     turnOnInput();
     Object.assign(context, userContext);
     (0, _bookmarks.findBookmarkDocument)(context).then(function (_context) {// console.log('Bookmark file: ' + context.bookmarkDocument)
     });
   });
-
   return messageEditor;
 } // renderMessageEditor
 //# sourceMappingURL=message.js.map
@@ -6111,7 +6111,7 @@ function newThingUI(createContext, dataBrowserContext, thePanes) {
       var selectUI; // , selectUIParent
 
       function callbackWS(ws, newBase) {
-        (0, _login.logInLoadProfile)(createContext).then(function (_context) {
+        (0, _login.ensureLoadedProfile)(createContext).then(function (_context) {
           var newPaneOptions = Object.assign({
             newBase: newBase,
             folder: options.folder || undefined,
@@ -7354,7 +7354,7 @@ Object.defineProperty(exports, "messageArea", {
     return _messageArea.messageArea;
   }
 });
-exports.style = exports.solidLogicLib = exports.rdf = exports.preferences = exports.participation = exports.pad = exports.ns = void 0;
+exports.style = exports.rdf = exports.preferences = exports.participation = exports.pad = exports.ns = void 0;
 Object.defineProperty(exports, "table", {
   enumerable: true,
   get: function get() {
@@ -7444,9 +7444,7 @@ var createTypes = _interopRequireWildcard(__webpack_require__(/*! ./create/types
 
 exports.createTypes = createTypes;
 
-var solidLogicLib = _interopRequireWildcard(__webpack_require__(/*! solid-logic */ "./node_modules/solid-logic/lib/index.js"));
-
-exports.solidLogicLib = solidLogicLib;
+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); }
 
@@ -7455,9 +7453,6 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 // pull in first avoid cross-refs
 // @ts-ignore
 // @ts-ignore
-// import * as debug from '../debug'
-// @ts-ignore
-// @ts-ignore
 // @ts-ignore
 // @ts-ignore
 // @ts-ignore
@@ -7473,7 +7468,9 @@ exports.dom = dom;
 if (typeof window !== 'undefined') {
   ;
   window.UI = {
-    solidLogicLib: solidLogicLib,
+    authn: _solidLogic.authn,
+    store: _solidLogic.store,
+    authSession: _solidLogic.authSession,
     ns: ns,
     rdf: rdf,
     acl: _index.acl,
@@ -7848,12 +7845,12 @@ var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_m
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ensureLoadedPreferences = ensureLoadedPreferences;
+exports.ensureLoadedProfile = ensureLoadedProfile;
+exports.ensureLoggedIn = ensureLoggedIn;
 exports.filterAvailablePanes = filterAvailablePanes;
 exports.findAppInstances = findAppInstances;
 exports.getUserRoles = getUserRoles;
-exports.logInLoadPreferences = logInLoadPreferences;
-exports.logInLoadProfile = logInLoadProfile;
-exports.loggedInContext = loggedInContext;
 exports.loginStatusBox = loginStatusBox;
 exports.newAppInstance = newAppInstance;
 exports.registrationControl = registrationControl;
@@ -7914,7 +7911,8 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
   *
   * @param context
   */
-function loggedInContext(context) {
+// used to be logIn
+function ensureLoggedIn(context) {
   var me = _solidLogic.authn.currentUser();
 
   if (me) {
@@ -7952,10 +7950,11 @@ function loggedInContext(context) {
  *
  * @param context
  */
+// used to be logInLoadPreferences
 
 
-function logInLoadPreferences(_x2) {
-  return _logInLoadPreferences.apply(this, arguments);
+function ensureLoadedPreferences(_x2) {
+  return _ensureLoadedPreferences.apply(this, arguments);
 }
 /**
  * Logs the user in and loads their WebID profile document into the store
@@ -7964,17 +7963,18 @@ function logInLoadPreferences(_x2) {
  *
  * @returns Resolves with the context after login / fetch
  */
+// used to be logInLoadProfile
 
 
-function _logInLoadPreferences() {
-  _logInLoadPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
+function _ensureLoadedPreferences() {
+  _ensureLoadedPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
     var statusArea, progressDisplay, complain, preferencesFile, m2;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) {
         switch (_context4.prev = _context4.next) {
           case 0:
             complain = function _complain(message) {
-              message = "logInLoadPreferences: ".concat(message);
+              message = "ensureLoadedPreferences: ".concat(message);
 
               if (statusArea) {
                 // statusArea.innerHTML = ''
@@ -7996,7 +7996,7 @@ function _logInLoadPreferences() {
             statusArea = context.statusArea || context.div || null;
             _context4.prev = 4;
             _context4.next = 7;
-            return logInLoadProfile(context);
+            return ensureLoadedProfile(context);
 
           case 7:
             context = _context4.sent;
@@ -8097,11 +8097,11 @@ function _logInLoadPreferences() {
       }
     }, _callee4, null, [[4, 15]]);
   }));
-  return _logInLoadPreferences.apply(this, arguments);
+  return _ensureLoadedPreferences.apply(this, arguments);
 }
 
-function logInLoadProfile(_x3) {
-  return _logInLoadProfile.apply(this, arguments);
+function ensureLoadedProfile(_x3) {
+  return _ensureLoadedProfile.apply(this, arguments);
 }
 /**
   * Returns promise of context with arrays of symbols
@@ -8111,8 +8111,8 @@ function logInLoadProfile(_x3) {
   */
 
 
-function _logInLoadProfile() {
-  _logInLoadProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(context) {
+function _ensureLoadedProfile() {
+  _ensureLoadedProfile = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee5(context) {
     var logInContext;
     return _regenerator["default"].wrap(function _callee5$(_context5) {
       while (1) {
@@ -8128,7 +8128,7 @@ function _logInLoadProfile() {
           case 2:
             _context5.prev = 2;
             _context5.next = 5;
-            return loggedInContext(context);
+            return ensureLoggedIn(context);
 
           case 5:
             logInContext = _context5.sent;
@@ -8169,7 +8169,7 @@ function _logInLoadProfile() {
       }
     }, _callee5, null, [[2, 13]]);
   }));
-  return _logInLoadProfile.apply(this, arguments);
+  return _ensureLoadedProfile.apply(this, arguments);
 }
 
 function findAppInstances(_x4, _x5, _x6) {
@@ -8209,7 +8209,7 @@ function _findAppInstances() {
           case 7:
             _context6.prev = 7;
             _context6.next = 10;
-            return isPublic ? logInLoadProfile(context) : logInLoadPreferences(context);
+            return isPublic ? ensureLoadedProfile(context) : ensureLoadedPreferences(context);
 
           case 10:
             _context6.next = 15;
@@ -9109,7 +9109,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
   // console.log('kicking off async operation')
 
 
-  logInLoadPreferences(context) // kick off async operation
+  ensureLoadedPreferences(context) // kick off async operation
   .then(displayOptions)["catch"](function (err) {
     // console.log("err from async op")
     box.appendChild(widgets.errorMessageBlock(context.dom, err));
@@ -9168,7 +9168,7 @@ function getUserRoles() {
 
 function _getUserRoles() {
   _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
-    var _yield$logInLoadPrefe, me, preferencesFile, preferencesFileError;
+    var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError;
 
     return _regenerator["default"].wrap(function _callee7$(_context7) {
       while (1) {
@@ -9176,13 +9176,13 @@ function _getUserRoles() {
           case 0:
             _context7.prev = 0;
             _context7.next = 3;
-            return logInLoadPreferences({});
+            return ensureLoadedPreferences({});
 
           case 3:
-            _yield$logInLoadPrefe = _context7.sent;
-            me = _yield$logInLoadPrefe.me;
-            preferencesFile = _yield$logInLoadPrefe.preferencesFile;
-            preferencesFileError = _yield$logInLoadPrefe.preferencesFileError;
+            _yield$ensureLoadedPr = _context7.sent;
+            me = _yield$ensureLoadedPr.me;
+            preferencesFile = _yield$ensureLoadedPr.preferencesFile;
+            preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
 
             if (!(!preferencesFile || preferencesFileError)) {
               _context7.next = 9;
@@ -10001,7 +10001,7 @@ function messageArea(dom, kb, subject, messageStore, options) {
       div: middle,
       dom: dom
     };
-    login.loggedInContext(context).then(function (context) {
+    login.ensureLoggedIn(context).then(function (context) {
       me = context.me;
       turnOnInput();
     });
@@ -11295,6 +11295,8 @@ var _wrapNativeSuper2 = _interopRequireDefault(__webpack_require__(/*! @babel/ru
 
 var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js"));
 
+var debug = _interopRequireWildcard(__webpack_require__(/*! ./debug */ "./lib/debug.js"));
+
 var _rdflib = __webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js");
 
 var ns = _interopRequireWildcard(__webpack_require__(/*! ./ns */ "./lib/ns.js"));
@@ -11305,14 +11307,18 @@ var _utils = __webpack_require__(/*! ./utils */ "./lib/utils/index.js");
 
 var _pad = __webpack_require__(/*! ./pad */ "./lib/pad.js");
 
-var _debug = __webpack_require__(/*! ./debug */ "./lib/debug.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; }
 
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
@@ -11339,7 +11345,7 @@ var ParticipationTableElement = /*#__PURE__*/function (_HTMLTableElement) {
   return (0, _createClass2["default"])(ParticipationTableElement);
 }( /*#__PURE__*/(0, _wrapNativeSuper2["default"])(HTMLTableElement));
 
-var kb = _solidLogic.solidLogicSingleton.store;
+var store = _solidLogic.solidLogicSingleton.store;
 /**  Manage participation in this session
 *
 *  @param {Document} dom - the web page loaded into the browser
@@ -11354,7 +11360,7 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
   table.setAttribute('style', 'margin: 0.8em;');
 
   var newRowForParticpation = function newRowForParticpation(parp) {
-    var person = kb.any(parp, ns.wf('participant'));
+    var person = store.any(parp, ns.wf('participant'));
     var tr;
 
     if (!person) {
@@ -11364,7 +11370,7 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
       return tr;
     }
 
-    var bg = kb.anyValue(parp, ns.ui('backgroundColor')) || 'white';
+    var bg = store.anyValue(parp, ns.ui('backgroundColor')) || 'white';
     var block = dom.createElement('div');
     block.setAttribute('style', 'height: 1.5em; width: 1.5em; margin: 0.3em; border 0.01em solid #888; background-color: ' + bg);
     tr = (0, _widgets.personTR)(dom, null, person, options);
@@ -11377,9 +11383,9 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
   };
 
   var syncTable = function syncTable() {
-    var parps = kb.each(subject, ns.wf('participation')).map(function (parp) {
-      (0, _debug.log)('in participants');
-      return [kb.anyValue(parp, ns.cal('dtstart')) || '9999-12-31', parp];
+    var parps = store.each(subject, ns.wf('participation')).map(function (parp) {
+      (0, debug.log)('in participants');
+      return [store.anyValue(parp, ns.cal('dtstart')) || '9999-12-31', parp];
     });
     parps.sort(); // List in order of joining
 
@@ -11407,36 +11413,57 @@ function renderPartipants(dom, table, unused1, subject, unused2, options) {
 function participationObject(subject, padDoc, me) {
   return new Promise(function (resolve, reject) {
     if (!me) {
-      throw new Error('Not user id');
+      throw new Error('No user id');
     }
 
-    var parps = kb.each(subject, ns.wf('participation')).filter(function (pn) {
-      return kb.holds(pn, ns.wf('participant'), me);
+    var parps = store.each(subject, ns.wf('participation')).filter(function (pn) {
+      return store.holds(pn, ns.wf('participant'), me);
     });
 
     if (parps.length > 1) {
-      throw new Error('Multiple records of your participation');
+      // This can happen. https://github.com/solid/chat-pane/issues/71
+      var candidates = [];
+
+      var _iterator = _createForOfIteratorHelper(parps),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var participation = _step.value;
+          var date = store.anyValue(participation, ns.cal('dtstart'));
+
+          if (date) {
+            candidates.push([date, participation]);
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      candidates.sort(); // Pick the earliest
+      // @@ Possibly, for extra credit, delete the others, if we have write access
+
+      debug.warn('Multiple particpation objects, picking earliest, in ' + padDoc);
+      resolve(candidates[0][1]); // throw new Error('Multiple records of your participation')
     }
 
     if (parps.length) {
       // If I am not already recorded
       resolve(parps[0]); // returns the particpation object
     } else {
-      var participation = (0, _widgets.newThing)(padDoc);
-      var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
+      var _participation2 = (0, _widgets.newThing)(padDoc);
 
-      if (!kb.updater) {
-        throw new Error('kb has no updater');
-      }
-
-      kb.updater.update([], ins, function (uri, ok, errorMessage) {
+      var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), _participation2, padDoc), (0, _rdflib.st)(_participation2, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(_participation2, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(_participation2, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
+      store.updater.update([], ins, function (uri, ok, errorMessage) {
         if (!ok) {
           reject(new Error('Error recording your partipation: ' + errorMessage));
         } else {
-          resolve(participation);
+          resolve(_participation2);
         }
       });
-      resolve(participation);
+      resolve(_participation2);
     }
   });
 }
@@ -11454,8 +11481,8 @@ function recordParticipation(subject, padDoc, refreshable) {
 
   if (!me) return; // Not logged in
 
-  var parps = kb.each(subject, ns.wf('participation')).filter(function (pn) {
-    return kb.holds(pn, ns.wf('participant'), me);
+  var parps = store.each(subject, ns.wf('participation')).filter(function (pn) {
+    return store.holds(pn, ns.wf('participant'), me);
   });
 
   if (parps.length > 1) {
@@ -11466,14 +11493,14 @@ function recordParticipation(subject, padDoc, refreshable) {
     // If I am not already recorded
     return parps[0]; // returns the particpation object
   } else {
-    var participation = (0, _widgets.newThing)(padDoc);
-    var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
-
-    if (!kb.updater) {
-      throw new Error('kb has no updater');
+    if (!store.updater.editable(padDoc)) {
+      debug.log('Not recording participation, as no write acesss as ' + me + ' to ' + padDoc);
+      return null;
     }
 
-    kb.updater.update([], ins, function (uri, ok, errorMessage) {
+    var participation = (0, _widgets.newThing)(padDoc);
+    var ins = [(0, _rdflib.st)(subject, ns.wf('participation'), participation, padDoc), (0, _rdflib.st)(participation, ns.wf('participant'), me, padDoc), (0, _rdflib.st)(participation, ns.cal('dtstart'), new Date(), padDoc), (0, _rdflib.st)(participation, ns.ui('backgroundColor'), (0, _pad.lightColorHash)(me), padDoc)];
+    store.updater.update([], ins, function (uri, ok, errorMessage) {
       if (!ok) {
         throw new Error('Error recording your partipation: ' + errorMessage);
       }
@@ -11503,8 +11530,10 @@ function manageParticipation(dom, container, padDoc, subject, me, options) {
   container.appendChild(table);
   renderPartipants(dom, table, padDoc, subject, me, options);
 
+  var _participation;
+
   try {
-    recordParticipation(subject, padDoc, table);
+    _participation = recordParticipation(subject, padDoc, table);
   } catch (e) {
     container.appendChild((0, _widgets.errorMessageBlock)(dom, 'Error recording your partipation: ' + e)); // Clean up?
   }
@@ -11615,7 +11644,7 @@ function recordSharedPreferences(subject, context) {
 
 function recordPersonalDefaults(theClass, context) {
   return new Promise(function (resolve, reject) {
-    (0, _login.logInLoadPreferences)(context).then(function (context) {
+    (0, _login.ensureLoadedPreferences)(context).then(function (context) {
       if (!context.preferencesFile) {
         debug.log('Not doing private class preferences as no access to preferences file. ' + context.preferencesFileError);
         return;
@@ -15008,8 +15037,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var UI = {
   log: log,
   ns: ns,
-  rdf: rdf,
-  store: _solidLogic.store
+  rdf: rdf
 }; // This ubiquitous function returns the best label for a thing
 //
 // The hacks in this code make a major difference to the usability
@@ -15127,23 +15155,23 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  buildTime: '2022-02-01T16:25:20Z',
-  commit: '9d8eda18d862e67522627d7a164ce15ab138a5ba',
+  buildTime: '2022-02-21T23:22:07Z',
+  commit: 'd98dff7d7be96930fce9ca29328fd101a5ba4411',
   npmInfo: {
     'solid-ui': '2.4.16',
-    npm: '6.14.15',
+    npm: '6.14.16',
     ares: '1.18.1',
     brotli: '1.0.9',
-    cldr: '39.0',
-    icu: '69.1',
+    cldr: '40.0',
+    icu: '70.1',
     llhttp: '2.1.4',
     modules: '83',
     napi: '8',
     nghttp2: '1.42.0',
-    node: '14.18.3',
-    openssl: '1.1.1l',
-    tz: '2021a',
-    unicode: '13.0',
+    node: '14.19.0',
+    openssl: '1.1.1m',
+    tz: '2021a3',
+    unicode: '14.0',
     uv: '1.42.0',
     v8: '8.4.371.23-node.85',
     zlib: '1.2.11'
@@ -20225,6 +20253,8 @@ function getPreferredLanguagesFor(_x) {
 
 function _getPreferredLanguagesFor() {
   _getPreferredLanguagesFor = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(person) {
+    var _store$fetcher;
+
     var doc, list, languageCodeArray;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
@@ -20232,7 +20262,7 @@ function _getPreferredLanguagesFor() {
           case 0:
             doc = person.doc();
             _context.next = 3;
-            return _solidLogic.store.fetcher.load(doc);
+            return (_store$fetcher = _solidLogic.store.fetcher) === null || _store$fetcher === void 0 ? void 0 : _store$fetcher.load(doc);
 
           case 3:
             list = _solidLogic.store.any(person, ns.schema('knowsLanguage'), null, doc);
@@ -20702,6 +20732,8 @@ function queryESCODataByName(_x, _x2, _x3) {
 
 function _queryESCODataByName() {
   _queryESCODataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(filter, theClass, queryTarget) {
+    var _store$fetcher;
+
     var limit, queryURI, response, text, json;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
@@ -20719,11 +20751,11 @@ function _queryESCODataByName() {
             queryURI = queryTarget.searchByNameURI.replace('$(name)', filter).replace('$(limit)', '' + limit).replace('$(targetClass)', theClass.toNT());
             debug.log('Querying ESCO data - uri: ' + queryURI);
             _context.next = 7;
-            return _solidLogic.store.fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
+            return (_store$fetcher = _solidLogic.store.fetcher) === null || _store$fetcher === void 0 ? void 0 : _store$fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
 
           case 7:
             response = _context.sent;
-            text = response.responseText || '';
+            text = (response === null || response === void 0 ? void 0 : response.responseText) || '';
             debug.log('    Query result  text' + text.slice(0, 500) + '...');
 
             if (!(text.length === 0)) {
@@ -20770,7 +20802,8 @@ function queryPublicDataByName(_x4, _x5, _x6, _x7) {
 
 function _queryPublicDataByName() {
   _queryPublicDataByName = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(filter, theClass, languages, queryTarget) {
-    var substituteStrings, languagePrefs, language, sparql, queryURI, response, text, text2, json, bindings;
+    var substituteStrings, languagePrefs, language, sparql, queryURI, response, _store$fetcher2, text, text2, json, bindings;
+
     return _regenerator["default"].wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -20825,7 +20858,7 @@ function _queryPublicDataByName() {
             queryURI = substituteStrings(queryTarget.searchByNameURI);
             _context2.prev = 18;
             _context2.next = 21;
-            return _solidLogic.store.fetcher.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
+            return (_store$fetcher2 = _solidLogic.store.fetcher) === null || _store$fetcher2 === void 0 ? void 0 : _store$fetcher2.webOperation('GET', queryURI, fetcherOptionsJsonPublicData);
 
           case 21:
             response = _context2.sent;
@@ -20902,6 +20935,8 @@ function queryPublicDataSelect(_x8, _x9) {
 
 function _queryPublicDataSelect() {
   _queryPublicDataSelect = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(sparql, queryTarget) {
+    var _store$fetcher3;
+
     var myUrlWithParams, queryURI, headers, options, response, text, text2, json, bindings;
     return _regenerator["default"].wrap(function _callee3$(_context3) {
       while (1) {
@@ -20927,7 +20962,7 @@ function _queryPublicDataSelect() {
               headers: headers
             };
             _context3.next = 11;
-            return _solidLogic.store.fetcher.webOperation('GET', queryURI, options);
+            return (_store$fetcher3 = _solidLogic.store.fetcher) === null || _store$fetcher3 === void 0 ? void 0 : _store$fetcher3.webOperation('GET', queryURI, options);
 
           case 11:
             response = _context3.sent;
@@ -20963,6 +20998,8 @@ function queryPublicDataConstruct(_x10, _x11, _x12) {
 
 function _queryPublicDataConstruct() {
   _queryPublicDataConstruct = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(sparql, pubicId, queryTarget) {
+    var _store$fetcher4;
+
     var myUrlWithParams, queryURI, headers, options, response, text, report;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) {
@@ -20991,11 +21028,11 @@ function _queryPublicDataConstruct() {
 
             };
             _context4.next = 12;
-            return _solidLogic.store.fetcher.webOperation('GET', queryURI, options);
+            return (_store$fetcher4 = _solidLogic.store.fetcher) === null || _store$fetcher4 === void 0 ? void 0 : _store$fetcher4.webOperation('GET', queryURI, options);
 
           case 12:
             response = _context4.sent;
-            text = response.responseText || 'No response text?';
+            text = (response === null || response === void 0 ? void 0 : response.responseText) || 'No response text?';
             report = text.length > 500 ? text.slice(0, 200) + ' ... ' + text.slice(-200) : text;
             debug.log('    queryPublicDataConstruct result text:' + report);
 
@@ -23038,14 +23075,14 @@ function _inherits(subClass, superClass) {
     throw new TypeError("Super expression must either be null or a function");
   }
 
+  subClass.prototype = Object.create(superClass && superClass.prototype, {
+    constructor: {
+      value: subClass,
+      writable: true,
+      configurable: true
+    }
+  });
   Object.defineProperty(subClass, "prototype", {
-    value: Object.create(superClass && superClass.prototype, {
-      constructor: {
-        value: subClass,
-        writable: true,
-        configurable: true
-      }
-    }),
     writable: false
   });
   if (superClass) setPrototypeOf(subClass, superClass);
@@ -23174,7 +23211,7 @@ module.exports = _nonIterableRest, module.exports.__esModule = true, module.expo
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-var _typeof = __webpack_require__(/*! @babel/runtime/helpers/typeof */ "./node_modules/@babel/runtime/helpers/typeof.js")["default"];
+var _typeof = __webpack_require__(/*! ./typeof.js */ "./node_modules/@babel/runtime/helpers/typeof.js")["default"];
 
 var assertThisInitialized = __webpack_require__(/*! ./assertThisInitialized.js */ "./node_modules/@babel/runtime/helpers/assertThisInitialized.js");
 
@@ -24400,9 +24437,6 @@ const issuerConfigKeyMap = {
         toKey: "opTosUri",
         convertToUrl: true,
     },
-    solid_oidc_supported: {
-        toKey: "solidOidcSupported",
-    },
 };
 function processConfig(config) {
     const parsedConfig = {};
@@ -25071,16 +25105,13 @@ exports.generateDpopKeyPair = exports.createDpopHeader = void 0;
 const jose_1 = __webpack_require__(/*! jose */ "./node_modules/jose/dist/browser/index.js");
 const uuid_1 = __webpack_require__(/*! uuid */ "./node_modules/uuid/dist/esm-browser/index.js");
 const constant_1 = __webpack_require__(/*! ../constant */ "./node_modules/@inrupt/solid-client-authn-core/dist/constant.js");
-function removeHashUsernameAndPassword(audience) {
-    const cleanedAudience = new URL(audience);
-    cleanedAudience.hash = "";
-    cleanedAudience.username = "";
-    cleanedAudience.password = "";
-    return cleanedAudience.toString();
+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_1.SignJWT({
-        htu: removeHashUsernameAndPassword(audience),
+        htu: normalizeHTU(audience),
         htm: method.toUpperCase(),
         jti: (0, uuid_1.v4)(),
     })
@@ -25523,8 +25554,7 @@ function determineClientType(options, issuerConfig) {
     if (options.clientId !== undefined && !isValidUrl(options.clientId)) {
         return "static";
     }
-    if (issuerConfig.solidOidcSupported ===
-        "https://solidproject.org/TR/solid-oidc" &&
+    if (issuerConfig.scopesSupported.includes("webid") &&
         options.clientId !== undefined &&
         isValidUrl(options.clientId)) {
         return "solid-oidc";
@@ -28320,7 +28350,7 @@ var tagNamePattern = new RegExp('^'+nameStartChar.source+nameChar.source+'*(?:\:
 //S_TAG,	S_ATTR,	S_EQ,	S_ATTR_NOQUOT_VALUE
 //S_ATTR_SPACE,	S_ATTR_END,	S_TAG_SPACE, S_TAG_CLOSE
 var S_TAG = 0;//tag name offerring
-var S_ATTR = 1;//attr name offerring 
+var S_ATTR = 1;//attr name offerring
 var S_ATTR_SPACE=2;//attr name end and space offer
 var S_EQ = 3;//=space?
 var S_ATTR_NOQUOT_VALUE = 4;//attr value(no quot value only)
@@ -28344,7 +28374,7 @@ ParseError.prototype = new Error();
 ParseError.prototype.name = ParseError.name
 
 function XMLReader(){
-	
+
 }
 
 XMLReader.prototype = {
@@ -28373,8 +28403,8 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 	}
 	function entityReplacer(a){
 		var k = a.slice(1,-1);
-		if(k in entityMap){
-			return entityMap[k]; 
+		if (Object.hasOwnProperty.call(entityMap, k)) {
+			return entityMap[k];
 		}else if(k.charAt(0) === '#'){
 			return fixedFromCharCode(parseInt(k.substr(1).replace('x','0x')))
 		}else{
@@ -28403,7 +28433,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 	var lineEnd = 0;
 	var linePattern = /.*(?:\r\n?|\n)|.*$/g
 	var locator = domBuilder.locator;
-	
+
 	var parseStack = [{currentNSMap:defaultNSMapCopy}]
 	var closeMap = {};
 	var start = 0;
@@ -28428,7 +28458,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 				var tagName = source.substring(tagStart + 2, end).replace(/[ \t\n\r]+$/g, '');
 				var config = parseStack.pop();
 				if(end<0){
-					
+
 	        		tagName = source.substring(tagStart+2).replace(/[\s<].*/,'');
 	        		errorHandler.error("end tag name: "+tagName+' is not complete:'+config.tagName);
 	        		end = tagStart+1+tagName.length;
@@ -28453,7 +28483,7 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 		        }else{
 		        	parseStack.push(config)
 		        }
-				
+
 				end++;
 				break;
 				// end elment
@@ -28472,8 +28502,8 @@ function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
 				//elStartEnd
 				var end = parseElementStartPart(source,tagStart,el,currentNSMap,entityReplacer,errorHandler);
 				var len = el.length;
-				
-				
+
+
 				if(!el.closed && fixSelfClosed(source,end,el.tagName,closeMap)){
 					el.closed = true;
 					if(!entityMap.nbsp){
@@ -28743,7 +28773,7 @@ function appendElement(el,domBuilder,currentNSMap){
 		}
 		//can not set prefix,because prefix !== ''
 		a.localName = localName ;
-		//prefix == null for no ns prefix attribute 
+		//prefix == null for no ns prefix attribute
 		if(nsPrefix !== false){//hack!!
 			if(localNSMap == null){
 				localNSMap = {}
@@ -28753,7 +28783,7 @@ function appendElement(el,domBuilder,currentNSMap){
 			}
 			currentNSMap[nsPrefix] = localNSMap[nsPrefix] = value;
 			a.uri = NAMESPACE.XMLNS
-			domBuilder.startPrefixMapping(nsPrefix, value) 
+			domBuilder.startPrefixMapping(nsPrefix, value)
 		}
 	}
 	var i = el.length;
@@ -28765,7 +28795,7 @@ function appendElement(el,domBuilder,currentNSMap){
 				a.uri = NAMESPACE.XML;
 			}if(prefix !== 'xmlns'){
 				a.uri = currentNSMap[prefix || '']
-				
+
 				//{console.log('###'+a.qName,domBuilder.locator.systemId+'',currentNSMap,a.uri)}
 			}
 		}
@@ -28787,7 +28817,7 @@ function appendElement(el,domBuilder,currentNSMap){
 		domBuilder.endElement(ns,localName,tagName);
 		if(localNSMap){
 			for(prefix in localNSMap){
-				domBuilder.endPrefixMapping(prefix) 
+				domBuilder.endPrefixMapping(prefix)
 			}
 		}
 	}else{
@@ -28814,7 +28844,7 @@ function parseHtmlSpecialContent(source,elStartEnd,tagName,entityReplacer,domBui
 				domBuilder.characters(text,0,text.length);
 				return elEndStart;
 			//}
-			
+
 		}
 	}
 	return elStartEnd+1;
@@ -28831,7 +28861,7 @@ function fixSelfClosed(source,elStartEnd,tagName,closeMap){
 		closeMap[tagName] =pos
 	}
 	return pos<elStartEnd;
-	//} 
+	//}
 }
 function _copy(source,target){
 	for(var n in source){target[n] = source[n]}
@@ -28859,11 +28889,11 @@ function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
 			var end = source.indexOf(']]>',start+9);
 			domBuilder.startCDATA();
 			domBuilder.characters(source,start+9,end-start-9);
-			domBuilder.endCDATA() 
+			domBuilder.endCDATA()
 			return end+3;
 		}
 		//<!DOCTYPE
-		//startDTD(java.lang.String name, java.lang.String publicId, java.lang.String systemId) 
+		//startDTD(java.lang.String name, java.lang.String publicId, java.lang.String systemId)
 		var matchs = split(source,start);
 		var len = matchs.length;
 		if(len>1 && /!doctype/i.test(matchs[0][0])){
@@ -28881,7 +28911,7 @@ function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
 			var lastMatch = matchs[len-1]
 			domBuilder.startDTD(name, pubid, sysid);
 			domBuilder.endDTD();
-			
+
 			return lastMatch.index+lastMatch[0].length
 		}
 	}
@@ -28930,7 +28960,7 @@ ElementAttributes.prototype = {
 	getValue:function(i){return this[i].value}
 //	,getIndex:function(uri, localName)){
 //		if(localName){
-//			
+//
 //		}else{
 //			var qName = uri
 //		}
@@ -30265,10 +30295,36 @@ var FN_ARGS = /^(?:async\s+)?(?:function)?\s*\w*\s*\(\s*([^)]+)\s*\)(?:\s*{)/;
 var ARROW_FN_ARGS = /^(?:async\s+)?\(?\s*([^)=]+)\s*\)?(?:\s*=>)/;
 var FN_ARG_SPLIT = /,/;
 var FN_ARG = /(=.+)?(\s*)$/;
-var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
+
+function stripComments(string) {
+    let stripped = '';
+    let index = 0;
+    let endBlockComment = string.indexOf('*/');
+    while (index < string.length) {
+        if (string[index] === '/' && string[index+1] === '/') {
+            // inline comment
+            let endIndex = string.indexOf('\n', index);
+            index = (endIndex === -1) ? string.length : endIndex;
+        } else if ((endBlockComment !== -1) && (string[index] === '/') && (string[index+1] === '*')) {
+            // block comment
+            let endIndex = string.indexOf('*/', index);
+            if (endIndex !== -1) {
+                index = endIndex + 2;
+                endBlockComment = string.indexOf('*/', index);
+            } else {
+                stripped += string[index];
+                index++;
+            }
+        } else {
+            stripped += string[index];
+            index++;
+        }
+    }
+    return stripped;
+}
 
 function parseParams(func) {
-    const src = func.toString().replace(STRIP_COMMENTS, '');
+    const src = stripComments(func.toString());
     let match = src.match(FN_ARGS);
     if (!match) {
         match = src.match(ARROW_FN_ARGS);
@@ -31025,7 +31081,7 @@ var reduce$1 = awaitify(reduce, 4);
  * app.get('/cats', function(request, response) {
  *     var User = request.models.User;
  *     async.seq(
- *         _.bind(User.get, User),  // 'User.get' has signature (id, callback(err, data))
+ *         User.get.bind(User),  // 'User.get' has signature (id, callback(err, data))
  *         function(user, fn) {
  *             user.getCats(fn);      // 'getCats' has signature (callback(err, data))
  *         }
@@ -32659,6 +32715,8 @@ function memoize(fn, hasher = v => v) {
     return memoized;
 }
 
+/* istanbul ignore file */
+
 /**
  * Calls `callback` on a later loop around the event loop. In Node.js this just
  * calls `process.nextTick`.  In the browser it will use `setImmediate` if
@@ -35175,7 +35233,7 @@ function fromByteArray (uint8) {
 
 var base64 = __webpack_require__(/*! base64-js */ "./node_modules/base64-js/index.js")
 var ieee754 = __webpack_require__(/*! ieee754 */ "./node_modules/ieee754/index.js")
-var isArray = __webpack_require__(/*! isarray */ "./node_modules/isarray/index.js")
+var isArray = __webpack_require__(/*! isarray */ "./node_modules/buffer/node_modules/isarray/index.js")
 
 exports.Buffer = Buffer
 exports.SlowBuffer = SlowBuffer
@@ -36955,6 +37013,22 @@ function isnan (val) {
 
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./../webpack/buildin/global.js */ "./node_modules/webpack/buildin/global.js")))
 
+/***/ }),
+
+/***/ "./node_modules/buffer/node_modules/isarray/index.js":
+/*!***********************************************************!*\
+  !*** ./node_modules/buffer/node_modules/isarray/index.js ***!
+  \***********************************************************/
+/*! no static exports found */
+/***/ (function(module, exports) {
+
+var toString = {}.toString;
+
+module.exports = Array.isArray || function (arr) {
+  return toString.call(arr) == '[object Array]';
+};
+
+
 /***/ }),
 
 /***/ "./node_modules/canonicalize/lib/canonicalize.js":
@@ -37541,7 +37615,7 @@ var irrelevant = (function (exports) {
 
   return exports;
 
-}({}));
+})({});
 })(__self__);
 __self__.fetch.ponyfill = true;
 // Remove "polyfill" property added by whatwg-fetch
@@ -38991,29 +39065,13 @@ var isBrowser = (typeof window === "undefined" ? "undefined" : _typeof(window))
 /* harmony default export */ __webpack_exports__["default"] = (isBrowser);
 
 
-/***/ }),
-
-/***/ "./node_modules/isarray/index.js":
-/*!***************************************!*\
-  !*** ./node_modules/isarray/index.js ***!
-  \***************************************/
-/*! no static exports found */
-/***/ (function(module, exports) {
-
-var toString = {}.toString;
-
-module.exports = Array.isArray || function (arr) {
-  return toString.call(arr) == '[object Array]';
-};
-
-
 /***/ }),
 
 /***/ "./node_modules/jose/dist/browser/index.js":
 /*!*************************************************!*\
   !*** ./node_modules/jose/dist/browser/index.js ***!
   \*************************************************/
-/*! exports provided: compactDecrypt, flattenedDecrypt, generalDecrypt, GeneralEncrypt, compactVerify, flattenedVerify, generalVerify, jwtVerify, jwtDecrypt, CompactEncrypt, FlattenedEncrypt, CompactSign, FlattenedSign, GeneralSign, SignJWT, EncryptJWT, calculateJwkThumbprint, EmbeddedJWK, createRemoteJWKSet, UnsecuredJWT, exportPKCS8, exportSPKI, exportJWK, importSPKI, importPKCS8, importX509, importJWK, decodeProtectedHeader, errors, generateKeyPair, generateSecret, base64url */
+/*! exports provided: compactDecrypt, flattenedDecrypt, generalDecrypt, GeneralEncrypt, compactVerify, flattenedVerify, generalVerify, jwtVerify, jwtDecrypt, CompactEncrypt, FlattenedEncrypt, CompactSign, FlattenedSign, GeneralSign, SignJWT, EncryptJWT, calculateJwkThumbprint, EmbeddedJWK, createLocalJWKSet, createRemoteJWKSet, UnsecuredJWT, exportPKCS8, exportSPKI, exportJWK, importSPKI, importPKCS8, importX509, importJWK, decodeProtectedHeader, decodeJwt, errors, generateKeyPair, generateSecret, base64url */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -39072,41 +39130,49 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _jwk_embedded_js__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(/*! ./jwk/embedded.js */ "./node_modules/jose/dist/browser/jwk/embedded.js");
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "EmbeddedJWK", function() { return _jwk_embedded_js__WEBPACK_IMPORTED_MODULE_17__["EmbeddedJWK"]; });
 
-/* harmony import */ var _jwks_remote_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./jwks/remote.js */ "./node_modules/jose/dist/browser/jwks/remote.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "createRemoteJWKSet", function() { return _jwks_remote_js__WEBPACK_IMPORTED_MODULE_18__["createRemoteJWKSet"]; });
+/* harmony import */ var _jwks_local_js__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(/*! ./jwks/local.js */ "./node_modules/jose/dist/browser/jwks/local.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "createLocalJWKSet", function() { return _jwks_local_js__WEBPACK_IMPORTED_MODULE_18__["createLocalJWKSet"]; });
+
+/* harmony import */ var _jwks_remote_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./jwks/remote.js */ "./node_modules/jose/dist/browser/jwks/remote.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "createRemoteJWKSet", function() { return _jwks_remote_js__WEBPACK_IMPORTED_MODULE_19__["createRemoteJWKSet"]; });
 
-/* harmony import */ var _jwt_unsecured_js__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(/*! ./jwt/unsecured.js */ "./node_modules/jose/dist/browser/jwt/unsecured.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsecuredJWT", function() { return _jwt_unsecured_js__WEBPACK_IMPORTED_MODULE_19__["UnsecuredJWT"]; });
+/* harmony import */ var _jwt_unsecured_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./jwt/unsecured.js */ "./node_modules/jose/dist/browser/jwt/unsecured.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "UnsecuredJWT", function() { return _jwt_unsecured_js__WEBPACK_IMPORTED_MODULE_20__["UnsecuredJWT"]; });
 
-/* harmony import */ var _key_export_js__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(/*! ./key/export.js */ "./node_modules/jose/dist/browser/key/export.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportPKCS8", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_20__["exportPKCS8"]; });
+/* harmony import */ var _key_export_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./key/export.js */ "./node_modules/jose/dist/browser/key/export.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportPKCS8", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_21__["exportPKCS8"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportSPKI", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_20__["exportSPKI"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportSPKI", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_21__["exportSPKI"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportJWK", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_20__["exportJWK"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "exportJWK", function() { return _key_export_js__WEBPACK_IMPORTED_MODULE_21__["exportJWK"]; });
 
-/* harmony import */ var _key_import_js__WEBPACK_IMPORTED_MODULE_21__ = __webpack_require__(/*! ./key/import.js */ "./node_modules/jose/dist/browser/key/import.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importSPKI", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_21__["importSPKI"]; });
+/* harmony import */ var _key_import_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./key/import.js */ "./node_modules/jose/dist/browser/key/import.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importSPKI", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_22__["importSPKI"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importPKCS8", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_21__["importPKCS8"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importPKCS8", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_22__["importPKCS8"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importX509", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_21__["importX509"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importX509", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_22__["importX509"]; });
 
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importJWK", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_21__["importJWK"]; });
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "importJWK", function() { return _key_import_js__WEBPACK_IMPORTED_MODULE_22__["importJWK"]; });
 
-/* harmony import */ var _util_decode_protected_header_js__WEBPACK_IMPORTED_MODULE_22__ = __webpack_require__(/*! ./util/decode_protected_header.js */ "./node_modules/jose/dist/browser/util/decode_protected_header.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "decodeProtectedHeader", function() { return _util_decode_protected_header_js__WEBPACK_IMPORTED_MODULE_22__["decodeProtectedHeader"]; });
+/* harmony import */ var _util_decode_protected_header_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./util/decode_protected_header.js */ "./node_modules/jose/dist/browser/util/decode_protected_header.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "decodeProtectedHeader", function() { return _util_decode_protected_header_js__WEBPACK_IMPORTED_MODULE_23__["decodeProtectedHeader"]; });
 
-/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_23__ = __webpack_require__(/*! ./util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "errors", function() { return _util_errors_js__WEBPACK_IMPORTED_MODULE_23__; });
-/* harmony import */ var _key_generate_key_pair_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./key/generate_key_pair.js */ "./node_modules/jose/dist/browser/key/generate_key_pair.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generateKeyPair", function() { return _key_generate_key_pair_js__WEBPACK_IMPORTED_MODULE_24__["generateKeyPair"]; });
+/* harmony import */ var _util_decode_jwt_js__WEBPACK_IMPORTED_MODULE_24__ = __webpack_require__(/*! ./util/decode_jwt.js */ "./node_modules/jose/dist/browser/util/decode_jwt.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "decodeJwt", function() { return _util_decode_jwt_js__WEBPACK_IMPORTED_MODULE_24__["decodeJwt"]; });
+
+/* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "errors", function() { return _util_errors_js__WEBPACK_IMPORTED_MODULE_25__; });
+/* harmony import */ var _key_generate_key_pair_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./key/generate_key_pair.js */ "./node_modules/jose/dist/browser/key/generate_key_pair.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generateKeyPair", function() { return _key_generate_key_pair_js__WEBPACK_IMPORTED_MODULE_26__["generateKeyPair"]; });
+
+/* harmony import */ var _key_generate_secret_js__WEBPACK_IMPORTED_MODULE_27__ = __webpack_require__(/*! ./key/generate_secret.js */ "./node_modules/jose/dist/browser/key/generate_secret.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generateSecret", function() { return _key_generate_secret_js__WEBPACK_IMPORTED_MODULE_27__["generateSecret"]; });
+
+/* harmony import */ var _util_base64url_js__WEBPACK_IMPORTED_MODULE_28__ = __webpack_require__(/*! ./util/base64url.js */ "./node_modules/jose/dist/browser/util/base64url.js");
+/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "base64url", function() { return _util_base64url_js__WEBPACK_IMPORTED_MODULE_28__; });
 
-/* harmony import */ var _key_generate_secret_js__WEBPACK_IMPORTED_MODULE_25__ = __webpack_require__(/*! ./key/generate_secret.js */ "./node_modules/jose/dist/browser/key/generate_secret.js");
-/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "generateSecret", function() { return _key_generate_secret_js__WEBPACK_IMPORTED_MODULE_25__["generateSecret"]; });
 
-/* harmony import */ var _util_base64url_js__WEBPACK_IMPORTED_MODULE_26__ = __webpack_require__(/*! ./util/base64url.js */ "./node_modules/jose/dist/browser/util/base64url.js");
-/* harmony reexport (module object) */ __webpack_require__.d(__webpack_exports__, "base64url", function() { return _util_base64url_js__WEBPACK_IMPORTED_MODULE_26__; });
 
 
 
@@ -39921,26 +39987,26 @@ async function calculateJwkThumbprint(jwk, digestAlgorithm = 'sha256') {
 
 /***/ }),
 
-/***/ "./node_modules/jose/dist/browser/jwks/remote.js":
-/*!*******************************************************!*\
-  !*** ./node_modules/jose/dist/browser/jwks/remote.js ***!
-  \*******************************************************/
-/*! exports provided: createRemoteJWKSet */
+/***/ "./node_modules/jose/dist/browser/jwks/local.js":
+/*!******************************************************!*\
+  !*** ./node_modules/jose/dist/browser/jwks/local.js ***!
+  \******************************************************/
+/*! exports provided: isJWKSLike, LocalJWKSet, createLocalJWKSet */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
-/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createRemoteJWKSet", function() { return createRemoteJWKSet; });
-/* 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 _key_import_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../key/import.js */ "./node_modules/jose/dist/browser/key/import.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 _lib_is_object_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../lib/is_object.js */ "./node_modules/jose/dist/browser/lib/is_object.js");
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "isJWKSLike", function() { return isJWKSLike; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "LocalJWKSet", function() { return LocalJWKSet; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createLocalJWKSet", function() { return createLocalJWKSet; });
+/* harmony import */ var _key_import_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../key/import.js */ "./node_modules/jose/dist/browser/key/import.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 _lib_is_object_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../lib/is_object.js */ "./node_modules/jose/dist/browser/lib/is_object.js");
 
 
 
 function getKtyFromAlg(alg) {
-    switch (typeof alg === 'string' && alg.substr(0, 2)) {
+    switch (typeof alg === 'string' && alg.slice(0, 2)) {
         case 'RS':
         case 'PS':
             return 'RSA';
@@ -39949,46 +40015,41 @@ function getKtyFromAlg(alg) {
         case 'Ed':
             return 'OKP';
         default:
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JOSENotSupported"]('Unsupported "alg" value for a JSON Web Key Set');
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JOSENotSupported"]('Unsupported "alg" value for a JSON Web Key Set');
     }
 }
+function isJWKSLike(jwks) {
+    return (jwks &&
+        typeof jwks === 'object' &&
+        Array.isArray(jwks.keys) &&
+        jwks.keys.every(isJWKLike));
+}
 function isJWKLike(key) {
-    return Object(_lib_is_object_js__WEBPACK_IMPORTED_MODULE_3__["default"])(key);
+    return Object(_lib_is_object_js__WEBPACK_IMPORTED_MODULE_2__["default"])(key);
 }
-class RemoteJWKSet {
-    constructor(url, options) {
-        this._cached = new WeakMap();
-        if (!(url instanceof URL)) {
-            throw new TypeError('url must be an instance of URL');
-        }
-        this._url = new URL(url.href);
-        this._options = { agent: options === null || options === void 0 ? void 0 : options.agent };
-        this._timeoutDuration =
-            typeof (options === null || options === void 0 ? void 0 : options.timeoutDuration) === 'number' ? options === null || options === void 0 ? void 0 : options.timeoutDuration : 5000;
-        this._cooldownDuration =
-            typeof (options === null || options === void 0 ? void 0 : options.cooldownDuration) === 'number' ? options === null || options === void 0 ? void 0 : options.cooldownDuration : 30000;
+function clone(obj) {
+    if (typeof structuredClone === 'function') {
+        return structuredClone(obj);
     }
-    coolingDown() {
-        if (!this._cooldownStarted) {
-            return false;
+    return JSON.parse(JSON.stringify(obj));
+}
+class LocalJWKSet {
+    constructor(jwks) {
+        this._cached = new WeakMap();
+        if (!isJWKSLike(jwks)) {
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JWKSInvalid"]('JSON Web Key Set malformed');
         }
-        return Date.now() < this._cooldownStarted + this._cooldownDuration;
+        this._jwks = clone(jwks);
     }
     async getKey(protectedHeader, token) {
-        const joseHeader = {
-            ...protectedHeader,
-            ...token.header,
-        };
-        if (!this._jwks) {
-            await this.reload();
-        }
+        const { alg, kid } = { ...protectedHeader, ...token.header };
         const candidates = this._jwks.keys.filter((jwk) => {
-            let candidate = jwk.kty === getKtyFromAlg(joseHeader.alg);
-            if (candidate && typeof joseHeader.kid === 'string') {
-                candidate = joseHeader.kid === jwk.kid;
+            let candidate = jwk.kty === getKtyFromAlg(alg);
+            if (candidate && typeof kid === 'string') {
+                candidate = kid === jwk.kid;
             }
             if (candidate && typeof jwk.alg === 'string') {
-                candidate = joseHeader.alg === jwk.alg;
+                candidate = alg === jwk.alg;
             }
             if (candidate && typeof jwk.use === 'string') {
                 candidate = jwk.use === 'sig';
@@ -39996,11 +40057,11 @@ class RemoteJWKSet {
             if (candidate && Array.isArray(jwk.key_ops)) {
                 candidate = jwk.key_ops.includes('verify');
             }
-            if (candidate && joseHeader.alg === 'EdDSA') {
+            if (candidate && alg === 'EdDSA') {
                 candidate = jwk.crv === 'Ed25519' || jwk.crv === 'Ed448';
             }
             if (candidate) {
-                switch (joseHeader.alg) {
+                switch (alg) {
                     case 'ES256':
                         candidate = jwk.crv === 'P-256';
                         break;
@@ -40013,40 +40074,108 @@ class RemoteJWKSet {
                     case 'ES512':
                         candidate = jwk.crv === 'P-521';
                         break;
-                    default:
                 }
             }
             return candidate;
         });
         const { 0: jwk, length } = candidates;
         if (length === 0) {
-            if (this.coolingDown() === false) {
-                await this.reload();
-                return this.getKey(protectedHeader, token);
-            }
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JWKSNoMatchingKey"]();
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JWKSNoMatchingKey"]();
         }
         else if (length !== 1) {
-            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JWKSMultipleMatchingKeys"]();
+            throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JWKSMultipleMatchingKeys"]();
         }
         const cached = this._cached.get(jwk) || this._cached.set(jwk, {}).get(jwk);
-        if (cached[joseHeader.alg] === undefined) {
-            const keyObject = await Object(_key_import_js__WEBPACK_IMPORTED_MODULE_1__["importJWK"])({ ...jwk, ext: true }, joseHeader.alg);
+        if (cached[alg] === undefined) {
+            const keyObject = await Object(_key_import_js__WEBPACK_IMPORTED_MODULE_0__["importJWK"])({ ...jwk, ext: true }, alg);
             if (keyObject instanceof Uint8Array || keyObject.type !== 'public') {
-                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JWKSInvalid"]('JSON Web Key Set members must be public keys');
+                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JWKSInvalid"]('JSON Web Key Set members must be public keys');
+            }
+            cached[alg] = keyObject;
+        }
+        return cached[alg];
+    }
+}
+function createLocalJWKSet(jwks) {
+    return LocalJWKSet.prototype.getKey.bind(new LocalJWKSet(jwks));
+}
+
+
+/***/ }),
+
+/***/ "./node_modules/jose/dist/browser/jwks/remote.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/jose/dist/browser/jwks/remote.js ***!
+  \*******************************************************/
+/*! exports provided: createRemoteJWKSet */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "createRemoteJWKSet", function() { return createRemoteJWKSet; });
+/* 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");
+
+
+
+
+class RemoteJWKSet extends _local_js__WEBPACK_IMPORTED_MODULE_3__["LocalJWKSet"] {
+    constructor(url, options) {
+        super({ keys: [] });
+        this._jwks = undefined;
+        if (!(url instanceof URL)) {
+            throw new TypeError('url must be an instance of URL');
+        }
+        this._url = new URL(url.href);
+        this._options = { agent: options === null || options === void 0 ? void 0 : options.agent };
+        this._timeoutDuration =
+            typeof (options === null || options === void 0 ? void 0 : options.timeoutDuration) === 'number' ? options === null || options === void 0 ? void 0 : options.timeoutDuration : 5000;
+        this._cooldownDuration =
+            typeof (options === null || options === void 0 ? void 0 : options.cooldownDuration) === 'number' ? options === null || options === void 0 ? void 0 : options.cooldownDuration : 30000;
+    }
+    coolingDown() {
+        if (!this._cooldownStarted) {
+            return false;
+        }
+        return Date.now() < this._cooldownStarted + this._cooldownDuration;
+    }
+    async getKey(protectedHeader, token) {
+        if (!this._jwks) {
+            await this.reload();
+        }
+        try {
+            return await super.getKey(protectedHeader, token);
+        }
+        catch (err) {
+            if (err instanceof _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JWKSNoMatchingKey"]) {
+                if (this.coolingDown() === false) {
+                    await this.reload();
+                    return super.getKey(protectedHeader, token);
+                }
             }
-            cached[joseHeader.alg] = keyObject;
+            throw err;
         }
-        return cached[joseHeader.alg];
     }
     async reload() {
+        if (this._pendingFetch && Object(_runtime_env_js__WEBPACK_IMPORTED_MODULE_1__["isCloudflareWorkers"])()) {
+            return new Promise((resolve) => {
+                const isDone = () => {
+                    if (this._pendingFetch === undefined) {
+                        resolve();
+                    }
+                    else {
+                        setTimeout(isDone, 5);
+                    }
+                };
+                isDone();
+            });
+        }
         if (!this._pendingFetch) {
             this._pendingFetch = Object(_runtime_fetch_jwks_js__WEBPACK_IMPORTED_MODULE_0__["default"])(this._url, this._timeoutDuration, this._options)
                 .then((json) => {
-                if (typeof json !== 'object' ||
-                    !json ||
-                    !Array.isArray(json.keys) ||
-                    !json.keys.every(isJWKLike)) {
+                if (!Object(_local_js__WEBPACK_IMPORTED_MODULE_3__["isJWKSLike"])(json)) {
                     throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_2__["JWKSInvalid"]('JSON Web Key Set malformed');
                 }
                 this._jwks = { keys: json.keys };
@@ -41041,13 +41170,13 @@ __webpack_require__.r(__webpack_exports__);
 
 
 async function wrap(alg, key, cek, iv) {
-    const jweAlgorithm = alg.substr(0, 7);
+    const jweAlgorithm = alg.slice(0, 7);
     iv || (iv = Object(_iv_js__WEBPACK_IMPORTED_MODULE_2__["default"])(jweAlgorithm));
     const { ciphertext: encryptedKey, tag } = await Object(_runtime_encrypt_js__WEBPACK_IMPORTED_MODULE_0__["default"])(jweAlgorithm, cek, key, iv, new Uint8Array(0));
     return { encryptedKey, iv: Object(_runtime_base64url_js__WEBPACK_IMPORTED_MODULE_3__["encode"])(iv), tag: Object(_runtime_base64url_js__WEBPACK_IMPORTED_MODULE_3__["encode"])(tag) };
 }
 async function unwrap(alg, key, encryptedKey, iv, tag) {
-    const jweAlgorithm = alg.substr(0, 7);
+    const jweAlgorithm = alg.slice(0, 7);
     return Object(_runtime_decrypt_js__WEBPACK_IMPORTED_MODULE_1__["default"])(jweAlgorithm, key, encryptedKey, iv, tag, new Uint8Array(0));
 }
 
@@ -41291,7 +41420,7 @@ function isAlgorithm(algorithm, name) {
     return algorithm.name === name;
 }
 function getHashLength(hash) {
-    return parseInt(hash.name.substr(4), 10);
+    return parseInt(hash.name.slice(4), 10);
 }
 function getNamedCurve(alg) {
     switch (alg) {
@@ -41328,7 +41457,7 @@ function checkSigCryptoKey(key, alg, ...usages) {
         case 'HS512': {
             if (!isAlgorithm(key.algorithm, 'HMAC'))
                 throw unusable('HMAC');
-            const expected = parseInt(alg.substr(2), 10);
+            const expected = parseInt(alg.slice(2), 10);
             const actual = getHashLength(key.algorithm.hash);
             if (actual !== expected)
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
@@ -41339,7 +41468,7 @@ function checkSigCryptoKey(key, alg, ...usages) {
         case 'RS512': {
             if (!isAlgorithm(key.algorithm, 'RSASSA-PKCS1-v1_5'))
                 throw unusable('RSASSA-PKCS1-v1_5');
-            const expected = parseInt(alg.substr(2), 10);
+            const expected = parseInt(alg.slice(2), 10);
             const actual = getHashLength(key.algorithm.hash);
             if (actual !== expected)
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
@@ -41350,7 +41479,7 @@ function checkSigCryptoKey(key, alg, ...usages) {
         case 'PS512': {
             if (!isAlgorithm(key.algorithm, 'RSA-PSS'))
                 throw unusable('RSA-PSS');
-            const expected = parseInt(alg.substr(2), 10);
+            const expected = parseInt(alg.slice(2), 10);
             const actual = getHashLength(key.algorithm.hash);
             if (actual !== expected)
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
@@ -41389,7 +41518,7 @@ function checkEncCryptoKey(key, alg, ...usages) {
         case 'A256GCM': {
             if (!isAlgorithm(key.algorithm, 'AES-GCM'))
                 throw unusable('AES-GCM');
-            const expected = parseInt(alg.substr(1, 3), 10);
+            const expected = parseInt(alg.slice(1, 4), 10);
             const actual = key.algorithm.length;
             if (actual !== expected)
                 throw unusable(expected, 'algorithm.length');
@@ -41400,7 +41529,7 @@ function checkEncCryptoKey(key, alg, ...usages) {
         case 'A256KW': {
             if (!isAlgorithm(key.algorithm, 'AES-KW'))
                 throw unusable('AES-KW');
-            const expected = parseInt(alg.substr(1, 3), 10);
+            const expected = parseInt(alg.slice(1, 4), 10);
             const actual = key.algorithm.length;
             if (actual !== expected)
                 throw unusable(expected, 'algorithm.length');
@@ -41422,7 +41551,7 @@ function checkEncCryptoKey(key, alg, ...usages) {
         case 'RSA-OAEP-512': {
             if (!isAlgorithm(key.algorithm, 'RSA-OAEP'))
                 throw unusable('RSA-OAEP');
-            const expected = parseInt(alg.substr(9), 10) || 1;
+            const expected = parseInt(alg.slice(9), 10) || 1;
             const actual = getHashLength(key.algorithm.hash);
             if (actual !== expected)
                 throw unusable(`SHA-${expected}`, 'algorithm.hash');
@@ -41499,12 +41628,12 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
                     throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__["JWEInvalid"](`JOSE Header "apv" (Agreement PartyVInfo) invalid`);
                 partyVInfo = Object(_runtime_base64url_js__WEBPACK_IMPORTED_MODULE_4__["decode"])(joseHeader.apv);
             }
-            const sharedSecret = await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["deriveKey"](epk, key, alg === 'ECDH-ES' ? joseHeader.enc : alg, alg === 'ECDH-ES' ? Object(_lib_cek_js__WEBPACK_IMPORTED_MODULE_6__["bitLength"])(joseHeader.enc) : parseInt(alg.substr(-5, 3), 10), partyUInfo, partyVInfo);
+            const sharedSecret = await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["deriveKey"](epk, key, alg === 'ECDH-ES' ? joseHeader.enc : alg, alg === 'ECDH-ES' ? Object(_lib_cek_js__WEBPACK_IMPORTED_MODULE_6__["bitLength"])(joseHeader.enc) : parseInt(alg.slice(-5, -2), 10), partyUInfo, partyVInfo);
             if (alg === 'ECDH-ES')
                 return sharedSecret;
             if (encryptedKey === undefined)
                 throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__["JWEInvalid"]('JWE Encrypted Key missing');
-            return Object(_runtime_aeskw_js__WEBPACK_IMPORTED_MODULE_0__["unwrap"])(alg.substr(-6), sharedSecret, encryptedKey);
+            return Object(_runtime_aeskw_js__WEBPACK_IMPORTED_MODULE_0__["unwrap"])(alg.slice(-6), sharedSecret, encryptedKey);
         }
         case 'RSA1_5':
         case 'RSA-OAEP':
@@ -41604,10 +41733,12 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
             }
             const { apu, apv } = providedParameters;
             let { epk: ephemeralKey } = providedParameters;
-            ephemeralKey || (ephemeralKey = await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["generateEpk"](key));
+            ephemeralKey || (ephemeralKey = (await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["generateEpk"](key)).privateKey);
             const { x, y, crv, kty } = await Object(_key_export_js__WEBPACK_IMPORTED_MODULE_7__["exportJWK"])(ephemeralKey);
-            const sharedSecret = await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["deriveKey"](key, ephemeralKey, alg === 'ECDH-ES' ? enc : alg, alg === 'ECDH-ES' ? Object(_lib_cek_js__WEBPACK_IMPORTED_MODULE_5__["bitLength"])(enc) : parseInt(alg.substr(-5, 3), 10), apu, apv);
-            parameters = { epk: { x, y, crv, kty } };
+            const sharedSecret = await _runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["deriveKey"](key, ephemeralKey, alg === 'ECDH-ES' ? enc : alg, alg === 'ECDH-ES' ? Object(_lib_cek_js__WEBPACK_IMPORTED_MODULE_5__["bitLength"])(enc) : parseInt(alg.slice(-5, -2), 10), apu, apv);
+            parameters = { epk: { x, crv, kty } };
+            if (kty === 'EC')
+                parameters.epk.y = y;
             if (apu)
                 parameters.apu = Object(_runtime_base64url_js__WEBPACK_IMPORTED_MODULE_4__["encode"])(apu);
             if (apv)
@@ -41617,7 +41748,7 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
                 break;
             }
             cek = providedCek || Object(_lib_cek_js__WEBPACK_IMPORTED_MODULE_5__["default"])(enc);
-            const kwAlg = alg.substr(-6);
+            const kwAlg = alg.slice(-6);
             encryptedKey = await Object(_runtime_aeskw_js__WEBPACK_IMPORTED_MODULE_0__["wrap"])(kwAlg, sharedSecret, cek);
             break;
         }
@@ -42099,7 +42230,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 function checkKeySize(key, alg) {
-    if (key.algorithm.length !== parseInt(alg.substr(1, 3), 10)) {
+    if (key.algorithm.length !== parseInt(alg.slice(1, 4), 10)) {
         throw new TypeError(`Invalid key size for alg: ${alg}`);
     }
 }
@@ -42174,29 +42305,30 @@ const toSPKI = (key) => {
 const toPKCS8 = (key) => {
     return genericExport('private', 'pkcs8', key);
 };
+const findOid = (keyData, oid, from = 0) => {
+    if (from === 0) {
+        oid.unshift(oid.length);
+        oid.unshift(0x06);
+    }
+    let i = keyData.indexOf(oid[0], from);
+    if (i === -1)
+        return false;
+    const sub = keyData.subarray(i, i + oid.length);
+    if (sub.length !== oid.length)
+        return false;
+    return sub.every((value, index) => value === oid[index]) || findOid(keyData, oid, i + 1);
+};
 const getNamedCurve = (keyData) => {
-    const keyDataStr = keyData.toString();
     switch (true) {
-        case keyDataStr.includes(new Uint8Array([
-            0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce,
-            0x3d, 0x03, 0x01, 0x07,
-        ]).toString()):
+        case findOid(keyData, [0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07]):
             return 'P-256';
-        case keyDataStr.includes(new Uint8Array([
-            0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00,
-            0x22,
-        ]).toString()):
+        case findOid(keyData, [0x2b, 0x81, 0x04, 0x00, 0x22]):
             return 'P-384';
-        case keyDataStr.includes(new Uint8Array([
-            0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x05, 0x2b, 0x81, 0x04, 0x00,
-            0x23,
-        ]).toString()):
+        case findOid(keyData, [0x2b, 0x81, 0x04, 0x00, 0x23]):
             return 'P-521';
-        case (Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isCloudflareWorkers"])() || Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isNodeJs"])()) &&
-            keyDataStr.includes(new Uint8Array([0x06, 0x03, 0x2b, 0x65, 0x70]).toString()):
+        case (Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isCloudflareWorkers"])() || Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isNodeJs"])()) && findOid(keyData, [0x2b, 0x65, 0x70]):
             return 'Ed25519';
-        case Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isNodeJs"])() &&
-            keyDataStr.includes(new Uint8Array([0x06, 0x03, 0x2b, 0x65, 0x71]).toString()):
+        case Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isNodeJs"])() && 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');
@@ -42214,13 +42346,13 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
         case 'PS256':
         case 'PS384':
         case 'PS512':
-            algorithm = { name: 'RSA-PSS', hash: `SHA-${alg.substr(-3)}` };
+            algorithm = { name: 'RSA-PSS', hash: `SHA-${alg.slice(-3)}` };
             keyUsages = isPublic ? ['verify'] : ['sign'];
             break;
         case 'RS256':
         case 'RS384':
         case 'RS512':
-            algorithm = { name: 'RSASSA-PKCS1-v1_5', hash: `SHA-${alg.substr(-3)}` };
+            algorithm = { name: 'RSASSA-PKCS1-v1_5', hash: `SHA-${alg.slice(-3)}` };
             keyUsages = isPublic ? ['verify'] : ['sign'];
             break;
         case 'RSA-OAEP':
@@ -42229,7 +42361,7 @@ const genericImport = async (replace, keyFormat, pem, alg, options) => {
         case 'RSA-OAEP-512':
             algorithm = {
                 name: 'RSA-OAEP',
-                hash: `SHA-${parseInt(alg.substr(-3), 10) || 1}`,
+                hash: `SHA-${parseInt(alg.slice(-3), 10) || 1}`,
             };
             keyUsages = isPublic ? ['encrypt', 'wrapKey'] : ['decrypt', 'unwrapKey'];
             break;
@@ -42416,7 +42548,7 @@ async function cbcDecrypt(enc, cek, ciphertext, iv, tag, aad) {
     if (!(cek instanceof Uint8Array)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_7__["default"])(cek, 'Uint8Array'));
     }
-    const keySize = parseInt(enc.substr(1, 3), 10);
+    const keySize = parseInt(enc.slice(1, 4), 10);
     const encKey = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_5__["default"].subtle.importKey('raw', cek.subarray(keySize >> 3), 'AES-CBC', false, ['decrypt']);
     const macKey = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_5__["default"].subtle.importKey('raw', cek.subarray(0, keySize >> 3), {
         hash: `SHA-${keySize << 1}`,
@@ -42475,13 +42607,13 @@ const decrypt = async (enc, cek, ciphertext, iv, tag, aad) => {
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
             if (cek instanceof Uint8Array)
-                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.substr(-3), 10));
+                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.slice(-3), 10));
             return cbcDecrypt(enc, cek, ciphertext, iv, tag, aad);
         case 'A128GCM':
         case 'A192GCM':
         case 'A256GCM':
             if (cek instanceof Uint8Array)
-                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.substr(1, 3), 10));
+                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.slice(1, 4), 10));
             return gcmDecrypt(enc, cek, ciphertext, iv, tag, aad);
         default:
             throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_4__["JOSENotSupported"]('Unsupported JWE Content Encryption Algorithm');
@@ -42504,7 +42636,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./webcrypto.js */ "./node_modules/jose/dist/browser/runtime/webcrypto.js");
 
 const digest = async (algorithm, data) => {
-    const subtleDigest = `SHA-${algorithm.substr(-3)}`;
+    const subtleDigest = `SHA-${algorithm.slice(-3)}`;
     return new Uint8Array(await _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.digest(subtleDigest, data));
 };
 /* harmony default export */ __webpack_exports__["default"] = (digest);
@@ -42536,7 +42668,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-const deriveKey = async (publicKey, privateKey, algorithm, keyLength, apu = new Uint8Array(0), apv = new Uint8Array(0)) => {
+async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu = new Uint8Array(0), apv = new Uint8Array(0)) {
     if (!Object(_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["isCryptoKey"])(publicKey)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_4__["default"])(publicKey, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_5__["types"]));
     }
@@ -42552,22 +42684,21 @@ const deriveKey = async (publicKey, privateKey, algorithm, keyLength, apu = new
     const sharedSecret = new Uint8Array(await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.deriveBits({
         name: 'ECDH',
         public: publicKey,
-    }, privateKey, Math.ceil(parseInt(privateKey.algorithm.namedCurve.substr(-3), 10) / 8) <<
-        3));
+    }, privateKey, Math.ceil(parseInt(privateKey.algorithm.namedCurve.slice(-3), 10) / 8) << 3));
     return Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["concatKdf"])(_digest_js__WEBPACK_IMPORTED_MODULE_3__["default"], sharedSecret, keyLength, value);
-};
-const generateEpk = async (key) => {
+}
+async function generateEpk(key) {
     if (!Object(_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["isCryptoKey"])(key)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_4__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_5__["types"]));
     }
-    return (await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.generateKey({ name: 'ECDH', namedCurve: key.algorithm.namedCurve }, true, ['deriveBits'])).privateKey;
-};
-const ecdhAllowed = (key) => {
+    return _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.generateKey(key.algorithm, true, ['deriveBits']);
+}
+function ecdhAllowed(key) {
     if (!Object(_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["isCryptoKey"])(key)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_4__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_5__["types"]));
     }
     return ['P-256', 'P-384', 'P-521'].includes(key.algorithm.namedCurve);
-};
+}
 
 
 /***/ }),
@@ -42601,7 +42732,7 @@ async function cbcEncrypt(enc, plaintext, cek, iv, aad) {
     if (!(cek instanceof Uint8Array)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_5__["default"])(cek, 'Uint8Array'));
     }
-    const keySize = parseInt(enc.substr(1, 3), 10);
+    const keySize = parseInt(enc.slice(1, 4), 10);
     const encKey = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_3__["default"].subtle.importKey('raw', cek.subarray(keySize >> 3), 'AES-CBC', false, ['encrypt']);
     const macKey = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_3__["default"].subtle.importKey('raw', cek.subarray(0, keySize >> 3), {
         hash: `SHA-${keySize << 1}`,
@@ -42644,13 +42775,13 @@ const encrypt = async (enc, plaintext, cek, iv, aad) => {
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
             if (cek instanceof Uint8Array)
-                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.substr(-3), 10));
+                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.slice(-3), 10));
             return cbcEncrypt(enc, plaintext, cek, iv, aad);
         case 'A128GCM':
         case 'A192GCM':
         case 'A256GCM':
             if (cek instanceof Uint8Array)
-                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.substr(1, 3), 10));
+                Object(_check_cek_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(cek, parseInt(enc.slice(1, 4), 10));
             return gcmEncrypt(enc, plaintext, cek, iv, aad);
         default:
             throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_6__["JOSENotSupported"]('Unsupported JWE Content Encryption Algorithm');
@@ -42773,19 +42904,19 @@ async function generateSecret(alg, options) {
         case 'HS256':
         case 'HS384':
         case 'HS512':
-            length = parseInt(alg.substr(-3), 10);
+            length = parseInt(alg.slice(-3), 10);
             algorithm = { name: 'HMAC', hash: `SHA-${length}`, length };
             keyUsages = ['sign', 'verify'];
             break;
         case 'A128CBC-HS256':
         case 'A192CBC-HS384':
         case 'A256CBC-HS512':
-            length = parseInt(alg.substr(-3), 10);
+            length = parseInt(alg.slice(-3), 10);
             return Object(_random_js__WEBPACK_IMPORTED_MODULE_3__["default"])(new Uint8Array(length >> 3));
         case 'A128KW':
         case 'A192KW':
         case 'A256KW':
-            length = parseInt(alg.substring(1, 4), 10);
+            length = parseInt(alg.slice(1, 4), 10);
             algorithm = { name: 'AES-KW', length };
             keyUsages = ['wrapKey', 'unwrapKey'];
             break;
@@ -42795,7 +42926,7 @@ async function generateSecret(alg, options) {
         case 'A128GCM':
         case 'A192GCM':
         case 'A256GCM':
-            length = parseInt(alg.substring(1, 4), 10);
+            length = parseInt(alg.slice(1, 4), 10);
             algorithm = { name: 'AES-GCM', length };
             keyUsages = ['encrypt', 'decrypt'];
             break;
@@ -42822,7 +42953,7 @@ async function generateKeyPair(alg, options) {
         case 'PS512':
             algorithm = {
                 name: 'RSA-PSS',
-                hash: `SHA-${alg.substr(-3)}`,
+                hash: `SHA-${alg.slice(-3)}`,
                 publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
                 modulusLength: getModulusLengthOption(options),
             };
@@ -42833,7 +42964,7 @@ async function generateKeyPair(alg, options) {
         case 'RS512':
             algorithm = {
                 name: 'RSASSA-PKCS1-v1_5',
-                hash: `SHA-${alg.substr(-3)}`,
+                hash: `SHA-${alg.slice(-3)}`,
                 publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
                 modulusLength: getModulusLengthOption(options),
             };
@@ -42845,7 +42976,7 @@ async function generateKeyPair(alg, options) {
         case 'RSA-OAEP-512':
             algorithm = {
                 name: 'RSA-OAEP',
-                hash: `SHA-${parseInt(alg.substr(-3), 10) || 1}`,
+                hash: `SHA-${parseInt(alg.slice(-3), 10) || 1}`,
                 publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
                 modulusLength: getModulusLengthOption(options),
             };
@@ -42921,7 +43052,7 @@ function getCryptoKey(alg, key, usage) {
         if (!alg.startsWith('HS')) {
             throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_2__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_3__["types"]));
         }
-        return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.importKey('raw', key, { hash: `SHA-${alg.substr(-3)}`, name: 'HMAC' }, false, [usage]);
+        return _webcrypto_js__WEBPACK_IMPORTED_MODULE_0__["default"].subtle.importKey('raw', key, { hash: `SHA-${alg.slice(-3)}`, name: 'HMAC' }, false, [usage]);
     }
     throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_2__["default"])(key, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_3__["types"], 'Uint8Array'));
 }
@@ -42975,7 +43106,7 @@ function subtleMapping(jwk) {
                 case 'HS256':
                 case 'HS384':
                 case 'HS512':
-                    algorithm = { name: 'HMAC', hash: `SHA-${jwk.alg.substr(-3)}` };
+                    algorithm = { name: 'HMAC', hash: `SHA-${jwk.alg.slice(-3)}` };
                     keyUsages = ['sign', 'verify'];
                     break;
                 case 'A128CBC-HS256':
@@ -43013,13 +43144,13 @@ function subtleMapping(jwk) {
                 case 'PS256':
                 case 'PS384':
                 case 'PS512':
-                    algorithm = { name: 'RSA-PSS', hash: `SHA-${jwk.alg.substr(-3)}` };
+                    algorithm = { name: 'RSA-PSS', hash: `SHA-${jwk.alg.slice(-3)}` };
                     keyUsages = jwk.d ? ['sign'] : ['verify'];
                     break;
                 case 'RS256':
                 case 'RS384':
                 case 'RS512':
-                    algorithm = { name: 'RSASSA-PKCS1-v1_5', hash: `SHA-${jwk.alg.substr(-3)}` };
+                    algorithm = { name: 'RSASSA-PKCS1-v1_5', hash: `SHA-${jwk.alg.slice(-3)}` };
                     keyUsages = jwk.d ? ['sign'] : ['verify'];
                     break;
                 case 'RSA-OAEP':
@@ -43028,7 +43159,7 @@ function subtleMapping(jwk) {
                 case 'RSA-OAEP-512':
                     algorithm = {
                         name: 'RSA-OAEP',
-                        hash: `SHA-${parseInt(jwk.alg.substr(-3), 10) || 1}`,
+                        hash: `SHA-${parseInt(jwk.alg.slice(-3), 10) || 1}`,
                     };
                     keyUsages = jwk.d ? ['decrypt', 'unwrapKey'] : ['encrypt', 'wrapKey'];
                     break;
@@ -43185,9 +43316,9 @@ function getCryptoKey(key, alg) {
 async function deriveKey(p2s, alg, p2c, key) {
     Object(_lib_check_p2s_js__WEBPACK_IMPORTED_MODULE_4__["default"])(p2s);
     const salt = Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_1__["p2s"])(alg, p2s);
-    const keylen = parseInt(alg.substr(13, 3), 10);
+    const keylen = parseInt(alg.slice(13, 16), 10);
     const subtleAlg = {
-        hash: `SHA-${alg.substr(8, 3)}`,
+        hash: `SHA-${alg.slice(8, 11)}`,
         iterations: p2c,
         name: 'PBKDF2',
         salt,
@@ -43207,12 +43338,12 @@ async function deriveKey(p2s, alg, p2c, key) {
 }
 const encrypt = async (alg, key, cek, p2c = Math.floor(Math.random() * 2049) + 2048, p2s = Object(_random_js__WEBPACK_IMPORTED_MODULE_0__["default"])(new Uint8Array(16))) => {
     const derived = await deriveKey(p2s, alg, p2c, key);
-    const encryptedKey = await Object(_aeskw_js__WEBPACK_IMPORTED_MODULE_3__["wrap"])(alg.substr(-6), derived, cek);
+    const encryptedKey = await Object(_aeskw_js__WEBPACK_IMPORTED_MODULE_3__["wrap"])(alg.slice(-6), derived, cek);
     return { encryptedKey, p2c, p2s: Object(_base64url_js__WEBPACK_IMPORTED_MODULE_2__["encode"])(p2s) };
 };
 const decrypt = async (alg, key, encryptedKey, p2c, p2s) => {
     const derived = await deriveKey(p2s, alg, p2c, key);
-    return Object(_aeskw_js__WEBPACK_IMPORTED_MODULE_3__["unwrap"])(alg.substr(-6), derived, encryptedKey);
+    return Object(_aeskw_js__WEBPACK_IMPORTED_MODULE_3__["unwrap"])(alg.slice(-6), derived, encryptedKey);
 };
 
 
@@ -43313,7 +43444,7 @@ __webpack_require__.r(__webpack_exports__);
 const sign = async (alg, key, data) => {
     const cryptoKey = await Object(_get_sign_verify_key_js__WEBPACK_IMPORTED_MODULE_3__["default"])(alg, key, 'sign');
     Object(_check_key_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(alg, cryptoKey);
-    const signature = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.sign(Object(_subtle_dsa_js__WEBPACK_IMPORTED_MODULE_0__["default"])(alg, cryptoKey.algorithm.namedCurve), cryptoKey, data);
+    const signature = await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.sign(Object(_subtle_dsa_js__WEBPACK_IMPORTED_MODULE_0__["default"])(alg, cryptoKey.algorithm), cryptoKey, data);
     return new Uint8Array(signature);
 };
 /* harmony default export */ __webpack_exports__["default"] = (sign);
@@ -43335,26 +43466,27 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
 
 
-function subtleDsa(alg, namedCurve) {
-    const length = parseInt(alg.substr(-3), 10);
+function subtleDsa(alg, algorithm) {
+    const hash = `SHA-${alg.slice(-3)}`;
     switch (alg) {
         case 'HS256':
         case 'HS384':
         case 'HS512':
-            return { hash: `SHA-${length}`, name: 'HMAC' };
+            return { hash, name: 'HMAC' };
         case 'PS256':
         case 'PS384':
         case 'PS512':
-            return { hash: `SHA-${length}`, name: 'RSA-PSS', saltLength: length >> 3 };
+            return { hash, name: 'RSA-PSS', saltLength: alg.slice(-3) >> 3 };
         case 'RS256':
         case 'RS384':
         case 'RS512':
-            return { hash: `SHA-${length}`, name: 'RSASSA-PKCS1-v1_5' };
+            return { hash, name: 'RSASSA-PKCS1-v1_5' };
         case 'ES256':
         case 'ES384':
         case 'ES512':
-            return { hash: `SHA-${length}`, name: 'ECDSA', namedCurve };
+            return { hash, name: 'ECDSA', namedCurve: algorithm.namedCurve };
         case (Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isCloudflareWorkers"])() || Object(_env_js__WEBPACK_IMPORTED_MODULE_0__["isNodeJs"])()) && 'EdDSA':
+            const { namedCurve } = algorithm;
             return { name: namedCurve, namedCurve };
         default:
             throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JOSENotSupported"](`alg ${alg} is not supported either by JOSE or your javascript runtime`);
@@ -43443,7 +43575,7 @@ __webpack_require__.r(__webpack_exports__);
 const verify = async (alg, key, signature, data) => {
     const cryptoKey = await Object(_get_sign_verify_key_js__WEBPACK_IMPORTED_MODULE_3__["default"])(alg, key, 'verify');
     Object(_check_key_length_js__WEBPACK_IMPORTED_MODULE_2__["default"])(alg, cryptoKey);
-    const algorithm = Object(_subtle_dsa_js__WEBPACK_IMPORTED_MODULE_0__["default"])(alg, cryptoKey.algorithm.namedCurve);
+    const algorithm = Object(_subtle_dsa_js__WEBPACK_IMPORTED_MODULE_0__["default"])(alg, cryptoKey.algorithm);
     try {
         return await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.verify(algorithm, cryptoKey, signature, data);
     }
@@ -43522,6 +43654,56 @@ const encode = _runtime_base64url_js__WEBPACK_IMPORTED_MODULE_0__["encode"];
 const decode = _runtime_base64url_js__WEBPACK_IMPORTED_MODULE_0__["decode"];
 
 
+/***/ }),
+
+/***/ "./node_modules/jose/dist/browser/util/decode_jwt.js":
+/*!***********************************************************!*\
+  !*** ./node_modules/jose/dist/browser/util/decode_jwt.js ***!
+  \***********************************************************/
+/*! exports provided: decodeJwt */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "decodeJwt", function() { return decodeJwt; });
+/* harmony import */ var _base64url_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./base64url.js */ "./node_modules/jose/dist/browser/util/base64url.js");
+/* harmony import */ var _lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../lib/buffer_utils.js */ "./node_modules/jose/dist/browser/lib/buffer_utils.js");
+/* harmony import */ var _lib_is_object_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ../lib/is_object.js */ "./node_modules/jose/dist/browser/lib/is_object.js");
+/* harmony import */ var _errors_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
+
+
+
+
+function decodeJwt(jwt) {
+    if (typeof jwt !== 'string')
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('JWTs must use Compact JWS serialization, JWT must be a string');
+    const { 1: payload, length } = jwt.split('.');
+    if (length === 5)
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('Only JWTs using Compact JWS serialization can be decoded');
+    if (length !== 3)
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('Invalid JWT');
+    if (!payload)
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('JWTs must contain a payload');
+    let decoded;
+    try {
+        decoded = Object(_base64url_js__WEBPACK_IMPORTED_MODULE_0__["decode"])(payload);
+    }
+    catch (_a) {
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('Failed to parse the base64url encoded payload');
+    }
+    let result;
+    try {
+        result = JSON.parse(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_1__["decoder"].decode(decoded));
+    }
+    catch (_b) {
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('Failed to parse the decoded payload as JSON');
+    }
+    if (!Object(_lib_is_object_js__WEBPACK_IMPORTED_MODULE_2__["default"])(result))
+        throw new _errors_js__WEBPACK_IMPORTED_MODULE_3__["JWTInvalid"]('Invalid JWT Claims Set');
+    return result;
+}
+
+
 /***/ }),
 
 /***/ "./node_modules/jose/dist/browser/util/decode_protected_header.js":
@@ -60258,7 +60440,7 @@ function escapeRegex(regex) {
 /*!**************************************!*\
   !*** ./node_modules/n3/src/index.js ***!
   \**************************************/
-/*! exports provided: Lexer, Parser, Writer, Store, StreamParser, StreamWriter, Util, DataFactory, Term, NamedNode, Literal, BlankNode, Variable, DefaultGraph, Quad, Triple, termFromId, termToId */
+/*! exports provided: Lexer, Parser, Writer, Store, StreamParser, StreamWriter, Util, DataFactory, Term, NamedNode, Literal, BlankNode, Variable, DefaultGraph, Quad, Triple, termFromId, termToId, default */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -60316,8 +60498,34 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
+// Named exports
 
 
+// Export all named exports as a default object for backward compatibility
+/* harmony default export */ __webpack_exports__["default"] = ({
+  Lexer: _N3Lexer__WEBPACK_IMPORTED_MODULE_0__["default"],
+  Parser: _N3Parser__WEBPACK_IMPORTED_MODULE_1__["default"],
+  Writer: _N3Writer__WEBPACK_IMPORTED_MODULE_2__["default"],
+  Store: _N3Store__WEBPACK_IMPORTED_MODULE_3__["default"],
+  StreamParser: _N3StreamParser__WEBPACK_IMPORTED_MODULE_4__["default"],
+  StreamWriter: _N3StreamWriter__WEBPACK_IMPORTED_MODULE_5__["default"],
+  Util: _N3Util__WEBPACK_IMPORTED_MODULE_6__,
+
+  DataFactory: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["default"],
+
+  Term: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["Term"],
+  NamedNode: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["NamedNode"],
+  Literal: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["Literal"],
+  BlankNode: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["BlankNode"],
+  Variable: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["Variable"],
+  DefaultGraph: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["DefaultGraph"],
+  Quad: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["Quad"],
+  Triple: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["Triple"],
+
+  termFromId: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["termFromId"],
+  termToId: _N3DataFactory__WEBPACK_IMPORTED_MODULE_7__["termToId"],
+});
+
 
 /***/ }),
 
@@ -60635,6 +60843,313 @@ var substr = 'ab'.substr(-1) === 'b'
 
 /***/ }),
 
+/***/ "./node_modules/node-libs-browser/node_modules/string_decoder/lib/string_decoder.js":
+/*!******************************************************************************************!*\
+  !*** ./node_modules/node-libs-browser/node_modules/string_decoder/lib/string_decoder.js ***!
+  \******************************************************************************************/
+/*! no static exports found */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+
+/*<replacement>*/
+
+var Buffer = __webpack_require__(/*! safe-buffer */ "./node_modules/safe-buffer/index.js").Buffer;
+/*</replacement>*/
+
+var isEncoding = Buffer.isEncoding || function (encoding) {
+  encoding = '' + encoding;
+  switch (encoding && encoding.toLowerCase()) {
+    case 'hex':case 'utf8':case 'utf-8':case 'ascii':case 'binary':case 'base64':case 'ucs2':case 'ucs-2':case 'utf16le':case 'utf-16le':case 'raw':
+      return true;
+    default:
+      return false;
+  }
+};
+
+function _normalizeEncoding(enc) {
+  if (!enc) return 'utf8';
+  var retried;
+  while (true) {
+    switch (enc) {
+      case 'utf8':
+      case 'utf-8':
+        return 'utf8';
+      case 'ucs2':
+      case 'ucs-2':
+      case 'utf16le':
+      case 'utf-16le':
+        return 'utf16le';
+      case 'latin1':
+      case 'binary':
+        return 'latin1';
+      case 'base64':
+      case 'ascii':
+      case 'hex':
+        return enc;
+      default:
+        if (retried) return; // undefined
+        enc = ('' + enc).toLowerCase();
+        retried = true;
+    }
+  }
+};
+
+// Do not cache `Buffer.isEncoding` when checking encoding names as some
+// modules monkey-patch it to support additional encodings
+function normalizeEncoding(enc) {
+  var nenc = _normalizeEncoding(enc);
+  if (typeof nenc !== 'string' && (Buffer.isEncoding === isEncoding || !isEncoding(enc))) throw new Error('Unknown encoding: ' + enc);
+  return nenc || enc;
+}
+
+// StringDecoder provides an interface for efficiently splitting a series of
+// buffers into a series of JS strings without breaking apart multi-byte
+// characters.
+exports.StringDecoder = StringDecoder;
+function StringDecoder(encoding) {
+  this.encoding = normalizeEncoding(encoding);
+  var nb;
+  switch (this.encoding) {
+    case 'utf16le':
+      this.text = utf16Text;
+      this.end = utf16End;
+      nb = 4;
+      break;
+    case 'utf8':
+      this.fillLast = utf8FillLast;
+      nb = 4;
+      break;
+    case 'base64':
+      this.text = base64Text;
+      this.end = base64End;
+      nb = 3;
+      break;
+    default:
+      this.write = simpleWrite;
+      this.end = simpleEnd;
+      return;
+  }
+  this.lastNeed = 0;
+  this.lastTotal = 0;
+  this.lastChar = Buffer.allocUnsafe(nb);
+}
+
+StringDecoder.prototype.write = function (buf) {
+  if (buf.length === 0) return '';
+  var r;
+  var i;
+  if (this.lastNeed) {
+    r = this.fillLast(buf);
+    if (r === undefined) return '';
+    i = this.lastNeed;
+    this.lastNeed = 0;
+  } else {
+    i = 0;
+  }
+  if (i < buf.length) return r ? r + this.text(buf, i) : this.text(buf, i);
+  return r || '';
+};
+
+StringDecoder.prototype.end = utf8End;
+
+// Returns only complete characters in a Buffer
+StringDecoder.prototype.text = utf8Text;
+
+// Attempts to complete a partial non-UTF-8 character using bytes from a Buffer
+StringDecoder.prototype.fillLast = function (buf) {
+  if (this.lastNeed <= buf.length) {
+    buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, this.lastNeed);
+    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
+  }
+  buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, buf.length);
+  this.lastNeed -= buf.length;
+};
+
+// Checks the type of a UTF-8 byte, whether it's ASCII, a leading byte, or a
+// continuation byte. If an invalid byte is detected, -2 is returned.
+function utf8CheckByte(byte) {
+  if (byte <= 0x7F) return 0;else if (byte >> 5 === 0x06) return 2;else if (byte >> 4 === 0x0E) return 3;else if (byte >> 3 === 0x1E) return 4;
+  return byte >> 6 === 0x02 ? -1 : -2;
+}
+
+// Checks at most 3 bytes at the end of a Buffer in order to detect an
+// incomplete multi-byte UTF-8 character. The total number of bytes (2, 3, or 4)
+// needed to complete the UTF-8 character (if applicable) are returned.
+function utf8CheckIncomplete(self, buf, i) {
+  var j = buf.length - 1;
+  if (j < i) return 0;
+  var nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) self.lastNeed = nb - 1;
+    return nb;
+  }
+  if (--j < i || nb === -2) return 0;
+  nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) self.lastNeed = nb - 2;
+    return nb;
+  }
+  if (--j < i || nb === -2) return 0;
+  nb = utf8CheckByte(buf[j]);
+  if (nb >= 0) {
+    if (nb > 0) {
+      if (nb === 2) nb = 0;else self.lastNeed = nb - 3;
+    }
+    return nb;
+  }
+  return 0;
+}
+
+// Validates as many continuation bytes for a multi-byte UTF-8 character as
+// needed or are available. If we see a non-continuation byte where we expect
+// one, we "replace" the validated continuation bytes we've seen so far with
+// a single UTF-8 replacement character ('\ufffd'), to match v8's UTF-8 decoding
+// behavior. The continuation byte check is included three times in the case
+// where all of the continuation bytes for a character exist in the same buffer.
+// It is also done this way as a slight performance increase instead of using a
+// loop.
+function utf8CheckExtraBytes(self, buf, p) {
+  if ((buf[0] & 0xC0) !== 0x80) {
+    self.lastNeed = 0;
+    return '\ufffd';
+  }
+  if (self.lastNeed > 1 && buf.length > 1) {
+    if ((buf[1] & 0xC0) !== 0x80) {
+      self.lastNeed = 1;
+      return '\ufffd';
+    }
+    if (self.lastNeed > 2 && buf.length > 2) {
+      if ((buf[2] & 0xC0) !== 0x80) {
+        self.lastNeed = 2;
+        return '\ufffd';
+      }
+    }
+  }
+}
+
+// Attempts to complete a multi-byte UTF-8 character using bytes from a Buffer.
+function utf8FillLast(buf) {
+  var p = this.lastTotal - this.lastNeed;
+  var r = utf8CheckExtraBytes(this, buf, p);
+  if (r !== undefined) return r;
+  if (this.lastNeed <= buf.length) {
+    buf.copy(this.lastChar, p, 0, this.lastNeed);
+    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
+  }
+  buf.copy(this.lastChar, p, 0, buf.length);
+  this.lastNeed -= buf.length;
+}
+
+// Returns all complete UTF-8 characters in a Buffer. If the Buffer ended on a
+// partial character, the character's bytes are buffered until the required
+// number of bytes are available.
+function utf8Text(buf, i) {
+  var total = utf8CheckIncomplete(this, buf, i);
+  if (!this.lastNeed) return buf.toString('utf8', i);
+  this.lastTotal = total;
+  var end = buf.length - (total - this.lastNeed);
+  buf.copy(this.lastChar, 0, end);
+  return buf.toString('utf8', i, end);
+}
+
+// For UTF-8, a replacement character is added when ending on a partial
+// character.
+function utf8End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) return r + '\ufffd';
+  return r;
+}
+
+// UTF-16LE typically needs two bytes per character, but even if we have an even
+// number of bytes available, we need to check if we end on a leading/high
+// surrogate. In that case, we need to wait for the next two bytes in order to
+// decode the last character properly.
+function utf16Text(buf, i) {
+  if ((buf.length - i) % 2 === 0) {
+    var r = buf.toString('utf16le', i);
+    if (r) {
+      var c = r.charCodeAt(r.length - 1);
+      if (c >= 0xD800 && c <= 0xDBFF) {
+        this.lastNeed = 2;
+        this.lastTotal = 4;
+        this.lastChar[0] = buf[buf.length - 2];
+        this.lastChar[1] = buf[buf.length - 1];
+        return r.slice(0, -1);
+      }
+    }
+    return r;
+  }
+  this.lastNeed = 1;
+  this.lastTotal = 2;
+  this.lastChar[0] = buf[buf.length - 1];
+  return buf.toString('utf16le', i, buf.length - 1);
+}
+
+// For UTF-16LE we do not explicitly append special replacement characters if we
+// end on a partial character, we simply let v8 handle that.
+function utf16End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) {
+    var end = this.lastTotal - this.lastNeed;
+    return r + this.lastChar.toString('utf16le', 0, end);
+  }
+  return r;
+}
+
+function base64Text(buf, i) {
+  var n = (buf.length - i) % 3;
+  if (n === 0) return buf.toString('base64', i);
+  this.lastNeed = 3 - n;
+  this.lastTotal = 3;
+  if (n === 1) {
+    this.lastChar[0] = buf[buf.length - 1];
+  } else {
+    this.lastChar[0] = buf[buf.length - 2];
+    this.lastChar[1] = buf[buf.length - 1];
+  }
+  return buf.toString('base64', i, buf.length - n);
+}
+
+function base64End(buf) {
+  var r = buf && buf.length ? this.write(buf) : '';
+  if (this.lastNeed) return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed);
+  return r;
+}
+
+// Pass bytes on through for single-byte encodings (e.g. ascii, latin1, hex)
+function simpleWrite(buf) {
+  return buf.toString(this.encoding);
+}
+
+function simpleEnd(buf) {
+  return buf && buf.length ? this.write(buf) : '';
+}
+
+/***/ }),
+
 /***/ "./node_modules/process/browser.js":
 /*!*****************************************!*\
   !*** ./node_modules/process/browser.js ***!
@@ -79702,7 +80217,7 @@ function ReadableState(options, stream, isDuplex) {
   this.encoding = null;
 
   if (options.encoding) {
-    if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "./node_modules/string_decoder/lib/string_decoder.js").StringDecoder;
+    if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "./node_modules/node-libs-browser/node_modules/string_decoder/lib/string_decoder.js").StringDecoder;
     this.decoder = new StringDecoder(options.encoding);
     this.encoding = options.encoding;
   }
@@ -79864,7 +80379,7 @@ Readable.prototype.isPaused = function () {
 
 
 Readable.prototype.setEncoding = function (enc) {
-  if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "./node_modules/string_decoder/lib/string_decoder.js").StringDecoder;
+  if (!StringDecoder) StringDecoder = __webpack_require__(/*! string_decoder/ */ "./node_modules/node-libs-browser/node_modules/string_decoder/lib/string_decoder.js").StringDecoder;
   var decoder = new StringDecoder(enc);
   this._readableState.decoder = decoder; // If setEncoding(null), decoder.encoding equals utf8
 
@@ -83225,7 +83740,6 @@ try {
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-/*! safe-buffer. MIT License. Feross Aboukhadijeh <https://feross.org/opensource> */
 /* eslint-disable node/no-deprecated-api */
 var buffer = __webpack_require__(/*! buffer */ "./node_modules/buffer/index.js")
 var Buffer = buffer.Buffer
@@ -83248,8 +83762,6 @@ function SafeBuffer (arg, encodingOrOffset, length) {
   return Buffer(arg, encodingOrOffset, length)
 }
 
-SafeBuffer.prototype = Object.create(Buffer.prototype)
-
 // Copy static methods from Buffer
 copyProps(Buffer, SafeBuffer)
 
@@ -83733,9 +84245,6 @@ exports.SolidAuthnLogic = void 0;
 var rdflib_1 = __webpack_require__(/*! rdflib */ "./node_modules/rdflib/esm/index.js");
 var authUtil_1 = __webpack_require__(/*! ./authUtil */ "./node_modules/solid-logic/lib/authn/authUtil.js");
 var debug = __importStar(__webpack_require__(/*! ../util/debug */ "./node_modules/solid-logic/lib/util/debug.js"));
-/**
- * Implements AuthnLogic relying on solid-auth-client
- */
 var SolidAuthnLogic = /** @class */ (function () {
     function SolidAuthnLogic(solidAuthSession) {
         this.session = solidAuthSession;
@@ -84548,12 +85057,8 @@ var SolidLogic = /** @class */ (function () {
             preferencesFile: {},
         };
         this.fetcher = fetcher;
-        // if (authSession) {
         this.authn = new SolidAuthnLogic_1.SolidAuthnLogic(session);
         debug.log('SolidAuthnLogic initialized');
-        /* } else {
-        this.authn = new NoAuthnLogic();
-        }*/
         this.profile = new ProfileLogic_1.ProfileLogic(this.store, ns, this.authn);
         this.chat = new ChatLogic_1.ChatLogic(this.store, ns, this.profile);
         this.util = new UtilityLogic_1.UtilityLogic(this.store, ns, this.fetcher);
@@ -85719,313 +86224,6 @@ function vocab (rdf = { namedNode: u => u }) {
 module.exports = vocab
 
 
-/***/ }),
-
-/***/ "./node_modules/string_decoder/lib/string_decoder.js":
-/*!***********************************************************!*\
-  !*** ./node_modules/string_decoder/lib/string_decoder.js ***!
-  \***********************************************************/
-/*! no static exports found */
-/***/ (function(module, exports, __webpack_require__) {
-
-"use strict";
-// Copyright Joyent, Inc. and other Node contributors.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a
-// copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to permit
-// persons to whom the Software is furnished to do so, subject to the
-// following conditions:
-//
-// The above copyright notice and this permission notice shall be included
-// in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
-// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
-// USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-
-/*<replacement>*/
-
-var Buffer = __webpack_require__(/*! safe-buffer */ "./node_modules/safe-buffer/index.js").Buffer;
-/*</replacement>*/
-
-var isEncoding = Buffer.isEncoding || function (encoding) {
-  encoding = '' + encoding;
-  switch (encoding && encoding.toLowerCase()) {
-    case 'hex':case 'utf8':case 'utf-8':case 'ascii':case 'binary':case 'base64':case 'ucs2':case 'ucs-2':case 'utf16le':case 'utf-16le':case 'raw':
-      return true;
-    default:
-      return false;
-  }
-};
-
-function _normalizeEncoding(enc) {
-  if (!enc) return 'utf8';
-  var retried;
-  while (true) {
-    switch (enc) {
-      case 'utf8':
-      case 'utf-8':
-        return 'utf8';
-      case 'ucs2':
-      case 'ucs-2':
-      case 'utf16le':
-      case 'utf-16le':
-        return 'utf16le';
-      case 'latin1':
-      case 'binary':
-        return 'latin1';
-      case 'base64':
-      case 'ascii':
-      case 'hex':
-        return enc;
-      default:
-        if (retried) return; // undefined
-        enc = ('' + enc).toLowerCase();
-        retried = true;
-    }
-  }
-};
-
-// Do not cache `Buffer.isEncoding` when checking encoding names as some
-// modules monkey-patch it to support additional encodings
-function normalizeEncoding(enc) {
-  var nenc = _normalizeEncoding(enc);
-  if (typeof nenc !== 'string' && (Buffer.isEncoding === isEncoding || !isEncoding(enc))) throw new Error('Unknown encoding: ' + enc);
-  return nenc || enc;
-}
-
-// StringDecoder provides an interface for efficiently splitting a series of
-// buffers into a series of JS strings without breaking apart multi-byte
-// characters.
-exports.StringDecoder = StringDecoder;
-function StringDecoder(encoding) {
-  this.encoding = normalizeEncoding(encoding);
-  var nb;
-  switch (this.encoding) {
-    case 'utf16le':
-      this.text = utf16Text;
-      this.end = utf16End;
-      nb = 4;
-      break;
-    case 'utf8':
-      this.fillLast = utf8FillLast;
-      nb = 4;
-      break;
-    case 'base64':
-      this.text = base64Text;
-      this.end = base64End;
-      nb = 3;
-      break;
-    default:
-      this.write = simpleWrite;
-      this.end = simpleEnd;
-      return;
-  }
-  this.lastNeed = 0;
-  this.lastTotal = 0;
-  this.lastChar = Buffer.allocUnsafe(nb);
-}
-
-StringDecoder.prototype.write = function (buf) {
-  if (buf.length === 0) return '';
-  var r;
-  var i;
-  if (this.lastNeed) {
-    r = this.fillLast(buf);
-    if (r === undefined) return '';
-    i = this.lastNeed;
-    this.lastNeed = 0;
-  } else {
-    i = 0;
-  }
-  if (i < buf.length) return r ? r + this.text(buf, i) : this.text(buf, i);
-  return r || '';
-};
-
-StringDecoder.prototype.end = utf8End;
-
-// Returns only complete characters in a Buffer
-StringDecoder.prototype.text = utf8Text;
-
-// Attempts to complete a partial non-UTF-8 character using bytes from a Buffer
-StringDecoder.prototype.fillLast = function (buf) {
-  if (this.lastNeed <= buf.length) {
-    buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, this.lastNeed);
-    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
-  }
-  buf.copy(this.lastChar, this.lastTotal - this.lastNeed, 0, buf.length);
-  this.lastNeed -= buf.length;
-};
-
-// Checks the type of a UTF-8 byte, whether it's ASCII, a leading byte, or a
-// continuation byte. If an invalid byte is detected, -2 is returned.
-function utf8CheckByte(byte) {
-  if (byte <= 0x7F) return 0;else if (byte >> 5 === 0x06) return 2;else if (byte >> 4 === 0x0E) return 3;else if (byte >> 3 === 0x1E) return 4;
-  return byte >> 6 === 0x02 ? -1 : -2;
-}
-
-// Checks at most 3 bytes at the end of a Buffer in order to detect an
-// incomplete multi-byte UTF-8 character. The total number of bytes (2, 3, or 4)
-// needed to complete the UTF-8 character (if applicable) are returned.
-function utf8CheckIncomplete(self, buf, i) {
-  var j = buf.length - 1;
-  if (j < i) return 0;
-  var nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) self.lastNeed = nb - 1;
-    return nb;
-  }
-  if (--j < i || nb === -2) return 0;
-  nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) self.lastNeed = nb - 2;
-    return nb;
-  }
-  if (--j < i || nb === -2) return 0;
-  nb = utf8CheckByte(buf[j]);
-  if (nb >= 0) {
-    if (nb > 0) {
-      if (nb === 2) nb = 0;else self.lastNeed = nb - 3;
-    }
-    return nb;
-  }
-  return 0;
-}
-
-// Validates as many continuation bytes for a multi-byte UTF-8 character as
-// needed or are available. If we see a non-continuation byte where we expect
-// one, we "replace" the validated continuation bytes we've seen so far with
-// a single UTF-8 replacement character ('\ufffd'), to match v8's UTF-8 decoding
-// behavior. The continuation byte check is included three times in the case
-// where all of the continuation bytes for a character exist in the same buffer.
-// It is also done this way as a slight performance increase instead of using a
-// loop.
-function utf8CheckExtraBytes(self, buf, p) {
-  if ((buf[0] & 0xC0) !== 0x80) {
-    self.lastNeed = 0;
-    return '\ufffd';
-  }
-  if (self.lastNeed > 1 && buf.length > 1) {
-    if ((buf[1] & 0xC0) !== 0x80) {
-      self.lastNeed = 1;
-      return '\ufffd';
-    }
-    if (self.lastNeed > 2 && buf.length > 2) {
-      if ((buf[2] & 0xC0) !== 0x80) {
-        self.lastNeed = 2;
-        return '\ufffd';
-      }
-    }
-  }
-}
-
-// Attempts to complete a multi-byte UTF-8 character using bytes from a Buffer.
-function utf8FillLast(buf) {
-  var p = this.lastTotal - this.lastNeed;
-  var r = utf8CheckExtraBytes(this, buf, p);
-  if (r !== undefined) return r;
-  if (this.lastNeed <= buf.length) {
-    buf.copy(this.lastChar, p, 0, this.lastNeed);
-    return this.lastChar.toString(this.encoding, 0, this.lastTotal);
-  }
-  buf.copy(this.lastChar, p, 0, buf.length);
-  this.lastNeed -= buf.length;
-}
-
-// Returns all complete UTF-8 characters in a Buffer. If the Buffer ended on a
-// partial character, the character's bytes are buffered until the required
-// number of bytes are available.
-function utf8Text(buf, i) {
-  var total = utf8CheckIncomplete(this, buf, i);
-  if (!this.lastNeed) return buf.toString('utf8', i);
-  this.lastTotal = total;
-  var end = buf.length - (total - this.lastNeed);
-  buf.copy(this.lastChar, 0, end);
-  return buf.toString('utf8', i, end);
-}
-
-// For UTF-8, a replacement character is added when ending on a partial
-// character.
-function utf8End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) return r + '\ufffd';
-  return r;
-}
-
-// UTF-16LE typically needs two bytes per character, but even if we have an even
-// number of bytes available, we need to check if we end on a leading/high
-// surrogate. In that case, we need to wait for the next two bytes in order to
-// decode the last character properly.
-function utf16Text(buf, i) {
-  if ((buf.length - i) % 2 === 0) {
-    var r = buf.toString('utf16le', i);
-    if (r) {
-      var c = r.charCodeAt(r.length - 1);
-      if (c >= 0xD800 && c <= 0xDBFF) {
-        this.lastNeed = 2;
-        this.lastTotal = 4;
-        this.lastChar[0] = buf[buf.length - 2];
-        this.lastChar[1] = buf[buf.length - 1];
-        return r.slice(0, -1);
-      }
-    }
-    return r;
-  }
-  this.lastNeed = 1;
-  this.lastTotal = 2;
-  this.lastChar[0] = buf[buf.length - 1];
-  return buf.toString('utf16le', i, buf.length - 1);
-}
-
-// For UTF-16LE we do not explicitly append special replacement characters if we
-// end on a partial character, we simply let v8 handle that.
-function utf16End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) {
-    var end = this.lastTotal - this.lastNeed;
-    return r + this.lastChar.toString('utf16le', 0, end);
-  }
-  return r;
-}
-
-function base64Text(buf, i) {
-  var n = (buf.length - i) % 3;
-  if (n === 0) return buf.toString('base64', i);
-  this.lastNeed = 3 - n;
-  this.lastTotal = 3;
-  if (n === 1) {
-    this.lastChar[0] = buf[buf.length - 1];
-  } else {
-    this.lastChar[0] = buf[buf.length - 2];
-    this.lastChar[1] = buf[buf.length - 1];
-  }
-  return buf.toString('base64', i, buf.length - n);
-}
-
-function base64End(buf) {
-  var r = buf && buf.length ? this.write(buf) : '';
-  if (this.lastNeed) return r + this.lastChar.toString('base64', 0, 3 - this.lastNeed);
-  return r;
-}
-
-// Pass bytes on through for single-byte encodings (e.g. ascii, latin1, hex)
-function simpleWrite(buf) {
-  return buf.toString(this.encoding);
-}
-
-function simpleEnd(buf) {
-  return buf && buf.length ? this.write(buf) : '';
-}
-
 /***/ }),
 
 /***/ "./node_modules/symbol-observable/es/index.js":