solid-ui 2.4.19-6a4efc3e → 2.4.19-72f773b9

package/lib/webpack-bundle.js

@@ -645,6 +645,7 @@ var EXPLANATION = {
  * for https://github.com/solid/userguide/blob/main/views/sharing/userguide.md
  */
 var AccessGroups = /*#__PURE__*/function () {
+  // @@ was LiveStore but does not need to be connected to web
   function AccessGroups(doc, aclDoc, controller, store) {
     var options = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
     (0, _classCallCheck2["default"])(this, AccessGroups);
@@ -7048,17 +7049,17 @@ var styleMap = {
   'header-user-menu__link': {
     background: 'none',
     border: '0',
-    color: '#787878',
+    color: 'black',
     cursor: 'pointer',
     display: 'block',
-    fontFamily: 'Verdana sans-serif',
+    fontFamily: 'Arial',
     fontSize: '1em',
     textAlign: 'left',
     padding: '1em',
     width: '100%',
     '&:focus, &:hover': {
-      // backgroundColor: 'linear-gradient(to right, #7C4DFF 0%, #18A9E6 50%, #01C9EA 100%)'
-      backgroundColor: 'rgba(48.6, 30.2, 100, 5%)'
+      backgroundColor: 'linear-gradient(to right, #7C4DFF 0%, #18A9E6 50%, #01C9EA 100%)' // backgroundColor: '#eee'
+
     },
     a: {
       textDecoration: 'none'
@@ -7082,17 +7083,16 @@ var styleMap = {
   'header-user-menu__button': {
     background: 'none',
     border: '0',
-    color: '#787878',
+    color: 'black',
     cursor: 'pointer',
     display: 'block',
-    fontFamily: 'Verdana sans-serif',
+    fontFamily: 'Arial',
     fontSize: '1em',
     textAlign: 'left',
     padding: '1em',
     width: '100%',
     '&:focus, &:hover': {
-      // backgroundColor: 'linear-gradient(to right, #7C4DFF 0%, #18A9E6 50%, #01C9EA 100%)'
-      backgroundColor: 'rgba(48.6, 30.2, 100, 5%)'
+      backgroundColor: 'linear-gradient(to right, #7C4DFF 0%, #18A9E6 50%, #01C9EA 100%)'
     }
   },
   'header-user-menu__list': {
@@ -7102,12 +7102,11 @@ var styleMap = {
   },
   'header-user-menu__navigation-menu': {
     background: 'white',
-    border: 'solid 1px #C8C8C8',
+    border: 'solid 1px #000000',
     // the color was defined in mashlib as a SASS variable $divider_color
-    borderRadius: '0.5rem',
-    borderRight: 'solid 1px #C8C8C8',
+    borderRight: '0',
     position: 'absolute',
-    right: '0.5em',
+    right: '0',
     top: '60px',
     // defined in mashlib as a SASS variable $icon_size
     width: '200px',
@@ -7117,7 +7116,7 @@ var styleMap = {
     }
   },
   'header-user-menu__list-item': {
-    borderBottom: 'solid 1px #D8D8D8',
+    borderBottom: 'solid 1px #000000',
     // the color was defined in mashlib as a SASS variable $divider_color
     '&:last-child': {
       border: '0'
@@ -7133,8 +7132,7 @@ var styleMap = {
     width: '50px'
   },
   'header-banner': {
-    border: 'solid 1px #C8C8C8',
-    boxShadow: '0px 1px 4px #C8C8C8',
+    boxShadow: '0px 1px 4px #000000',
     // the color was defined in mashlib as a SASS variable $divider_color
     display: 'flex',
     justifyContent: 'space-between',
@@ -7156,16 +7154,14 @@ var styleMap = {
     }
   },
   'header-banner__user-menu': {
-    borderLeft: 'solid 1px #C8C8C8',
+    borderLeft: 'solid 1px #000000',
     // the color was defined in mashlib as a SASS variable $divider_color
-    marginLeft: 'auto',
-    marginRight: '0.5em'
+    marginLeft: 'auto'
   },
   'header-banner__help-menu': {
     borderLeft: 'solid 1px #000000',
     // the color was defined in mashlib as a SASS variable $divider_color
-    marginLeft: 'auto',
-    marginRight: '0.5em'
+    marginLeft: 'auto'
   },
   'header-banner__icon': {
     backgroundSize: '65px 60px',
@@ -7920,6 +7916,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  * * `containers`      An array of nodes of containers of instances
  * * `div`             A DOM element where UI can be displayed
  * * `statusArea`      A DOM element (opt) progress stuff can be displayed, or error messages
+ * *
+ * * Vocabulary:  "load" loads a file if it exists;
+ * *  'Ensure" CREATES the file if it does not exist (if it can) and then loads it.
  * @packageDocumentation
  */
 
@@ -8339,141 +8338,231 @@ function _findAppInstances() {
   return _findAppInstances.apply(this, arguments);
 }
 
-function registrationControl(context, instance, theClass) {
-  var dom = context.dom;
+function registrationControl(_x7, _x8, _x9) {
+  return _registrationControl.apply(this, arguments);
+}
+/**
+  * UI to List at all registered things
+  */
 
-  if (!dom || !context.div) {
-    return Promise.resolve();
-  }
 
-  var box = dom.createElement('div');
-  context.div.appendChild(box);
-  return (0, _solidLogic.ensureTypeIndexes)(context).then(function () {
-    box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
+function _registrationControl() {
+  _registrationControl = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(context, instance, theClass) {
+    var dom, box, context2, msg, tbody, form, registrationStatements, index, statements, _msg;
 
-    box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
-    var tbody = box.children[0].children[0];
-    var form = new _rdflib.BlankNode(); // @@ say for now
+    return _regenerator["default"].wrap(function _callee7$(_context7) {
+      while (1) {
+        switch (_context7.prev = _context7.next) {
+          case 0:
+            dom = context.dom;
 
-    var registrationStatements = function registrationStatements(index) {
-      var registrations = _solidLogic.solidLogicSingleton.getRegistrations(instance, theClass);
+            if (!(!dom || !context.div)) {
+              _context7.next = 3;
+              break;
+            }
 
-      var reg = registrations.length ? registrations[0] : widgets.newThing(index);
-      return [(0, _rdflib.st)(reg, ns.solid('instance'), instance, index), (0, _rdflib.st)(reg, ns.solid('forClass'), theClass, index)];
-    };
+            return _context7.abrupt("return", context);
 
-    var index, statements;
+          case 3:
+            box = dom.createElement('div');
+            context.div.appendChild(box);
+            context.me = _solidLogic.authn.currentUser(); // @@
 
-    if (context.index && context.index["public"] && context.index["public"].length > 0) {
-      index = context.index["public"][0];
-      statements = registrationStatements(index);
-      tbody.children[0].appendChild(widgets.buildCheckBoxForm(context.dom, _solidLogic.solidLogicSingleton.store, "Public link to this ".concat(context.noun), null, statements, form, index));
-    }
+            if (context.me) {
+              _context7.next = 9;
+              break;
+            }
 
-    if (context.index && context.index["private"] && context.index["private"].length > 0) {
-      index = context.index["private"][0];
-      statements = registrationStatements(index);
-      tbody.children[1].appendChild(widgets.buildCheckBoxForm(context.dom, _solidLogic.solidLogicSingleton.store, "Personal note of this ".concat(context.noun), null, statements, form, index));
-    }
+            box.innerHTML = '<p style="margin:2em;">(Log in to save a link to this)</p>';
+            return _context7.abrupt("return", context);
 
-    return context;
-  }, function (e) {
-    var msg;
+          case 9:
+            _context7.prev = 9;
+            _context7.next = 12;
+            return (0, _solidLogic.ensureTypeIndexes)(context);
 
-    if (context.div && context.preferencesFileError) {
-      msg = '(Preferences not available)';
-      context.div.appendChild(dom.createElement('p')).textContent = msg;
-    } else if (context.div) {
-      msg = "registrationControl: Type indexes not available: ".concat(e);
-      context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
-    }
+          case 12:
+            context2 = _context7.sent;
+            _context7.next = 19;
+            break;
 
-    debug.log(msg);
-  })["catch"](function (e) {
-    var msg = "registrationControl: Error making panel: ".concat(e);
+          case 15:
+            _context7.prev = 15;
+            _context7.t0 = _context7["catch"](9);
+
+            if (context.div && context.preferencesFileError) {
+              msg = '(Preferences not available)';
+              context.div.appendChild(dom.createElement('p')).textContent = msg;
+            } else if (context.div) {
+              msg = "registrationControl: Type indexes not available: ".concat(_context7.t0);
+              context.div.appendChild(widgets.errorMessageBlock(context.dom, _context7.t0));
+            }
 
-    if (context.div) {
-      context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
-    }
+            debug.log(msg);
 
-    debug.log(msg);
-  });
-}
-/**
-  * UI to List at all registered things
-  */
+          case 19:
+            box.innerHTML = '<table><tbody><tr></tr><tr></tr></tbody></table>'; // tbody will be inserted anyway
 
+            box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid gray 0.05em;');
+            tbody = box.children[0].children[0];
+            form = new _rdflib.BlankNode(); // @@ say for now
 
-function registrationList(context, options) {
-  var dom = context.dom;
-  var div = context.div;
-  var box = dom.createElement('div');
-  div.appendChild(box);
-  return (0, _solidLogic.ensureTypeIndexes)(context).then(function (_indexes) {
-    box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
-
-    box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid #eee 0.5em;');
-    var table = box.firstChild;
-    var ix = [];
-    var sts = [];
-    var vs = ['private', 'public'];
-    vs.forEach(function (visibility) {
-      if (context.index && options[visibility]) {
-        ix = ix.concat(context.index[visibility][0]);
-        sts = sts.concat(_solidLogic.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
-      }
-    });
+            registrationStatements = function registrationStatements(index) {
+              var registrations = _solidLogic.solidLogicSingleton.getRegistrations(instance, theClass);
 
-    var _loop = function _loop(i) {
-      var statement = sts[i];
+              var reg = registrations.length ? registrations[0] : widgets.newThing(index);
+              return [(0, _rdflib.st)(reg, ns.solid('instance'), instance, index), (0, _rdflib.st)(reg, ns.solid('forClass'), theClass, index)];
+            };
 
-      if (options.type) {
-        // now check  terms:forClass
-        if (!_solidLogic.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
-          return "continue"; // skip irrelevant ones
-        }
-      } // const cla = statement.subject
+            try {
+              if (context2.index && context2.index["public"] && context2.index["public"].length > 0) {
+                index = context2.index["public"][0];
+                statements = registrationStatements(index);
+                tbody.children[0].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Public link to this ".concat(context2.noun), null, statements, form, index));
+              }
 
+              if (context2.index && context2.index["private"] && context2.index["private"].length > 0) {
+                index = context2.index["private"][0];
+                statements = registrationStatements(index);
+                tbody.children[1].appendChild(widgets.buildCheckboxForm(context2.dom, _solidLogic.solidLogicSingleton.store, "Personal note of this ".concat(context2.noun), null, statements, form, index));
+              }
+            } catch (e) {
+              _msg = "registrationControl: Error making panel: ".concat(e);
 
-      var inst = statement.object;
-      table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
-        deleteFunction: function deleteFunction(_x) {
-          if (!_solidLogic.solidLogicSingleton.store.updater) {
-            throw new Error('Cannot delete this, store has no updater');
-          }
+              if (context.div) {
+                context.div.appendChild(widgets.errorMessageBlock(context.dom, e));
+              }
 
-          _solidLogic.solidLogicSingleton.store.updater.update([statement], [], function (uri, ok, errorBody) {
-            if (ok) {
-              debug.log("Removed from index: ".concat(statement.subject));
-            } else {
-              debug.log("Error: Cannot delete ".concat(statement, ": ").concat(errorBody));
+              debug.log(_msg);
             }
-          });
+
+            return _context7.abrupt("return", context2);
+
+          case 26:
+          case "end":
+            return _context7.stop();
         }
-      }));
-    };
+      }
+    }, _callee7, null, [[9, 15]]);
+  }));
+  return _registrationControl.apply(this, arguments);
+}
 
-    for (var i = 0; i < sts.length; i++) {
-      var _ret = _loop(i);
+function registrationList(_x10, _x11) {
+  return _registrationList.apply(this, arguments);
+}
 
-      if (_ret === "continue") continue;
-    } // registrationList
+function _registrationList() {
+  _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(context0, options) {
+    var dom, div, box;
+    return _regenerator["default"].wrap(function _callee8$(_context8) {
+      while (1) {
+        switch (_context8.prev = _context8.next) {
+          case 0:
+            dom = context0.dom;
+            div = context0.div;
+            box = dom.createElement('div');
+            div.appendChild(box);
+            context0.me = _solidLogic.authn.currentUser(); // @@
+
+            if (context0.me) {
+              _context8.next = 8;
+              break;
+            }
 
-    /*
-        //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
-        if (containers.length) {
-        fetcher.load(containers).then(function(xhrs){
-        for (const i=0; i<containers.length; i++) {
-        const cont = containers[i];
-        instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
-        }
-        });
-        }
-        */
+            box.innerHTML = '<p style="margin:2em;">(Log in list your stuff)</p>';
+            return _context8.abrupt("return", context0);
 
+          case 8:
+            return _context8.abrupt("return", (0, _solidLogic.ensureTypeIndexes)(context0).then(function (context) {
+              box.innerHTML = '<table><tbody></tbody></table>'; // tbody will be inserted anyway
+
+              // tbody will be inserted anyway
+              box.setAttribute('style', 'font-size: 120%; text-align: right; padding: 1em; border: solid #eee 0.5em;');
+              var table = box.firstChild;
+              var ix = [];
+              var sts = [];
+              var vs = ['private', 'public'];
+              vs.forEach(function (visibility) {
+                if (context.index && context.index[visibility].length > 0 && options[visibility]) {
+                  ix = ix.concat(context.index[visibility][0]);
+                  sts = sts.concat(_solidLogic.solidLogicSingleton.store.statementsMatching(undefined, ns.solid('instance'), undefined, context.index[visibility][0]));
+                }
+              });
 
-    return context;
-  });
+              var _loop = function _loop(i) {
+                var statement = sts[i];
+
+                if (options.type) {
+                  // now check  terms:forClass
+                  if (!_solidLogic.solidLogicSingleton.store.holds(statement.subject, ns.solid('forClass'), options.type, statement.why)) {
+                    return "continue"; // skip irrelevant ones
+                  }
+                } // const cla = statement.subject
+
+
+                // const cla = statement.subject
+                var inst = statement.object;
+                table.appendChild(widgets.personTR(dom, ns.solid('instance'), inst, {
+                  deleteFunction: function deleteFunction(_x) {
+                    if (!_solidLogic.solidLogicSingleton.store.updater) {
+                      throw new Error('Cannot delete this, store has no updater');
+                    }
+
+                    _solidLogic.solidLogicSingleton.store.updater.update([statement], [], function (uri, ok, errorBody) {
+                      if (ok) {
+                        debug.log("Removed from index: ".concat(statement.subject));
+                      } else {
+                        debug.log("Error: Cannot delete ".concat(statement, ": ").concat(errorBody));
+                      }
+                    });
+                  }
+                }));
+              };
+
+              for (var i = 0; i < sts.length; i++) {
+                var _ret = _loop(i);
+
+                if (_ret === "continue") continue;
+              } // registrationList
+
+              /*
+                  //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
+                  if (containers.length) {
+                  fetcher.load(containers).then(function(xhrs){
+                  for (const i=0; i<containers.length; i++) {
+                  const cont = containers[i];
+                  instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
+                  }
+                  });
+                  }
+                  */
+
+
+              // registrationList
+
+              /*
+                  //const containers = solidLogicSingleton.store.each(theClass, ns.solid('instanceContainer'));
+                  if (containers.length) {
+                  fetcher.load(containers).then(function(xhrs){
+                  for (const i=0; i<containers.length; i++) {
+                  const cont = containers[i];
+                  instances = instances.concat(solidLogicSingleton.store.each(cont, ns.ldp('contains')));
+                  }
+                  });
+                  }
+                  */
+              return context;
+            }));
+
+          case 9:
+          case "end":
+            return _context8.stop();
+        }
+      }
+    }, _callee8);
+  }));
+  return _registrationList.apply(this, arguments);
 }
 
 function getDefaultSignInButtonStyle() {
@@ -8628,7 +8717,7 @@ function renderSignInPopup(dom) {
       }, _callee, null, [[0, 8]]);
     }));
 
-    return function loginToIssuer(_x7) {
+    return function loginToIssuer(_x12) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -8915,7 +9004,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
 
   function displayOptions(context) {
     // console.log('displayOptions!', context)
-    function makeNewWorkspace(_x8) {
+    function makeNewWorkspace(_x13) {
       return _makeNewWorkspace.apply(this, arguments);
     } // const status = ''
 
@@ -9184,77 +9273,77 @@ function getUserRoles() {
 
 
 function _getUserRoles() {
-  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7() {
+  _getUserRoles = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9() {
     var _yield$ensureLoadedPr, me, preferencesFile, preferencesFileError;
 
-    return _regenerator["default"].wrap(function _callee7$(_context7) {
+    return _regenerator["default"].wrap(function _callee9$(_context9) {
       while (1) {
-        switch (_context7.prev = _context7.next) {
+        switch (_context9.prev = _context9.next) {
           case 0:
-            _context7.prev = 0;
-            _context7.next = 3;
+            _context9.prev = 0;
+            _context9.next = 3;
             return ensureLoadedPreferences({});
 
           case 3:
-            _yield$ensureLoadedPr = _context7.sent;
+            _yield$ensureLoadedPr = _context9.sent;
             me = _yield$ensureLoadedPr.me;
             preferencesFile = _yield$ensureLoadedPr.preferencesFile;
             preferencesFileError = _yield$ensureLoadedPr.preferencesFileError;
 
             if (!(!preferencesFile || preferencesFileError)) {
-              _context7.next = 9;
+              _context9.next = 9;
               break;
             }
 
             throw new Error(preferencesFileError);
 
           case 9:
-            return _context7.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
+            return _context9.abrupt("return", _solidLogic.solidLogicSingleton.store.each(me, ns.rdf('type'), null, preferencesFile.doc()));
 
           case 12:
-            _context7.prev = 12;
-            _context7.t0 = _context7["catch"](0);
-            debug.warn('Unable to fetch your preferences - this was the error: ', _context7.t0);
+            _context9.prev = 12;
+            _context9.t0 = _context9["catch"](0);
+            debug.warn('Unable to fetch your preferences - this was the error: ', _context9.t0);
 
           case 15:
-            return _context7.abrupt("return", []);
+            return _context9.abrupt("return", []);
 
           case 16:
           case "end":
-            return _context7.stop();
+            return _context9.stop();
         }
       }
-    }, _callee7, null, [[0, 12]]);
+    }, _callee9, null, [[0, 12]]);
   }));
   return _getUserRoles.apply(this, arguments);
 }
 
-function filterAvailablePanes(_x9) {
+function filterAvailablePanes(_x14) {
   return _filterAvailablePanes.apply(this, arguments);
 }
 
 function _filterAvailablePanes() {
-  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(panes) {
+  _filterAvailablePanes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee10(panes) {
     var userRoles;
-    return _regenerator["default"].wrap(function _callee8$(_context8) {
+    return _regenerator["default"].wrap(function _callee10$(_context10) {
       while (1) {
-        switch (_context8.prev = _context8.next) {
+        switch (_context10.prev = _context10.next) {
           case 0:
-            _context8.next = 2;
+            _context10.next = 2;
             return getUserRoles();
 
           case 2:
-            userRoles = _context8.sent;
-            return _context8.abrupt("return", panes.filter(function (pane) {
+            userRoles = _context10.sent;
+            return _context10.abrupt("return", panes.filter(function (pane) {
               return isMatchingAudience(pane, userRoles);
             }));
 
           case 4:
           case "end":
-            return _context8.stop();
+            return _context10.stop();
         }
       }
-    }, _callee8);
+    }, _callee10);
   }));
   return _filterAvailablePanes.apply(this, arguments);
 }
@@ -11991,10 +12080,10 @@ var style = {
   checkboxStyle: 'colour: black; font-size: 100%; padding-left: 0.5 em; padding-right: 0.5 em;',
   checkboxInputStyle: 'font-size: 150%; height: 1.2em; width: 1.2em; background-color: #eef; border-radius:0.2em; margin: 0.1em',
   fieldLabelStyle: 'color: #3B5998; text-decoration: none;',
-  formSelectSTyle: 'background-color: #eef; padding: 0.5em;  border: .05em solid #88c;  border-radius:0.2em; font-size: 100%; margin:0.2em;',
-  textInputStyle: 'background-color: #eef; padding: 0.5em;  border: .05em solid #88c;  border-radius:0.2em; font-size: 100%; margin:0.2em;',
+  formSelectSTyle: 'background-color: #eef; padding: 0.5em;  border: .05em solid #88c;  border-radius:0.2em; font-size: 100%; margin:0.4em;',
+  textInputStyle: 'background-color: #eef; padding: 0.5em;  border: .05em solid #88c;  border-radius:0.2em; font-size: 100%; margin:0.4em;',
   textInputStyleUneditable: // Color difference only
-  'background-color: white; padding: 0.5em;  border: .05em solid white;  border-radius:0.2em; font-size: 100%; margin:0.2em;',
+  'background-color: white; padding: 0.5em;  border: .05em solid white;  border-radius:0.2em; font-size: 100%; margin:0.4em;',
   textInputSize: 20,
   // Default text input size in characters roughly
   buttonStyle: 'background-color: #fff; padding: 0.7em;  border: .01em solid white;  border-radius:0.2em; font-size: 100%; margin: 0.3em;',
@@ -13960,13 +14049,21 @@ function tabWidget(options) {
   orderedSync();
 
   if (!options.startEmpty && tabContainer.children.length && options.selectedTab) {
-    var selectedTab = Array.from(tabContainer.children).map(function (tab) {
+    var selectedTab0 = Array.from(tabContainer.children) // Version left for compatability with ??
+    .map(function (tab) {
       return tab.firstChild;
     }).find(function (tab) {
       return tab.dataset.name === options.selectedTab;
     });
-    var tab = selectedTab || tabContainer.children[0].firstChild;
-    tab.click();
+    var selectedTabURI = options.selectedTab.uri;
+    var selectedTab1 = Array.from(tabContainer.children) // @ts-ignore
+    .find(function (tab) {
+      return tab.subject && tab.subject.uri && tab.subject.uri === selectedTabURI;
+    });
+    var tab = selectedTab1 || selectedTab0 || tabContainer.children[0];
+    var clickMe = tab.firstChild; // @ts-ignore
+
+    if (clickMe) clickMe.click();
   } else if (!options.startEmpty) {
     tabContainer.children[0].firstChild.click(); // Open first tab
   }
@@ -14253,7 +14350,6 @@ function getPod() {
   return (0, _rdflib.sym)(document.location.origin).site();
 }
 /**
- * @ignore exporting this only for the unit test
  */
 
 
@@ -14267,63 +14363,94 @@ function getPodOwner(_x, _x2) {
 
 function _getPodOwner() {
   _getPodOwner = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(pod, store) {
-    var podOwner, storageIsListedInPodOwnersProfile;
+    var podOwner, guess;
     return _regenerator["default"].wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            // @@ TODO: This is given the structure that NSS provides - might need to change for other Pod servers
-            podOwner = (0, _rdflib.sym)("".concat(pod.uri, "profile/card#me"));
-            _context.prev = 1;
+            _context.prev = 0;
+            // @ts-ignore  LiveStore always has fetcher
+            store.fetcher.load(pod);
+            _context.next = 8;
+            break;
 
-            if (!store.fetcher) {
-              _context.next = 7;
+          case 4:
+            _context.prev = 4;
+            _context.t0 = _context["catch"](0);
+            console.error('Error loading pod ' + pod + ': ' + _context.t0);
+            return _context.abrupt("return", null);
+
+          case 8:
+            if (store.holds(pod, _.ns.rdf('type'), _.ns.space('Storage'), pod)) {
+              _context.next = 11;
               break;
             }
 
-            _context.next = 5;
-            return store.fetcher.load(podOwner.doc());
+            console.warn('Pod  ' + pod + ' does not declare itself as a space:Storage');
+            return _context.abrupt("return", null);
 
-          case 5:
-            _context.next = 8;
-            break;
+          case 11:
+            podOwner = store.any(pod, _.ns.solid('owner'), null, pod) || store.any(null, _.ns.space('storage'), pod, pod);
 
-          case 7:
-            throw new Error('There was a problem loading the Fetcher');
+            if (!podOwner) {
+              _context.next = 25;
+              break;
+            }
 
-          case 8:
-            _context.next = 13;
+            _context.prev = 13;
+            // @ts-ignore  LiveStore always has fetcher
+            store.fetcher.load(podOwner.doc());
+            _context.next = 21;
             break;
 
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](1);
-            throw new Error('Did NOT find pod owners profile at ' + podOwner);
+          case 17:
+            _context.prev = 17;
+            _context.t1 = _context["catch"](13);
+            console.warn('Unable to load profile of pod owner ' + podOwner);
+            return _context.abrupt("return", null);
 
-          case 13:
-            if (!podOwner) {
-              _context.next = 17;
-              break;
+          case 21:
+            if (!store.holds(podOwner, _.ns.space('storage'), pod, podOwner.doc())) {
+              console.warn("Pod owner ".concat(podOwner, " does NOT list pod ").concat(pod, " as their storage"));
             }
 
-            storageIsListedInPodOwnersProfile = store.holds(podOwner, _.ns.space('storage'), pod, podOwner.doc());
+            return _context.abrupt("return", podOwner);
+
+          case 25:
+            // pod owner not declared in pod
+            // @@ TODO: This is given the structure that NSS provides
+            // This is a massive guess.  For old pods which don't have owner link
+            guess = (0, _rdflib.sym)("".concat(pod.uri, "profile/card#me"));
+            _context.prev = 26;
+            // @ts-ignore  LiveStore always has fetcher
+            store.fetcher.load(guess);
+            _context.next = 34;
+            break;
+
+          case 30:
+            _context.prev = 30;
+            _context.t2 = _context["catch"](26);
+            console.error('Ooops. Guessed wrong pod owner webid {$guess} : can\'t load it.');
+            return _context.abrupt("return", null);
 
-            if (storageIsListedInPodOwnersProfile) {
-              _context.next = 17;
+          case 34:
+            if (!store.holds(guess, _.ns.space('storage'), pod, guess.doc())) {
+              _context.next = 37;
               break;
             }
 
-            throw new Error("** Pod owner ".concat(podOwner, " does NOT list pod ").concat(pod, " as storage"));
+            console.warn('Using guessed pod owner webid but it links back.');
+            return _context.abrupt("return", guess);
 
-          case 17:
-            return _context.abrupt("return", podOwner);
+          case 37:
+            return _context.abrupt("return", null);
 
-          case 18:
+          case 38:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[1, 10]]);
+    }, _callee, null, [[0, 4], [13, 17], [26, 30]]);
   }));
   return _getPodOwner.apply(this, arguments);
 }
@@ -15172,8 +15299,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _default = {
-  buildTime: '2022-03-05T20:27:00Z',
-  commit: '6a4efc3e6e6ef7d5451a28169c22154cde525208',
+  buildTime: '2022-03-24T17:40:39Z',
+  commit: '72f773b92ca5a213d24eef43417800de397f5b52',
   npmInfo: {
     'solid-ui': '2.4.19',
     npm: '6.14.16',
@@ -17096,6 +17223,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.appendForm = appendForm;
+Object.defineProperty(exports, "basicField", {
+  enumerable: true,
+  get: function get() {
+    return _basic.basicField;
+  }
+});
 exports.buildCheckboxForm = buildCheckboxForm;
 exports.editFormButton = editFormButton;
 Object.defineProperty(exports, "field", {
@@ -17104,14 +17237,24 @@ Object.defineProperty(exports, "field", {
     return _fieldFunction.field;
   }
 });
-exports.fieldLabel = fieldLabel;
+Object.defineProperty(exports, "fieldLabel", {
+  enumerable: true,
+  get: function get() {
+    return _basic.fieldLabel;
+  }
+});
 Object.defineProperty(exports, "fieldParams", {
   enumerable: true,
   get: function get() {
     return _fieldParams.fieldParams;
   }
 });
-exports.fieldStore = fieldStore;
+Object.defineProperty(exports, "fieldStore", {
+  enumerable: true,
+  get: function get() {
+    return _basic.fieldStore;
+  }
+});
 exports.findClosest = findClosest;
 exports.formsFor = formsFor;
 exports.makeDescription = makeDescription;
@@ -17122,6 +17265,12 @@ exports.newButton = newButton;
 exports.newThing = newThing;
 exports.promptForNew = promptForNew;
 exports.propertiesForClass = propertiesForClass;
+Object.defineProperty(exports, "renderNameValuePair", {
+  enumerable: true,
+  get: function get() {
+    return _basic.renderNameValuePair;
+  }
+});
 exports.sortByLabel = sortByLabel;
 exports.sortBySequence = sortBySequence;
 
@@ -17994,8 +18143,8 @@ _fieldFunction.field[ns.ui('MultiLineTextField').uri] = function (dom, container
   var left = box.appendChild(dom.createElement('div'));
   left.style.width = style.formFieldNameBoxWidth;
   var right = box.appendChild(dom.createElement('div'));
-  left.appendChild(fieldLabel(dom, property, form));
-  dataDoc = fieldStore(subject, property, dataDoc);
+  left.appendChild((0, _basic.fieldLabel)(dom, property, form));
+  dataDoc = (0, _basic.fieldStore)(subject, property, dataDoc);
   var text = kb.anyJS(subject, property, null, dataDoc) || '';
   var editable = kb.updater.editable(dataDoc.uri);
   var suppressEmptyUneditable = form && kb.anyJS(form, ns.ui('suppressEmptyUneditable'), null, formDoc);
@@ -18029,7 +18178,7 @@ function booleanField(dom, container, already, subject, form, dataDoc, callbackF
   var lab = kb.any(form, ui('label'));
   if (!lab) lab = utils.label(property, true); // Init capital
 
-  dataDoc = fieldStore(subject, property, dataDoc);
+  dataDoc = (0, _basic.fieldStore)(subject, property, dataDoc);
   var state = kb.any(subject, property);
 
   if (state === undefined) {
@@ -18112,7 +18261,7 @@ _fieldFunction.field[ns.ui('Choice').uri] = function (dom, container, already, s
     return box.appendChild((0, _error.errorMessageBlock)(dom, 'No property for Choice: ' + form));
   }
 
-  lhs.appendChild(fieldLabel(dom, property, form));
+  lhs.appendChild((0, _basic.fieldLabel)(dom, property, form));
   var from = kb.any(form, ui('from'));
 
   if (!from) {
@@ -18829,7 +18978,7 @@ function makeSelectForNestedCategory(dom, kb, subject, category, dataDoc, callba
 
 function buildCheckboxForm(dom, kb, lab, del, ins, form, dataDoc, tristate) {
   var box = dom.createElement('div');
-  var rhs = (0, _basic.renderNameValuePair)(dom, kb, box, form);
+  var rhs = (0, _basic.renderNameValuePair)(dom, kb, box, form, lab);
   var editable = kb.updater.editable(dataDoc.uri);
   var input = dom.createElement('button');
   var colorCarrier = input;
@@ -18928,33 +19077,34 @@ function buildCheckboxForm(dom, kb, lab, del, ins, form, dataDoc, tristate) {
   input.addEventListener('click', boxHandler, false);
   return box;
 }
-
-function fieldLabel(dom, property, form) {
-  var lab = kb.any(form, ns.ui('label'));
-  if (!lab) lab = utils.label(property, true); // Init capital
-
+/*
+export function fieldLabel (dom, property, form) {
+  let lab = kb.any(form, ns.ui('label'))
+  if (!lab) lab = utils.label(property, true) // Init capital
   if (property === undefined) {
-    return dom.createTextNode('@@Internal error: undefined property');
+    return dom.createTextNode('@@Internal error: undefined property')
   }
-
-  var anchor = dom.createElement('a');
-  if (property.uri) anchor.setAttribute('href', property.uri);
-  anchor.setAttribute('style', style.fieldLabelStyle); // Not too blue and no underline
-
-  anchor.textContent = lab;
-  return anchor;
+  const anchor = dom.createElement('a')
+  if (property.uri) anchor.setAttribute('href', property.uri)
+  anchor.setAttribute('style', style.fieldLabelStyle) // Not too blue and no underline
+  anchor.textContent = lab
+  return anchor
 }
 
-function fieldStore(subject, predicate, def) {
-  var sts = kb.statementsMatching(subject, predicate);
-  if (sts.length === 0) return def; // can used default as no data yet
-
-  if (sts.length > 0 && sts[0].why.uri && kb.updater.editable(sts[0].why.uri)) {
-    return kb.sym(sts[0].why.uri);
+export function fieldStore (subject, predicate, def) {
+  const sts = kb.statementsMatching(subject, predicate)
+  if (sts.length === 0) return def // can used default as no data yet
+  if (
+    sts.length > 0 &&
+    sts[0].why.uri &&
+    kb.updater.editable(sts[0].why.uri)
+  ) {
+    return kb.sym(sts[0].why.uri)
   }
-
-  return def;
+  return def
 }
+*/
+
 /** Mint local ID using timestamp
  * @param {NamedNode} doc - the document in which the ID is to be generated
  */
@@ -21290,8 +21440,8 @@ var store = _solidLogic.solidLogicSingleton.store;
 /*  Style and create a name, value pair
 */
 
-function renderNameValuePair(dom, kb, box, form) {
-  var property = kb.any(form, ns.ui('property'));
+function renderNameValuePair(dom, kb, box, form, label) {
+  // const property = kb.any(form, ns.ui('property'))
   box.style.display = 'flex';
   box.style.flexDirection = 'row';
   var lhs = box.appendChild(dom.createElement('div'));
@@ -21301,12 +21451,14 @@ function renderNameValuePair(dom, kb, box, form) {
   lhs.setAttribute('style', _style.formFieldNameBoxStyle);
   rhs.setAttribute('class', 'formFieldValue');
 
-  if (!property) {
+  if (label) {
+    lhs.appendChild(dom.createTextNode(label));
+  } else if (kb.any(form, ns.ui('property'))) {
     // Assume more space for error on right
-    rhs.appendChild((0, _error.errorMessageBlock)(dom, 'No property given for form field: ' + form));
-    lhs.appendChild(dom.createTextNode('???'));
+    lhs.appendChild(fieldLabel(dom, kb.any(form, ns.ui('property')), form));
   } else {
-    lhs.appendChild(fieldLabel(dom, property, form));
+    rhs.appendChild((0, _error.errorMessageBlock)(dom, 'No property or label given for form field: ' + form));
+    lhs.appendChild(dom.createTextNode('???'));
   }
 
   return rhs;
@@ -23798,7 +23950,6 @@ e.read=function(t,e,r,n,i){var o,s,a=8*i-n-1,u=(1<<a)-1,c=u>>1,h=-7,l=r?i-1:0,f=
 
 Object.defineProperty(exports, "__esModule", { value: true });
 const oidc_client_ext_1 = __webpack_require__(/*! @inrupt/oidc-client-ext */ "./node_modules/@inrupt/oidc-client-ext/dist/index.es.js");
-const constant_1 = __webpack_require__(/*! ./constant */ "./node_modules/@inrupt/solid-client-authn-browser/dist/constant.js");
 const globalFetch = (request, init) => window.fetch(request, init);
 class ClientAuthentication {
     constructor(loginHandler, redirectHandler, logoutHandler, sessionInfoManager, issuerConfigFetcher) {
@@ -23829,11 +23980,7 @@ class ClientAuthentication {
         this.getAllSessionInfo = async () => {
             return this.sessionInfoManager.getAll();
         };
-        this.validateCurrentSession = async () => {
-            const currentSessionId = window.localStorage.getItem(constant_1.KEY_CURRENT_SESSION);
-            if (currentSessionId === null) {
-                return null;
-            }
+        this.validateCurrentSession = async (currentSessionId) => {
             const sessionInfo = await this.sessionInfoManager.get(currentSessionId);
             if (sessionInfo === undefined ||
                 sessionInfo.clientAppId === undefined ||
@@ -23888,7 +24035,7 @@ async function silentlyAuthenticate(sessionId, clientAuthn, options = {
     inIframe: false,
 }, session) {
     var _a;
-    const storedSessionInfo = await clientAuthn.validateCurrentSession();
+    const storedSessionInfo = await clientAuthn.validateCurrentSession(sessionId);
     if (storedSessionInfo !== null) {
         window.localStorage.setItem(constant_1.KEY_CURRENT_URL, window.location.href);
         await clientAuthn.login({
@@ -23933,12 +24080,16 @@ class Session extends events_1.EventEmitter {
                         init === null || init === void 0 ? void 0 : init.credentials,
             });
         };
-        this.logout = async () => {
+        this.internalLogout = async (emitSignal) => {
+            window.localStorage.removeItem(constant_1.KEY_CURRENT_SESSION);
             await this.clientAuthentication.logout(this.info.sessionId);
             this.info.isLoggedIn = false;
             this.tmpFetchWithCookies = false;
-            this.emit("logout");
+            if (emitSignal) {
+                this.emit(solid_client_authn_core_1.EVENTS.LOGOUT);
+            }
         };
+        this.logout = async () => this.internalLogout(true);
         this.handleIncomingRedirect = async (inputOptions = {}) => {
             var _a;
             if (this.info.isLoggedIn) {
@@ -23994,11 +24145,11 @@ class Session extends events_1.EventEmitter {
                 this.setSessionInfo(sessionInfo);
                 const currentUrl = window.localStorage.getItem(constant_1.KEY_CURRENT_URL);
                 if (currentUrl === null) {
-                    this.emit("login");
+                    this.emit(solid_client_authn_core_1.EVENTS.LOGIN);
                 }
                 else {
                     window.localStorage.removeItem(constant_1.KEY_CURRENT_URL);
-                    this.emit("sessionRestore", currentUrl);
+                    this.emit(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, currentUrl);
                 }
             }
             else if (options.restorePreviousSession === true) {
@@ -24048,18 +24199,21 @@ class Session extends events_1.EventEmitter {
         this.on("tokenRenewal", () => silentlyAuthenticate(this.info.sessionId, this.clientAuthentication, {
             inIframe: true,
         }, this));
+        this.on(solid_client_authn_core_1.EVENTS.LOGIN, () => window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, this.info.sessionId));
+        this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, () => this.internalLogout(false));
+        this.on(solid_client_authn_core_1.EVENTS.ERROR, () => this.internalLogout(false));
     }
     onLogin(callback) {
-        this.on("login", callback);
+        this.on(solid_client_authn_core_1.EVENTS.LOGIN, callback);
     }
     onLogout(callback) {
-        this.on("logout", callback);
+        this.on(solid_client_authn_core_1.EVENTS.LOGOUT, callback);
     }
     onError(callback) {
         this.on(solid_client_authn_core_1.EVENTS.ERROR, callback);
     }
     onSessionRestore(callback) {
-        this.on("sessionRestore", callback);
+        this.on(solid_client_authn_core_1.EVENTS.SESSION_RESTORED, callback);
     }
     onSessionExpiration(callback) {
         this.on(solid_client_authn_core_1.EVENTS.SESSION_EXPIRED, callback);
@@ -24273,7 +24427,11 @@ exports.postRedirectUrlToParent = postRedirectUrlToParent;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -24462,6 +24620,9 @@ function processConfig(config) {
             parsedConfig[issuerConfigKeyMap[key].toKey] = config[key];
         }
     });
+    if (!Array.isArray(parsedConfig.scopesSupported)) {
+        parsedConfig.scopesSupported = ["openid"];
+    }
     return parsedConfig;
 }
 class IssuerConfigFetcher {
@@ -24674,7 +24835,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthCodeRedirectHandler = exports.DEFAULT_LIFESPAN = void 0;
 const solid_client_authn_core_1 = __webpack_require__(/*! @inrupt/solid-client-authn-core */ "./node_modules/@inrupt/solid-client-authn-core/dist/index.js");
 const oidc_client_ext_1 = __webpack_require__(/*! @inrupt/oidc-client-ext */ "./node_modules/@inrupt/oidc-client-ext/dist/index.es.js");
-const constant_1 = __webpack_require__(/*! ../../../constant */ "./node_modules/@inrupt/solid-client-authn-browser/dist/constant.js");
 exports.DEFAULT_LIFESPAN = 30 * 60 * 1000;
 async function setupResourceServerSession(webId, authenticatedFetch, storageUtility) {
     const webIdAsUrl = new URL(webId);
@@ -24719,23 +24879,24 @@ class AuthCodeRedirectHandler {
         const storedSessionId = (await this.storageUtility.getForUser(oauthState, "sessionId", {
             errorIfNull: true,
         }));
-        const isDpop = (await this.storageUtility.getForUser(storedSessionId, "dpop")) ===
-            "true";
-        const issuer = (await this.storageUtility.getForUser(storedSessionId, "issuer", { errorIfNull: true }));
-        window.localStorage.setItem(constant_1.KEY_CURRENT_SESSION, storedSessionId);
-        const issuerConfig = await this.issuerConfigFetcher.fetchConfig(issuer);
+        const { issuerConfig, codeVerifier, redirectUrl: storedRedirectIri, dpop: isDpop, } = await (0, solid_client_authn_core_1.loadOidcContextFromStorage)(storedSessionId, this.storageUtility, this.issuerConfigFetcher);
+        if (codeVerifier === undefined) {
+            throw new Error(`The code verifier for session ${storedSessionId} is missing from storage.`);
+        }
+        if (storedRedirectIri === undefined) {
+            throw new Error(`The redirect URL for session ${storedSessionId} is missing from storage.`);
+        }
         const client = await this.clientRegistrar.getClient({ sessionId: storedSessionId }, issuerConfig);
         let tokens;
-        const referenceTime = Date.now();
+        const tokenCreatedAt = Date.now();
         if (isDpop) {
-            const codeVerifier = (await this.storageUtility.getForUser(storedSessionId, "codeVerifier", { errorIfNull: true }));
-            const storedRedirectIri = (await this.storageUtility.getForUser(storedSessionId, "redirectUrl", { errorIfNull: true }));
             tokens = await (0, oidc_client_ext_1.getDpopToken)(issuerConfig, client, {
                 grantType: "authorization_code",
                 code: url.searchParams.get("code"),
                 codeVerifier,
                 redirectUrl: storedRedirectIri,
             });
+            window.localStorage.removeItem(`oidc.${oauthState}`);
         }
         else {
             tokens = await (0, oidc_client_ext_1.getBearerToken)(url.toString());
@@ -24776,7 +24937,7 @@ class AuthCodeRedirectHandler {
         return Object.assign(sessionInfo, {
             fetch: authFetch,
             expirationDate: typeof tokens.expiresIn === "number"
-                ? referenceTime + tokens.expiresIn * 1000
+                ? tokenCreatedAt + tokens.expiresIn * 1000
                 : null,
         });
     }
@@ -25291,10 +25452,13 @@ exports.REFRESH_BEFORE_EXPIRATION_SECONDS = exports.EVENTS = exports.PREFERRED_S
 exports.SOLID_CLIENT_AUTHN_KEY_PREFIX = "solidClientAuthn:";
 exports.PREFERRED_SIGNING_ALG = ["ES256", "RS256"];
 exports.EVENTS = {
+    ERROR: "error",
+    LOGIN: "login",
+    LOGOUT: "logout",
     NEW_REFRESH_TOKEN: "newRefreshToken",
-    ERROR: "onError",
     SESSION_EXPIRED: "sessionExpired",
     SESSION_EXTENDED: "sessionExtended",
+    SESSION_RESTORED: "sessionRestore",
     TIMEOUT_SET: "timeoutSet",
 };
 exports.REFRESH_BEFORE_EXPIRATION_SECONDS = 5;
@@ -25485,7 +25649,11 @@ exports.OidcProviderError = OidcProviderError;
 
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -25766,6 +25934,7 @@ async function loadOidcContextFromStorage(sessionId, storageUtility, configFetch
             storageUtility.getForUser(sessionId, "redirectUrl"),
             storageUtility.getForUser(sessionId, "dpop", { errorIfNull: true }),
         ]);
+        await storageUtility.deleteForUser(sessionId, "codeVerifier");
         const issuerConfig = await configFetcher.fetchConfig(issuerIri);
         return {
             codeVerifier,
@@ -39251,7 +39420,7 @@ async function compactDecrypt(jwe, key, options) {
         throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_1__["JWEInvalid"]('Invalid Compact JWE');
     }
     const decrypted = await Object(_flattened_decrypt_js__WEBPACK_IMPORTED_MODULE_0__["flattenedDecrypt"])({
-        ciphertext: (ciphertext || undefined),
+        ciphertext,
         iv: (iv || undefined),
         protected: protectedHeader || undefined,
         tag: (tag || undefined),
@@ -39869,6 +40038,12 @@ class GeneralEncrypt {
             const recipient = this._recipients[i];
             const target = {};
             jwe.recipients.push(target);
+            const joseHeader = {
+                ...this._protectedHeader,
+                ...this._unprotectedHeader,
+                ...recipient.unprotectedHeader,
+            };
+            const p2c = joseHeader.alg.startsWith('PBES2') ? 2048 + i : undefined;
             if (i === 0) {
                 const flattened = await new _flattened_encrypt_js__WEBPACK_IMPORTED_MODULE_0__["FlattenedEncrypt"](this._plaintext)
                     .setAdditionalAuthenticatedData(this._aad)
@@ -39876,6 +40051,7 @@ class GeneralEncrypt {
                     .setProtectedHeader(this._protectedHeader)
                     .setSharedUnprotectedHeader(this._unprotectedHeader)
                     .setUnprotectedHeader(recipient.unprotectedHeader)
+                    .setKeyManagementParameters({ p2c })
                     .encrypt(recipient.key, {
                     ...recipient.options,
                     ...options,
@@ -39897,7 +40073,7 @@ class GeneralEncrypt {
             }
             const { encryptedKey, parameters } = await Object(_lib_encrypt_key_management_js__WEBPACK_IMPORTED_MODULE_4__["default"])(((_a = recipient.unprotectedHeader) === null || _a === void 0 ? void 0 : _a.alg) ||
                 ((_b = this._protectedHeader) === null || _b === void 0 ? void 0 : _b.alg) ||
-                ((_c = this._unprotectedHeader) === null || _c === void 0 ? void 0 : _c.alg), enc, recipient.key, cek);
+                ((_c = this._unprotectedHeader) === null || _c === void 0 ? void 0 : _c.alg), enc, recipient.key, cek, { p2c });
             target.encrypted_key = Object(_runtime_base64url_js__WEBPACK_IMPORTED_MODULE_5__["encode"])(encryptedKey);
             if (recipient.unprotectedHeader || parameters)
                 target.header = { ...recipient.unprotectedHeader, ...parameters };
@@ -41559,7 +41735,7 @@ function checkEncCryptoKey(key, alg, ...usages) {
                 throw unusable(expected, 'algorithm.length');
             break;
         }
-        case 'ECDH-ES':
+        case 'ECDH':
             if (!isAlgorithm(key.algorithm, 'ECDH'))
                 throw unusable('ECDH');
             break;
@@ -41638,7 +41814,7 @@ async function decryptKeyManagement(alg, key, encryptedKey, joseHeader) {
             if (!Object(_is_object_js__WEBPACK_IMPORTED_MODULE_9__["default"])(joseHeader.epk))
                 throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__["JWEInvalid"](`JOSE Header "epk" (Ephemeral Public Key) missing or invalid`);
             if (!_runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["ecdhAllowed"](key))
-                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__["JOSENotSupported"]('ECDH-ES with the provided key is not allowed or not supported by your javascript runtime');
+                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_5__["JOSENotSupported"]('ECDH with the provided key is not allowed or not supported by your javascript runtime');
             const epk = await Object(_key_import_js__WEBPACK_IMPORTED_MODULE_7__["importJWK"])(joseHeader.epk, alg);
             let partyUInfo;
             let partyVInfo;
@@ -41753,7 +41929,7 @@ async function encryptKeyManagement(alg, enc, key, providedCek, providedParamete
         case 'ECDH-ES+A192KW':
         case 'ECDH-ES+A256KW': {
             if (!_runtime_ecdhes_js__WEBPACK_IMPORTED_MODULE_1__["ecdhAllowed"](key)) {
-                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_6__["JOSENotSupported"]('ECDH-ES with the provided key is not allowed or not supported by your javascript runtime');
+                throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_6__["JOSENotSupported"]('ECDH with the provided key is not allowed or not supported by your javascript runtime');
             }
             const { apu, apv } = providedParameters;
             let { epk: ephemeralKey } = providedParameters;
@@ -42694,15 +42870,12 @@ async function deriveKey(publicKey, privateKey, algorithm, keyLength, apu = new
     if (!Object(_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["isCryptoKey"])(publicKey)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_3__["default"])(publicKey, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_4__["types"]));
     }
-    Object(_lib_crypto_key_js__WEBPACK_IMPORTED_MODULE_2__["checkEncCryptoKey"])(publicKey, 'ECDH-ES');
+    Object(_lib_crypto_key_js__WEBPACK_IMPORTED_MODULE_2__["checkEncCryptoKey"])(publicKey, 'ECDH');
     if (!Object(_webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["isCryptoKey"])(privateKey)) {
         throw new TypeError(Object(_lib_invalid_key_input_js__WEBPACK_IMPORTED_MODULE_3__["default"])(privateKey, ..._is_key_like_js__WEBPACK_IMPORTED_MODULE_4__["types"]));
     }
-    Object(_lib_crypto_key_js__WEBPACK_IMPORTED_MODULE_2__["checkEncCryptoKey"])(privateKey, 'ECDH-ES', 'deriveBits', 'deriveKey');
+    Object(_lib_crypto_key_js__WEBPACK_IMPORTED_MODULE_2__["checkEncCryptoKey"])(privateKey, 'ECDH', 'deriveBits');
     const value = Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["concat"])(Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["lengthAndInput"])(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["encoder"].encode(algorithm)), Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["lengthAndInput"])(apu), Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["lengthAndInput"])(apv), Object(_lib_buffer_utils_js__WEBPACK_IMPORTED_MODULE_0__["uint32be"])(keyLength));
-    if (!privateKey.usages.includes('deriveBits')) {
-        throw new TypeError('ECDH-ES private key "usages" must include "deriveBits"');
-    }
     const sharedSecret = new Uint8Array(await _webcrypto_js__WEBPACK_IMPORTED_MODULE_1__["default"].subtle.deriveBits({
         name: 'ECDH',
         public: publicKey,
@@ -42851,8 +43024,6 @@ function isNodeJs() {
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _util_errors_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../util/errors.js */ "./node_modules/jose/dist/browser/util/errors.js");
-/* harmony import */ var _env_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./env.js */ "./node_modules/jose/dist/browser/runtime/env.js");
-
 
 const fetchJwks = async (url, timeout) => {
     let controller;
@@ -42868,14 +43039,6 @@ const fetchJwks = async (url, timeout) => {
     const response = await fetch(url.href, {
         signal: controller ? controller.signal : undefined,
         redirect: 'manual',
-        method: 'GET',
-        ...(!Object(_env_js__WEBPACK_IMPORTED_MODULE_1__["isCloudflareWorkers"])()
-            ? {
-                referrerPolicy: 'no-referrer',
-                credentials: 'omit',
-                mode: 'cors',
-            }
-            : undefined),
     }).catch((err) => {
         if (timedOut)
             throw new _util_errors_js__WEBPACK_IMPORTED_MODULE_0__["JWKSTimeout"]();
@@ -43358,7 +43521,7 @@ async function deriveKey(p2s, alg, p2c, key) {
     }
     throw new TypeError('PBKDF2 key "usages" must include "deriveBits" or "deriveKey"');
 }
-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 encrypt = async (alg, key, cek, p2c = 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.slice(-6), derived, cek);
     return { encryptedKey, p2c, p2s: Object(_base64url_js__WEBPACK_IMPORTED_MODULE_2__["encode"])(p2s) };