solid-ui 2.4.28-e581c53c → 2.4.28-fda13292

package/lib/login/login.js

@@ -34,30 +34,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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; } /* eslint-disable camelcase */ /**
-                                                                                                                                                                                                                    * Signing in, signing up, profile and preferences reloading
-                                                                                                                                                                                                                    * Type index management
-                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                    * Many functions in this module take a context object which
-                                                                                                                                                                                                                    * holds various RDF symbols, add to it, and return a promise of it.
-                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                    * * `me`                RDF symbol for the user's WebID
-                                                                                                                                                                                                                    * * `publicProfile`     The user's public profile, iff loaded
-                                                                                                                                                                                                                    * * `preferencesFile`   The user's personal preference file, iff loaded
-                                                                                                                                                                                                                    * * `index.public`      The user's public type index file
-                                                                                                                                                                                                                    * * `index.private`     The user's private type index file
-                                                                                                                                                                                                                    *
-                                                                                                                                                                                                                    * Not RDF symbols:
-                                                                                                                                                                                                                    * * `noun`            A string in english for the type of thing -- like "address book"
-                                                                                                                                                                                                                    * * `instance`        An array of nodes which are existing instances
-                                                                                                                                                                                                                    * * `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
-                                                                                                                                                                                                                    */ // eslint-disable-next-line camelcase
+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; }
 var store = _solidLogic.solidLogicSingleton.store;
 var _solidLogicSingleton$ = _solidLogic.solidLogicSingleton.profile,
   loadPreferences = _solidLogicSingleton$.loadPreferences,
@@ -123,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);
 }
@@ -437,6 +403,15 @@ function renderScopeHeadingRow(context, store, scope) {
 function registrationList(_x9, _x10) {
   return _registrationList.apply(this, arguments);
 } // registrationList
+/**
+ * Bootstrapping identity
+ * (Called by `loginStatusBox()`)
+ *
+ * @param dom
+ * @param setUserCallback
+ *
+ * @returns
+ */
 function _registrationList() {
   _registrationList = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee9(context, options) {
     var dom, div, box, scopes, table, tbody, _iterator2, _step2, scope, headingRow, items, _iterator3, _step3, _loop;
@@ -568,23 +543,10 @@ function _registrationList() {
   }));
   return _registrationList.apply(this, arguments);
 }
-function getDefaultSignInButtonStyle() {
-  return 'padding: 1em; border-radius:0.5em; font-size: 100%;';
-}
-
-/**
- * Bootstrapping identity
- * (Called by `loginStatusBox()`)
- *
- * @param dom
- * @param setUserCallback
- *
- * @returns
- */
 function signInOrSignUpBox(dom, setUserCallback) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   options = options || {};
-  var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
+  var signInButtonStyle = options.buttonStyle || style.signInAndUpButtonStyle;
   var box = dom.createElement('div');
   var magicClassName = 'SolidSignInOrSignUpBox';
   debug.log('widgets.signInOrSignUpBox');
@@ -597,7 +559,7 @@ function signInOrSignUpBox(dom, setUserCallback) {
   box.appendChild(signInPopUpButton);
   signInPopUpButton.setAttribute('type', 'button');
   signInPopUpButton.setAttribute('value', 'Log in');
-  signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eef;").concat(style.headerBannerLoginInput));
+  signInPopUpButton.setAttribute('style', "".concat(signInButtonStyle).concat(style.headerBannerLoginInput) + style.signUpBackground);
   _solidLogic.authSession.onLogin(function () {
     var me = _solidLogic.authn.currentUser();
     // const sessionInfo = authSession.info
@@ -638,7 +600,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;").concat(style.headerBannerLoginInput));
+  signupButton.setAttribute('style', "".concat(signInButtonStyle).concat(style.headerBannerLoginInput) + style.signInBackground);
   signupButton.addEventListener('click', function (_event) {
     var signupMgr = new _signup.Signup();
     signupMgr.signup().then(function (uri) {
@@ -806,7 +768,7 @@ function loginStatusBox(dom) {
     });
   }
   function logoutButton(me, options) {
-    var signInButtonStyle = options.buttonStyle || getDefaultSignInButtonStyle();
+    var signInButtonStyle = options.buttonStyle || style.signInAndUpButtonStyle;
     var logoutLabel = 'WebID logout';
     if (me) {
       var nick = _solidLogic.solidLogicSingleton.store.any(me, ns.foaf('nick')) || _solidLogic.solidLogicSingleton.store.any(me, ns.foaf('name'));
@@ -818,7 +780,7 @@ function loginStatusBox(dom) {
     // signOutButton.className = 'WebIDCancelButton'
     signOutButton.setAttribute('type', 'button');
     signOutButton.setAttribute('value', logoutLabel);
-    signOutButton.setAttribute('style', "".concat(signInButtonStyle, "background-color: #eee;"));
+    signOutButton.setAttribute('style', "".concat(signInButtonStyle));
     signOutButton.addEventListener('click', logoutButtonHandler, false);
     return signOutButton;
   }