@jetbrains/ring-ui 4.1.0-beta.9 → 4.1.4

package/dist/auth/auth__core.js

@@ -1,5 +1,5 @@
-import { _ as _defineProperty, c as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
-import { fixUrl, getAbsoluteBaseURL } from '../global/url.js';
+import { _ as _defineProperty } from '../_helpers/_rollupPluginBabelHelpers.js';
+import { getAbsoluteBaseURL, fixUrl } from '../global/url.js';
 import Listeners from '../global/listeners.js';
 import HTTP from '../http/http.js';
 import promiseWithTimeout from '../global/promise-with-timeout.js';
@@ -25,7 +25,8 @@ import '@jetbrains/icons/close';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../loader-inline/loader-inline.js';
 import '../global/theme.js';
@@ -48,6 +49,7 @@ const DEFAULT_EXPIRES_TIMEOUT = 40 * 60;
 const DEFAULT_BACKGROUND_TIMEOUT = 10 * 1000;
 const DEFAULT_BACKEND_CHECK_TIMEOUT = 10 * 1000;
 const BACKGROUND_REDIRECT_TIMEOUT = 20 * 1000;
+const DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT = 5 * 1000;
 /* eslint-enable no-magic-numbers */
 
 const USER_CHANGED_EVENT = 'userChange';
@@ -79,6 +81,7 @@ const DEFAULT_CONFIG = {
   checkBackendIsUp: () => Promise.resolve(null),
   onBackendDown: () => {},
   defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
+  waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
   translations: {
     login: 'Log in',
     loginTo: 'Log in to %serviceName%',
@@ -135,7 +138,9 @@ class Auth {
     }
 
     config.userFields = config.userFields || [];
-    this.config = _objectSpread2(_objectSpread2({}, Auth.DEFAULT_CONFIG), config);
+    this.config = { ...Auth.DEFAULT_CONFIG,
+      ...config
+    };
     const {
       clientId,
       redirect,
@@ -269,7 +274,7 @@ class Auth {
 
 
   async init() {
-    this._storage.onTokenChange(token => {
+    this._storage.onTokenChange(async token => {
       const isGuest = this.user ? this.user.guest : false;
 
       if (isGuest && !token) {
@@ -279,7 +284,16 @@ class Auth {
       if (!token) {
         this.logout();
       } else {
-        this._detectUserChange(token.accessToken);
+        try {
+          await this._detectUserChange(token.accessToken);
+        } catch (error) {
+          if (this._canShowDialogs()) {
+            this._showAuthDialog({
+              nonInteractive: true,
+              error
+            });
+          }
+        }
       }
     });
 
@@ -360,8 +374,12 @@ class Auth {
   async sendRedirect(error) {
     const authRequest = await this._requestBuilder.prepareAuthRequest();
 
-    this._redirectCurrentPage(authRequest.url);
+    this._redirectCurrentPage(authRequest.url); // HUB-10867 Since we already redirecting the page, there is no actual need to throw an error
+    // and scare user with flashing error
+    // But let's keep it just in case redirect was not successful
+
 
+    await new Promise(resolve => setTimeout(resolve, this.config.waitForRedirectTimeout));
     throw error;
   }
 
@@ -539,39 +557,35 @@ class Auth {
 
   async _detectUserChange(accessToken) {
     const windowWasOpen = this._isLoginWindowOpen;
+    const user = await this.getUser(accessToken);
 
-    try {
-      const user = await this.getUser(accessToken);
+    const onApply = () => {
+      this.user = user;
+      this.listeners.trigger(USER_CHANGED_EVENT, user);
+    };
 
-      const onApply = () => {
-        this.user = user;
-        this.listeners.trigger(USER_CHANGED_EVENT, user);
-      };
+    if (user && this.user && this.user.id !== user.id) {
+      if (!this._canShowDialogs() || this.user.guest || windowWasOpen) {
+        onApply();
+        return;
+      }
 
-      if (user && this.user && this.user.id !== user.id) {
-        if (!this._canShowDialogs() || this.user.guest || windowWasOpen) {
-          onApply();
-          return;
-        }
+      if (user.guest) {
+        this._showAuthDialog({
+          nonInteractive: true
+        });
 
-        if (user.guest) {
-          this._showAuthDialog({
-            nonInteractive: true
-          });
+        return;
+      }
 
-          return;
+      await this._showUserChangedDialog({
+        newUser: user,
+        onApply,
+        onPostpone: () => {
+          this.listeners.trigger(USER_CHANGE_POSTPONED_EVENT);
+          this.config.onPostponeChangedUser(this.user, user);
         }
-
-        await this._showUserChangedDialog({
-          newUser: user,
-          onApply,
-          onPostpone: () => {
-            this.listeners.trigger(USER_CHANGE_POSTPONED_EVENT);
-            this.config.onPostponeChangedUser(this.user, user);
-          }
-        });
-      }
-    } catch (e) {// noop
+      });
     }
   }
 
@@ -640,15 +654,15 @@ class Auth {
       }
     };
 
-    const hide = this._authDialogService(_objectSpread2(_objectSpread2({}, this._service), {}, {
+    const hide = this._authDialogService({ ...this._service,
       loginCaption: translations.login,
       loginToCaption: translations.loginTo,
       confirmLabel: translations.login,
       cancelLabel: cancelable ? translations.cancel : translations.postpone,
-      errorMessage: error && error.toString ? error.toString() : null,
+      errorMessage: this._extractErrorMessage(error, true),
       onConfirm,
       onCancel
-    }));
+    });
 
     const stopTokenListening = this._storage.onTokenChange(token => {
       if (token) {
@@ -680,7 +694,7 @@ class Auth {
       hide();
     };
 
-    const hide = this._authDialogService(_objectSpread2(_objectSpread2({}, this._service), {}, {
+    const hide = this._authDialogService({ ...this._service,
       title: translations.youHaveLoggedInAs.replace('%userName%', newUser.name),
       loginCaption: translations.login,
       loginToCaption: translations.loginTo,
@@ -694,7 +708,32 @@ class Auth {
         done();
         onPostpone();
       }
-    }));
+    });
+  }
+
+  _extractErrorMessage(error) {
+    let logError = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+    if (!error) {
+      return null;
+    }
+
+    if (logError) {
+      // eslint-disable-next-line no-console
+      console.error('RingUI Auth error', error);
+    }
+
+    try {
+      // We've got some error from this list
+      // https://www.jetbrains.com/help/youtrack/devportal/OAuth-2.0-Errors.html
+      if (error.code && typeof error.code.code === 'string') {
+        const readableCode = error.code.code.split('_').join(' ');
+        return `Authorization error: ${readableCode}`;
+      }
+    } catch {// noop
+    }
+
+    return error.toString ? error.toString() : null;
   }
 
   _showBackendDownDialog(backendError) {
@@ -760,11 +799,11 @@ class Auth {
 
 
   async logout(extraParams) {
-    const requestParams = _objectSpread2({
+    const requestParams = {
       // eslint-disable-next-line camelcase
-      request_credentials: 'required'
-    }, extraParams);
-
+      request_credentials: 'required',
+      ...extraParams
+    };
     await this._checkBackendsStatusesIfEnabled();
     await this.listeners.trigger(LOGOUT_EVENT);
 
@@ -818,11 +857,11 @@ class Auth {
   }
 
   async switchUser() {
-    if (this.config.embeddedLogin) {
-      await this._runEmbeddedLogin();
+    if (!this.config.embeddedLogin) {
+      throw new Error('Auth: switchUser only supported for "embeddedLogin" mode');
     }
 
-    throw new Error('Auth: switchUser only supported for "embeddedLogin" mode');
+    await this._runEmbeddedLogin();
   }
   /**
    * Check if the hash contains an access token.
@@ -983,5 +1022,4 @@ _defineProperty(Auth, "shouldRefreshToken", TokenValidator.shouldRefreshToken);
 
 _defineProperty(Auth, "storageIsUnavailable", !navigator.cookieEnabled);
 
-export default Auth;
-export { DEFAULT_BACKGROUND_TIMEOUT, DEFAULT_EXPIRES_TIMEOUT, DOMAIN_USER_CHANGED_EVENT, LOGOUT_EVENT, LOGOUT_POSTPONED_EVENT, USER_CHANGED_EVENT, USER_CHANGE_POSTPONED_EVENT };
+export { DEFAULT_BACKGROUND_TIMEOUT, DEFAULT_EXPIRES_TIMEOUT, DOMAIN_USER_CHANGED_EVENT, LOGOUT_EVENT, LOGOUT_POSTPONED_EVENT, USER_CHANGED_EVENT, USER_CHANGE_POSTPONED_EVENT, Auth as default };

package/dist/auth/background-flow.js

@@ -119,5 +119,4 @@ class BackgroundFlow {
 
 }
 
-export default BackgroundFlow;
-export { HUB_AUTH_PAGE_OPENED };
+export { HUB_AUTH_PAGE_OPENED, BackgroundFlow as default };

package/dist/auth/down-notification.js

@@ -16,7 +16,8 @@ import '@jetbrains/icons/close';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../loader-inline/loader-inline.js';
 import '../global/theme.js';
@@ -30,8 +31,10 @@ import '../global/radial-gradient-mask.js';
 import '../global/dom.js';
 import 'focus-visible';
 import '../link/clickableLink.js';
+import '../_helpers/link.js';
+import '../_helpers/group.js';
 
-var modules_c87dd562 = {"unit":"8px","title":"downNotification_title__dc35b944","error":"downNotification_error__dc35b944"};
+var modules_c87dd562 = {"unit":"8px","title":"title_rui_dc35","error":"error_rui_dc35"};
 
 let key = null;
 
@@ -108,4 +111,4 @@ function onBackendDown(_ref2) {
   return () => alertService.remove(key);
 }
 
-export default onBackendDown;
+export { onBackendDown as default };

package/dist/auth/iframe-flow.js

@@ -32,7 +32,8 @@ import '@jetbrains/icons/chevron-10px';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../global/theme.js';
 import '../link/clickableLink.js';
@@ -43,9 +44,11 @@ import 'scrollbar-width';
 import '../loader-screen/loader-screen.js';
 import '../loader/loader.js';
 import '../loader/loader__core.js';
+import '../_helpers/loader-screen.js';
 import './background-flow.js';
 import 'es6-error';
 import '../global/url.js';
+import '../_helpers/link.js';
 
 class IFrameFlow {
   constructor(requestBuilder, storage, translations) {
@@ -144,4 +147,4 @@ class IFrameFlow {
 
 }
 
-export default IFrameFlow;
+export { IFrameFlow as default };

package/dist/auth/landing-entry.js

@@ -2,4 +2,4 @@ import '!!file-loader?publicPath=../../&name=auth-landing.html!extricate-loader!
 
 var landingEntry = 'auth-landing.html';
 
-export default landingEntry;
+export { landingEntry as default };

package/dist/auth/landing.js

@@ -23,7 +23,8 @@ import '@jetbrains/icons/close';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../loader-inline/loader-inline.js';
 import '../global/theme.js';
@@ -39,7 +40,9 @@ import '../alert/container.js';
 import '../link/link.js';
 import 'focus-visible';
 import '../link/clickableLink.js';
+import '../_helpers/link.js';
 import '../group/group.js';
+import '../_helpers/group.js';
 import '../global/listeners.js';
 import '../global/promise-with-timeout.js';
 import '../storage/storage.js';
@@ -81,4 +84,4 @@ async function parseAndStoreResponse(clientId) {
   });
 }
 
-export default parseAndStoreResponse;
+export { parseAndStoreResponse as default };

package/dist/auth/request-builder.js

@@ -72,4 +72,4 @@ class AuthRequestBuilder {
 
 _defineProperty(AuthRequestBuilder, "_uuid", uuid.generate);
 
-export default AuthRequestBuilder;
+export { AuthRequestBuilder as default };

package/dist/auth/response-parser.js

@@ -114,4 +114,4 @@ _defineProperty(AuthResponseParser, "AuthError", class AuthError extends Extenda
 
 });
 
-export default AuthResponseParser;
+export { AuthResponseParser as default };

package/dist/auth/storage.js

@@ -15,7 +15,8 @@ import '@jetbrains/icons/close';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../loader-inline/loader-inline.js';
 import '../global/theme.js';
@@ -276,4 +277,4 @@ class AuthStorage {
 
 }
 
-export default AuthStorage;
+export { AuthStorage as default };

package/dist/auth/token-validator.js

@@ -173,4 +173,4 @@ _defineProperty(TokenValidator, "TokenValidationError", class TokenValidationErr
 
 });
 
-export default TokenValidator;
+export { TokenValidator as default };

package/dist/auth/window-flow.js

@@ -130,4 +130,4 @@ class WindowFlow {
 
 }
 
-export default WindowFlow;
+export { WindowFlow as default };

package/dist/auth-dialog/auth-dialog.js

@@ -30,7 +30,8 @@ import '@jetbrains/icons/chevron-10px';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../global/theme.js';
 import '../link/clickableLink.js';
@@ -38,7 +39,7 @@ import '../_helpers/button__classes.js';
 import 'element-resize-detector';
 import '../global/schedule-raf.js';
 
-var modules_ae521deb = {"unit":"8px","dialog":"authDialog_dialog__eba2bba5","content":"authDialog_content__eba2bba5 global_font__0f8f4370","button":"authDialog_button__eba2bba5","firstButton":"authDialog_firstButton__eba2bba5 authDialog_button__eba2bba5","title":"authDialog_title__eba2bba5","logo":"authDialog_logo__eba2bba5","error":"authDialog_error__eba2bba5"};
+var modules_ae521deb = {"unit":"8px","dialog":"dialog_rui_eba2","content":"content_rui_eba2 font_rui_750f","button":"button_rui_eba2","firstButton":"firstButton_rui_eba2 button_rui_eba2","title":"title_rui_eba2","logo":"logo_rui_eba2","error":"error_rui_eba2"};
 
 /**
  * @name Auth Dialog
@@ -72,6 +73,7 @@ class AuthDialog extends Component {
     const defaultTitle = serviceName ? loginToCaption : loginCaption;
     const title = (this.props.title || defaultTitle).replace('%serviceName%', serviceName);
     return /*#__PURE__*/React.createElement(Dialog, {
+      label: title,
       "data-test": "ring-auth-dialog",
       className: className,
       contentClassName: classNames(className, modules_ae521deb.dialog),
@@ -129,4 +131,4 @@ _defineProperty(AuthDialog, "defaultProps", {
   onCancel: () => {}
 });
 
-export default AuthDialog;
+export { AuthDialog as default };

package/dist/auth-dialog-service/auth-dialog-service.js

@@ -1,7 +1,7 @@
-import { c as _objectSpread2 } from '../_helpers/_rollupPluginBabelHelpers.js';
 import React from 'react';
 import { render } from 'react-dom';
 import AuthDialog from '../auth-dialog/auth-dialog.js';
+import '../_helpers/_rollupPluginBabelHelpers.js';
 import 'prop-types';
 import 'classnames';
 import '../island/island.js';
@@ -29,7 +29,8 @@ import '@jetbrains/icons/chevron-10px';
 import '../icon/icon.js';
 import 'util-deprecate';
 import '../icon/icon__constants.js';
-import '../_helpers/icon__svg.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
 import '../global/memoize.js';
 import '../global/theme.js';
 import '../link/clickableLink.js';
@@ -54,9 +55,9 @@ function renderAuthDialog(props) {
 
 function showAuthDialog() {
   let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  renderAuthDialog(_objectSpread2(_objectSpread2({}, props), {}, {
+  renderAuthDialog({ ...props,
     show: true
-  }));
+  });
   return () => {
     renderAuthDialog({
       show: false
@@ -64,4 +65,4 @@ function showAuthDialog() {
   };
 }
 
-export default showAuthDialog;
+export { showAuthDialog as default };

package/dist/auth-ng/auth-ng.js

@@ -0,0 +1,203 @@
+import angular from 'angular';
+import '../auth/auth.js';
+import Auth from '../auth/auth__core.js';
+import '../auth/window-flow.js';
+import '../_helpers/_rollupPluginBabelHelpers.js';
+import '../auth/response-parser.js';
+import 'es6-error';
+import '../global/url.js';
+import '../auth/down-notification.js';
+import 'react';
+import 'prop-types';
+import '../alert-service/alert-service.js';
+import 'react-dom';
+import '../global/get-uid.js';
+import '../alert/alert.js';
+import 'classnames';
+import '@jetbrains/icons/exception';
+import '@jetbrains/icons/checkmark';
+import '@jetbrains/icons/warning';
+import '@jetbrains/icons/close';
+import '../icon/icon.js';
+import 'util-deprecate';
+import '../icon/icon__constants.js';
+import '../_helpers/icon.js';
+import '../icon/icon__svg.js';
+import '../global/memoize.js';
+import '../loader-inline/loader-inline.js';
+import '../global/theme.js';
+import '../global/data-tests.js';
+import '../_helpers/inject-styles.js';
+import '../global/conic-gradient.js';
+import 'conic-gradient';
+import '../global/supports-css.js';
+import '../global/inject-styles.js';
+import '../global/radial-gradient-mask.js';
+import '../global/dom.js';
+import '../alert/container.js';
+import '../link/link.js';
+import 'focus-visible';
+import '../link/clickableLink.js';
+import '../_helpers/link.js';
+import '../group/group.js';
+import '../_helpers/group.js';
+import '../global/listeners.js';
+import '../http/http.js';
+import '../global/promise-with-timeout.js';
+import '../auth/storage.js';
+import '../storage/storage.js';
+import '../storage/storage__local.js';
+import '../storage/storage__fallback.js';
+import 'deep-equal';
+import '../auth/request-builder.js';
+import 'simply-uuid';
+import '../auth/background-flow.js';
+import '../auth/token-validator.js';
+
+/**
+ * @name Auth Ng
+ */
+
+const angularModule = angular.module('Ring.auth', []);
+angularModule.provider('auth', ["$httpProvider", function provider($httpProvider) {
+  /**
+   * @type Auth
+   */
+  let auth;
+  /**
+   * @type {{cleanHash: boolean}} config
+   */
+
+  const defaultConfig = {
+    cleanHash: false //prevents infinite redirect on angular>1.2.26
+
+  };
+
+  this.init = authInstance => {
+    auth = authInstance;
+  };
+  /**
+   * @param {{
+   *   serverUri: string,
+   *   redirectUri: string?,
+   *   clientId: string?,
+   *   scope: string[]?,
+   *   cleanHash: boolean?
+   * }} config
+   */
+
+
+  this.config = config => {
+    const configCopy = angular.extend({}, defaultConfig, config);
+    auth = new Auth(configCopy);
+  };
+
+  $httpProvider.interceptors.push(['$q', '$injector', 'auth', ($q, $injector, authInstance) => {
+    function urlEndsWith(config, suffix) {
+      return config && config.url && config.url.indexOf(suffix) === config.url.length - suffix.length;
+    }
+
+    return {
+      request(config) {
+        if (!authInstance || urlEndsWith(config, '.html') || config && config.noAuthorization) {
+          // Don't intercept angular template requests
+          return config;
+        }
+
+        return authInstance.promise.then(() => authInstance.auth.requestToken()).then(accessToken => {
+          if (accessToken) {
+            config.headers.Authorization = `Bearer ${accessToken}`;
+          }
+
+          return config;
+        });
+      },
+
+      responseError(rejection) {
+        if (authInstance && !urlEndsWith(rejection.config, '.html') && rejection.data != null && Auth.shouldRefreshToken(rejection.data.error)) {
+          // Use $injector to avoid circular dependency
+          const $http = $injector.get('$http');
+          const {
+            data,
+            method,
+            params,
+            url
+          } = rejection.config;
+          return authInstance.auth.forceTokenUpdate().then(() => $http({
+            data,
+            method,
+            params,
+            url
+          }));
+        }
+
+        return $q.reject(rejection);
+      }
+
+    };
+  }]);
+  this.$get = ["$injector", "$log", "$sniffer", function get($injector, $log, $sniffer) {
+    // Do not try to init anything without config
+    if (!auth) {
+      $log.warn('Auth wasn\'t initialized');
+      return null;
+    }
+
+    if (auth.config.reloadOnUserChange === false) {
+      auth.addListener('userChange', () => {
+        const $route = $injector.get('$route');
+        $route.reload();
+      });
+    }
+    /**
+     * @type {Promise.<string>}
+     */
+
+
+    const authInitPromise = auth.init();
+    /**
+     * @param {string?} restoreLocationURL
+     */
+
+    function restoreLocation(restoreLocationURL) {
+      if (restoreLocationURL) {
+        const bases = document.getElementsByTagName('base');
+        let baseURI = auth.config.redirectUri;
+
+        if (bases.length > 0) {
+          baseURI = bases[0].href;
+        }
+
+        if (restoreLocationURL.indexOf(baseURI) === 0) {
+          const $location = $injector.get('$location');
+          let relativeURI = restoreLocationURL.substr(baseURI.length); // We have to turn url with hash to simple relative url in HashbangInHtml5 mode
+          // And there is no other and documented way to detect that mode
+          // @see http://stackoverflow.com/a/16678065
+
+          if ($location.$$html5 && !$sniffer.history) {
+            // eslint-disable-line angular/no-private-call
+            relativeURI = relativeURI.replace(/^#\//, '');
+          }
+
+          $location.url(relativeURI).replace();
+        }
+      }
+    }
+
+    authInitPromise.then(restoreLocation, e => {
+      if (!e.authRedirect) {
+        $log.error(e);
+      }
+    });
+    return {
+      auth,
+      requestUser: auth.requestUser.bind(auth),
+      clientId: auth.config.clientId,
+      logout: auth.logout.bind(auth),
+      promise: authInitPromise
+    };
+  }];
+}]);
+var authNg = angularModule.name;
+
+export { authNg as default };