solid-ui 3.0.4-d3715b2 → 3.0.4-d5a80ae

package/dist/solid-ui.js

@@ -9577,7 +9577,7 @@ function ensureLoadedPreferences(_x) {
 // used to be logInLoadProfile
 function _ensureLoadedPreferences() {
   _ensureLoadedPreferences = asyncToGenerator_asyncToGenerator(/*#__PURE__*/regenerator_default().mark(function _callee4(context) {
-    var progressDisplay, preferencesFile, m2, _t4;
+    var progressDisplay, preferencesFile, m2, errorMessage, _t4;
     return regenerator_default().wrap(function (_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -9605,14 +9605,15 @@ function _ensureLoadedPreferences() {
         case 4:
           _context4.prev = 4;
           _t4 = _context4["catch"](1);
-          if (!(_t4 instanceof external_SolidLogic_.UnauthorizedError)) {
+          errorMessage = _t4 instanceof Error ? _t4.message : "".concat(_t4);
+          if (!(_t4 instanceof external_SolidLogic_.UnauthorizedError || /status:\s*401|unauthorized/i.test(errorMessage))) {
             _context4.next = 5;
             break;
           }
-          m2 = 'Oops — you are not authenticated (properly logged in), so SolidOS cannot read your preferences file. Try logging out and then logging back in.';
-          log_alert(m2);
-          _context4.next = 11;
-          break;
+          m2 = 'Not logged in, so preferences were not loaded.';
+          context.preferencesFileError = m2;
+          src_debug/* warn */.R8(m2);
+          return _context4.abrupt("return", context);
         case 5:
           if (!(_t4 instanceof external_SolidLogic_.CrossOriginForbiddenError)) {
             _context4.next = 6;
@@ -9678,7 +9679,7 @@ function ensureLoadedProfile(_x2) {
   */
 function _ensureLoadedProfile() {
   _ensureLoadedProfile = asyncToGenerator_asyncToGenerator(/*#__PURE__*/regenerator_default().mark(function _callee5(context) {
-    var logInContext, _t5;
+    var logInContext, notLoggedInMessage, message, _notLoggedInMessage, loggedInUser, isNonFatalProfileSideLoadFailure, _t5;
     return regenerator_default().wrap(function (_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
@@ -9697,24 +9698,51 @@ function _ensureLoadedProfile() {
             _context5.next = 3;
             break;
           }
-          throw new Error('Could not log in');
+          notLoggedInMessage = 'Not logged in, so profile was not loaded.';
+          src_debug/* log */.Rm(notLoggedInMessage);
+          if (context.div && context.dom) {
+            context.div.appendChild(errorMessageBlock(context.dom, notLoggedInMessage));
+          }
+          return _context5.abrupt("return", context);
         case 3:
           _context5.next = 4;
           return loadProfile(logInContext.me);
         case 4:
           context.publicProfile = _context5.sent;
-          _context5.next = 6;
+          _context5.next = 8;
           break;
         case 5:
           _context5.prev = 5;
           _t5 = _context5["catch"](1);
+          message = _t5 instanceof Error ? _t5.message : "".concat(_t5);
+          if (!/status:\s*401|unauthorized/i.test(message)) {
+            _context5.next = 6;
+            break;
+          }
+          _notLoggedInMessage = 'Not logged in, so profile was not loaded.';
+          src_debug/* warn */.R8(_notLoggedInMessage);
           if (context.div && context.dom) {
-            context.div.appendChild(errorMessageBlock(context.dom, _t5.message));
+            context.div.appendChild(errorMessageBlock(context.dom, _notLoggedInMessage));
           }
-          throw new Error("Can't log in: ".concat(_t5));
+          return _context5.abrupt("return", context);
         case 6:
+          loggedInUser = logInContext && logInContext.me;
+          isNonFatalProfileSideLoadFailure = !!loggedInUser && (_t5 instanceof external_SolidLogic_.CrossOriginForbiddenError || _t5 instanceof external_SolidLogic_.SameOriginForbiddenError || /status:\s*403|forbidden/i.test(message) || /cancel/i.test(message));
+          if (!isNonFatalProfileSideLoadFailure) {
+            _context5.next = 7;
+            break;
+          }
+          src_debug/* warn */.R8("Unable to load all profile-linked resources; continuing as logged in user: ".concat(message));
+          context.publicProfile = loggedInUser.doc();
           return _context5.abrupt("return", context);
         case 7:
+          if (context.div && context.dom) {
+            context.div.appendChild(errorMessageBlock(context.dom, message));
+          }
+          throw new Error("Can't log in: ".concat(_t5));
+        case 8:
+          return _context5.abrupt("return", context);
+        case 9:
         case "end":
           return _context5.stop();
       }