@jetbrains/ring-ui-built 6.0.54-beta.0 → 6.0.54

package/components/auth/auth__core.d.ts

@@ -129,7 +129,7 @@ export default class Auth implements HTTPAuth {
     listeners: Listeners<AuthPayloadMap>;
     http: HTTP;
     private _service;
-    readonly _storage: AuthStorage<number>;
+    readonly _storage: AuthStorage<number> | null;
     private _responseParser;
     private readonly _requestBuilder;
     _backgroundFlow: BackgroundFlow | null;
@@ -174,7 +174,7 @@ export default class Auth implements HTTPAuth {
     /**
      * @return {Promise.<object>}
      */
-    getUser(accessToken?: string | null | undefined): Promise<any>;
+    getUser(accessToken?: string | null | undefined): Promise<any> | undefined;
     /**
      * @return {Promise.<object>}
      */
@@ -197,7 +197,7 @@ export default class Auth implements HTTPAuth {
      */
     login(): Promise<void>;
     switchUser(): Promise<void>;
-    _makeStateFromResponse(authResponse: AuthResponse): AuthState | null;
+    _makeStateFromResponse(authResponse: AuthResponse): AuthState;
     /**
      * Check if the hash contains an access token.
      * If it does, extract the state, compare with

package/components/auth/auth__core.js

@@ -137,7 +137,7 @@ var Auth = /*#__PURE__*/function () {
     _defineProperty(this, "listeners", new Listeners());
     _defineProperty(this, "http", void 0);
     _defineProperty(this, "_service", {});
-    _defineProperty(this, "_storage", void 0);
+    _defineProperty(this, "_storage", null);
     _defineProperty(this, "_responseParser", new AuthResponseParser());
     _defineProperty(this, "_requestBuilder", null);
     _defineProperty(this, "_backgroundFlow", void 0);
@@ -1402,23 +1402,22 @@ var Auth = /*#__PURE__*/function () {
     value: function _makeStateFromResponse(authResponse) {
       var state = authResponse.state;
       if (!state) {
-        throw new Error('No state in AuthResponse');
+        return {};
       }
       var defaultScope = this.config.scope;
-      var urlFromState = null;
       try {
-        urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
-      } catch (_unused2) {
-        return null;
-      }
-      if (urlFromState.origin !== window.location.origin) {
-        throw new Error("State contains URL with different origin: \"".concat(state, "\""));
+        var urlFromState = new URL(state); // checking if state contains valid URL on same origin, see HUB-11514
+        if (urlFromState.origin !== window.location.origin) {
+          return {};
+        }
+        return {
+          restoreLocation: state,
+          created: Date.now(),
+          scopes: defaultScope
+        };
+      } catch (e) {
+        return {};
       }
-      return {
-        restoreLocation: state,
-        created: Date.now(),
-        scopes: defaultScope
-      };
     }
     /**
      * Check if the hash contains an access token.
@@ -1432,7 +1431,8 @@ var Auth = /*#__PURE__*/function () {
     key: "_checkForAuthResponse",
     value: (function () {
       var _checkForAuthResponse2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        var authResponse, _this$config4, defaultScope, defaultExpiresIn, cleanHash, stateId, scope, expiresIn, accessToken, newState, scopes, effectiveExpiresIn, expires, _this$_storage12;
+        var _this$_storage12;
+        var authResponse, _this$config4, defaultScope, defaultExpiresIn, cleanHash, stateId, scope, expiresIn, accessToken, newState, scopes, effectiveExpiresIn, expires, _this$_storage13;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1449,42 +1449,34 @@ var Auth = /*#__PURE__*/function () {
               return _context20.abrupt("return", undefined);
             case 5:
               stateId = authResponse.state, scope = authResponse.scope, expiresIn = authResponse.expiresIn, accessToken = authResponse.accessToken;
-              newState = null;
-              if (!stateId) {
-                _context20.next = 12;
-                break;
-              }
-              _context20.next = 10;
-              return this._storage.getState(stateId);
-            case 10:
-              newState = _context20.sent;
-              if (!newState) {
-                newState = this._makeStateFromResponse(authResponse);
-              }
-            case 12:
-              if (newState) {
-                _context20.next = 14;
+              _context20.next = 8;
+              return stateId && ((_this$_storage12 = this._storage) === null || _this$_storage12 === void 0 ? void 0 : _this$_storage12.getState(stateId));
+            case 8:
+              _context20.t0 = _context20.sent;
+              if (_context20.t0) {
+                _context20.next = 11;
                 break;
               }
-              throw new Error("Could not create state where stateId=\"".concat(stateId, "\""));
-            case 14:
+              _context20.t0 = this._makeStateFromResponse(authResponse);
+            case 11:
+              newState = _context20.t0;
               scopes = scope ? scope.split(' ') : newState.scopes || defaultScope || [];
               effectiveExpiresIn = expiresIn ? parseInt(expiresIn, 10) : defaultExpiresIn;
               expires = TokenValidator._epoch() + effectiveExpiresIn;
               if (!(accessToken != null)) {
-                _context20.next = 20;
+                _context20.next = 18;
                 break;
               }
-              _context20.next = 20;
-              return (_this$_storage12 = this._storage) === null || _this$_storage12 === void 0 ? void 0 : _this$_storage12.saveToken({
+              _context20.next = 18;
+              return (_this$_storage13 = this._storage) === null || _this$_storage13 === void 0 ? void 0 : _this$_storage13.saveToken({
                 accessToken,
                 scopes,
                 expires,
                 lifeTime: effectiveExpiresIn
               });
-            case 20:
+            case 18:
               return _context20.abrupt("return", newState);
-            case 21:
+            case 19:
             case "end":
               return _context20.stop();
           }
@@ -1499,7 +1491,7 @@ var Auth = /*#__PURE__*/function () {
     key: "_checkForStateRestoration",
     value: function () {
       var _checkForStateRestoration2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
-        var _this$_storage13;
+        var _this$_storage14;
         var authResponse, stateId;
         return _regeneratorRuntime().wrap(function _callee21$(_context21) {
           while (1) switch (_context21.prev = _context21.next) {
@@ -1510,7 +1502,7 @@ var Auth = /*#__PURE__*/function () {
               }
               stateId = authResponse === null || authResponse === void 0 ? void 0 : authResponse.restoreAuthState;
               _context21.next = 5;
-              return stateId && ((_this$_storage13 = this._storage) === null || _this$_storage13 === void 0 ? void 0 : _this$_storage13.getState(stateId));
+              return stateId && ((_this$_storage14 = this._storage) === null || _this$_storage14 === void 0 ? void 0 : _this$_storage14.getState(stateId));
             case 5:
               _context21.t0 = _context21.sent;
               if (_context21.t0) {

package/components/header/smart-profile.js

@@ -159,22 +159,24 @@ var SmartProfile = /*#__PURE__*/function (_PureComponent) {
             _context.next = 4;
             return _this.props.auth.login();
           case 4:
-            _context.next = 8;
+            _context.next = 9;
             break;
           case 6:
             _context.prev = 6;
             _context.t0 = _context["catch"](1);
-          case 8:
-            _context.prev = 8;
+            // eslint-disable-next-line no-console
+            console.debug('Profile login errored', _context.t0);
+          case 9:
+            _context.prev = 9;
             _this.setState({
               loading: false
             });
-            return _context.finish(8);
-          case 11:
+            return _context.finish(9);
+          case 12:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[1, 6, 8, 11]]);
+      }, _callee, null, [[1, 6, 9, 12]]);
     })));
     _defineProperty(_this, "logout", function () {
       return _this.props.auth.logout();

package/components/login-dialog/service.js

@@ -93,7 +93,9 @@ function showAuthDialog() {
     show: true
   }));
   return function () {
-    reactRoot.unmount();
+    renderLoginDialog(_objectSpread2(_objectSpread2({}, props), {}, {
+      show: false
+    }));
   };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui-built",
-  "version": "6.0.54-beta.0",
+  "version": "6.0.54",
   "description": "JetBrains UI library",
   "author": "JetBrains",
   "license": "Apache-2.0",