solid-ui 2.4.27-4665661f → 2.4.27-4b2a53e1

package/lib/login/login.js

@@ -24,10 +24,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _rdflib = require("rdflib");
 var _solidLogic = require("solid-logic");
 var debug = _interopRequireWildcard(require("../debug"));
+var style = _interopRequireWildcard(require("../style"));
 var _log = require("../log");
 var ns = _interopRequireWildcard(require("../ns.js"));
 var _signup = require("../signup/signup.js");
-var _style = require("../style");
 var utils = _interopRequireWildcard(require("../utils"));
 var widgets = _interopRequireWildcard(require("../widgets"));
 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); }
@@ -100,104 +100,93 @@ function ensureLoadedPreferences(_x) {
 // used to be logInLoadProfile
 function _ensureLoadedPreferences() {
   _ensureLoadedPreferences = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee4(context) {
-    var statusArea, progressDisplay, complain, preferencesFile, m2;
+    var progressDisplay, preferencesFile, m2;
     return _regenerator["default"].wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          complain = function _complain(message) {
-            message = "ensureLoadedPreferences: ".concat(message);
-            if (statusArea) {
-              // statusArea.innerHTML = ''
-              statusArea.appendChild(widgets.errorMessageBlock(context.dom, message));
-            }
-            debug.log(message);
-            // reject(new Error(message))
-          };
           if (!context.preferencesFile) {
-            _context4.next = 3;
+            _context4.next = 2;
             break;
           }
           return _context4.abrupt("return", Promise.resolve(context));
-        case 3:
-          // already done
-          statusArea = context.statusArea || context.div || null;
-          _context4.prev = 4;
-          _context4.next = 7;
+        case 2:
+          _context4.prev = 2;
+          _context4.next = 5;
           return ensureLoadedProfile(context);
-        case 7:
+        case 5:
           context = _context4.sent;
-          _context4.next = 10;
+          _context4.next = 8;
           return loadPreferences(context.me);
-        case 10:
+        case 8:
           preferencesFile = _context4.sent;
           if (progressDisplay) {
             progressDisplay.parentNode.removeChild(progressDisplay);
           }
           context.preferencesFile = preferencesFile;
-          _context4.next = 51;
+          _context4.next = 49;
           break;
-        case 15:
-          _context4.prev = 15;
-          _context4.t0 = _context4["catch"](4);
+        case 13:
+          _context4.prev = 13;
+          _context4.t0 = _context4["catch"](2);
           if (!(_context4.t0 instanceof _solidLogic.UnauthorizedError)) {
-            _context4.next = 22;
+            _context4.next = 20;
             break;
           }
           m2 = 'Ooops - you are not authenticated (properly logged in) to for me to read your preference file.  Try loggin out and logging in?';
           (0, _log.alert)(m2);
-          _context4.next = 51;
+          _context4.next = 49;
           break;
-        case 22:
+        case 20:
           if (!(_context4.t0 instanceof _solidLogic.CrossOriginForbiddenError)) {
-            _context4.next = 28;
+            _context4.next = 26;
             break;
           }
           m2 = "Unauthorized: Assuming preference file blocked for origin ".concat(window.location.origin);
           context.preferencesFileError = m2;
           return _context4.abrupt("return", context);
-        case 28:
+        case 26:
           if (!(_context4.t0 instanceof _solidLogic.SameOriginForbiddenError)) {
-            _context4.next = 34;
+            _context4.next = 32;
             break;
           }
           m2 = 'You are not authorized to read your preference file. This may be because you are using an untrusted web app.';
           debug.warn(m2);
           return _context4.abrupt("return", context);
-        case 34:
+        case 32:
           if (!(_context4.t0 instanceof _solidLogic.NotEditableError)) {
-            _context4.next = 40;
+            _context4.next = 38;
             break;
           }
           m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
           debug.warn(m2);
           return _context4.abrupt("return", context);
-        case 40:
+        case 38:
           if (!(_context4.t0 instanceof _solidLogic.WebOperationError)) {
-            _context4.next = 45;
+            _context4.next = 43;
             break;
           }
           m2 = 'You are not authorized to edit your preference file. This may be because you are using an untrusted web app.';
           debug.warn(m2);
-          _context4.next = 51;
+          _context4.next = 49;
           break;
-        case 45:
+        case 43:
           if (!(_context4.t0 instanceof _solidLogic.FetchError)) {
-            _context4.next = 50;
+            _context4.next = 48;
             break;
           }
           m2 = "Strange: Error ".concat(_context4.t0.status, " trying to read your preference file.").concat(_context4.t0.message);
           (0, _log.alert)(m2);
-          _context4.next = 51;
+          _context4.next = 49;
           break;
-        case 50:
+        case 48:
           throw new Error("(via loadPrefs) ".concat(_context4.t0));
-        case 51:
+        case 49:
           return _context4.abrupt("return", context);
-        case 52:
+        case 50:
         case "end":
           return _context4.stop();
       }
-    }, _callee4, null, [[4, 15]]);
+    }, _callee4, null, [[2, 13]]);
   }));
   return _ensureLoadedPreferences.apply(this, arguments);
 }
@@ -562,21 +551,19 @@ function signInOrSignUpBox(dom, setUserCallback) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   options = options || {};
   var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
-
-  // @@ TODO Remove the need to cast HTML element to any
   var box = dom.createElement('div');
   var magicClassName = 'SolidSignInOrSignUpBox';
   debug.log('widgets.signInOrSignUpBox');
   box.setUserCallback = setUserCallback;
   box.setAttribute('class', magicClassName);
-  box.style = 'display:flex;'; // @@ fix all typecasts like this
+  box.setAttribute('style', 'display:flex;');
 
   // Sign in button with PopUP
   var signInPopUpButton = dom.createElement('input'); // multi
   box.appendChild(signInPopUpButton);
   signInPopUpButton.setAttribute('type', 'button');
   signInPopUpButton.setAttribute('value', 'Log in');
-  signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;"));
+  signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;").concat(style.headerBannerLoginInput));
   _solidLogic.authSession.onLogin(function () {
     var me = _solidLogic.authn.currentUser();
     // const sessionInfo = authSession.info
@@ -617,7 +604,7 @@ function signInOrSignUpBox(dom, setUserCallback) {
   box.appendChild(signupButton);
   signupButton.setAttribute('type', 'button');
   signupButton.setAttribute('value', 'Sign Up for Solid');
-  signupButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #efe;"));
+  signupButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #efe;").concat(style.headerBannerLoginInput));
   signupButton.addEventListener('click', function (_event) {
     var signupMgr = new _signup.Signup();
     signupMgr.signup().then(function (uri) {
@@ -658,6 +645,8 @@ function renderSignInPopup(dom) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
+            // clear authorization metadata from store
+            _solidLogic.solidLogicSingleton.store.updater.flagAuthorizationMetadata();
             // Save hash
             preLoginRedirectHash = new URL(window.location.href).hash;
             if (preLoginRedirectHash) {
@@ -667,23 +656,23 @@ function renderSignInPopup(dom) {
             // Login
             locationUrl = new URL(window.location.href);
             locationUrl.hash = ''; // remove hash part
-            _context.next = 8;
+            _context.next = 9;
             return _solidLogic.authSession.login({
               redirectUrl: locationUrl.href,
               oidcIssuer: issuerUri
             });
-          case 8:
-            _context.next = 13;
+          case 9:
+            _context.next = 14;
             break;
-          case 10:
-            _context.prev = 10;
+          case 11:
+            _context.prev = 11;
             _context.t0 = _context["catch"](0);
             (0, _log.alert)(_context.t0.message);
-          case 13:
+          case 14:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[0, 10]]);
+      }, _callee, null, [[0, 11]]);
     }));
     return function loginToIssuer(_x11) {
       return _ref.apply(this, arguments);
@@ -835,45 +824,47 @@ _solidLogic.authSession.onLogout( /*#__PURE__*/(0, _asyncToGenerator2["default"]
       case 0:
         issuer = window.localStorage.getItem('loginIssuer');
         if (!issuer) {
-          _context2.next = 19;
+          _context2.next = 20;
           break;
         }
         _context2.prev = 2;
+        // clear authorization metadata from store
+        _solidLogic.solidLogicSingleton.store.updater.flagAuthorizationMetadata();
         wellKnownUri = new URL(issuer);
         wellKnownUri.pathname = '/.well-known/openid-configuration';
-        _context2.next = 7;
+        _context2.next = 8;
         return fetch(wellKnownUri.toString());
-      case 7:
+      case 8:
         wellKnownResult = _context2.sent;
         if (!(wellKnownResult.status === 200)) {
-          _context2.next = 15;
+          _context2.next = 16;
           break;
         }
-        _context2.next = 11;
+        _context2.next = 12;
         return wellKnownResult.json();
-      case 11:
+      case 12:
         openidConfiguration = _context2.sent;
         if (!(openidConfiguration && openidConfiguration.end_session_endpoint)) {
-          _context2.next = 15;
+          _context2.next = 16;
           break;
         }
-        _context2.next = 15;
+        _context2.next = 16;
         return fetch(openidConfiguration.end_session_endpoint, {
           credentials: 'include'
         });
-      case 15:
-        _context2.next = 19;
+      case 16:
+        _context2.next = 20;
         break;
-      case 17:
-        _context2.prev = 17;
+      case 18:
+        _context2.prev = 18;
         _context2.t0 = _context2["catch"](2);
-      case 19:
-        window.location.reload();
       case 20:
+        window.location.reload();
+      case 21:
       case "end":
         return _context2.stop();
     }
-  }, _callee2, null, [[2, 17]]);
+  }, _callee2, null, [[2, 18]]);
 })));
 
 /**
@@ -1008,12 +999,12 @@ function selectWorkspace(dom, appDetails, callbackWS) {
     box.appendChild(dom.createElement('hr')); // @@
 
     var p = box.appendChild(dom.createElement('p'));
-    p.style = _style.commentStyle;
+    p.setAttribute('style', style.commentStyle);
     p.textContent = "Where would you like to store the data for the ".concat(noun, "?\n    Give the URL of the folder where you would like the data stored.\n    It can be anywhere in solid world - this URI is just an idea.");
     // @@ TODO Remove the need to cast baseField to any
     var baseField = box.appendChild(dom.createElement('input'));
     baseField.setAttribute('type', 'text');
-    baseField.style = _style.textInputStyle;
+    baseField.setAttribute('style', style.textInputStyle);
     baseField.size = 80; // really a string
     baseField.label = 'base URL';
     baseField.autocomplete = 'on';
@@ -1025,7 +1016,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
     box.appendChild(dom.createElement('br')); // @@
 
     var button = box.appendChild(dom.createElement('button'));
-    button.style = _style.buttonStyle;
+    button.setAttribute('style', style.buttonStyle);
     button.textContent = "Start new ".concat(noun, " at this URI");
     button.addEventListener('click', function (_event) {
       var newBase = baseField.value.replace(' ', '%20'); // do not re-encode in general, as % encodings may exist
@@ -1043,7 +1034,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
       // Ignore master workspaces
       ns.space('MasterWorkspace'));
     });
-    var col1, col2, col3, tr, ws, style, comment;
+    var col1, col2, col3, tr, ws, localStyle, comment;
     var cellStyle = 'height: 3em; margin: 1em; padding: 1em white; border-radius: 0.3em;';
     var deselectedStyle = "".concat(cellStyle, "border: 0px;");
     // const selectedStyle = cellStyle + 'border: 1px solid black;'
@@ -1058,8 +1049,8 @@ function selectWorkspace(dom, appDetails, callbackWS) {
         tr.appendChild(col1);
       }
       col2 = dom.createElement('td');
-      style = _solidLogic.solidLogicSingleton.store.anyValue(ws, ns.ui('style'));
-      if (!style) {
+      localStyle = _solidLogic.solidLogicSingleton.store.anyValue(ws, ns.ui('style'));
+      if (!localStyle) {
         // Otherwise make up arbitrary colour
         var hash = function hash(x) {
           return x.split('').reduce(function (a, b) {
@@ -1068,9 +1059,9 @@ function selectWorkspace(dom, appDetails, callbackWS) {
           }, 0);
         };
         var bgcolor = "#".concat((hash(ws.uri) & 0xffffff | 0xc0c0c0).toString(16)); // c0c0c0  forces pale
-        style = "color: black ; background-color: ".concat(bgcolor, ";");
+        localStyle = "color: black ; background-color: ".concat(bgcolor, ";");
       }
-      col2.setAttribute('style', deselectedStyle + style);
+      col2.setAttribute('style', deselectedStyle + localStyle);
       tr.target = ws.uri;
       var label = _solidLogic.solidLogicSingleton.store.any(ws, ns.rdfs('label'));
       if (!label) {
@@ -1090,7 +1081,7 @@ function selectWorkspace(dom, appDetails, callbackWS) {
       comment = comment ? comment.value : 'Use this workspace';
       col2.addEventListener('click', function (_event) {
         col3.textContent = comment ? comment.value : '';
-        col3.setAttribute('style', deselectedStyle + style);
+        col3.setAttribute('style', deselectedStyle + localStyle);
         var button = dom.createElement('button');
         button.textContent = 'Continue';
         // button.setAttribute('style', style);