@jetbrains/ring-ui 7.0.0-beta.8 → 7.0.0

package/babel.config.js

@@ -5,24 +5,30 @@ module.exports = function config(api) {
 
   return {
     presets: [
-      ['@jetbrains/babel-preset-jetbrains', {
-        typeScript: true,
-        useBuiltIns: 'usage',
-        corejs: '3',
-        react: {
-          runtime: 'automatic'
-        }
-      }]
+      [
+        '@jetbrains/babel-preset-jetbrains',
+        {
+          typeScript: true,
+          useBuiltIns: 'usage',
+          corejs: '3',
+          react: {
+            runtime: 'automatic',
+          },
+        },
+      ],
     ],
     plugins: [
-      ['babel-plugin-transform-define', {
-        SUPPORTED_BROWSERS: browserslist()
-      }]
+      [
+        'babel-plugin-transform-define',
+        {
+          SUPPORTED_BROWSERS: browserslist(),
+        },
+      ],
     ],
     env: {
       test: {
-        plugins: ['require-context-hook']
-      }
-    }
+        plugins: ['require-context-hook'],
+      },
+    },
   };
 };

package/components/alert/alert.css

@@ -1,9 +1,9 @@
 @import "../global/variables.css";
 
-@value animation-duration: 300ms;
-@value animation-easing: ease-out;
-
 .alert {
+  --ring-alert-animation-duration: 300ms;
+  --ring-alert-animation-easing: ease-out;
+
   position: relative;
 
   display: flex;
@@ -15,9 +15,9 @@
   padding: 0 calc(var(--ring-unit) * 2);
 
   transition:
-    transform animation-duration animation-easing,
-    margin-bottom animation-duration animation-easing,
-    opacity animation-duration animation-easing;
+    transform var(--ring-alert-animation-duration) var(--ring-alert-animation-easing),
+    margin-bottom var(--ring-alert-animation-duration) var(--ring-alert-animation-easing),
+    opacity var(--ring-alert-animation-duration) var(--ring-alert-animation-easing);
   white-space: nowrap;
   pointer-events: auto;
 
@@ -124,7 +124,7 @@
 
 .animationOpen {
   animation-name: show;
-  animation-duration: animation-duration;
+  animation-duration: var(--ring-alert-animation-duration);
 }
 
 .animationClosing {

package/components/alert/alert.d.ts

@@ -22,8 +22,8 @@ export interface AlertProps {
     /**
      * Fires when alert starts closing if timeout is out or user clicks "Close" button
      */
-    onCloseRequest: ((event?: React.MouseEvent<HTMLElement>) => void);
-    onClose: (() => void);
+    onCloseRequest: (event?: React.MouseEvent<HTMLElement>) => void;
+    onClose: () => void;
     isShaking: boolean;
     isClosing: boolean;
     /**

package/components/alert/alert.js

@@ -35,7 +35,7 @@ export var AlertType;
 const TypeToIcon = {
     [AlertType.ERROR]: exceptionIcon,
     [AlertType.SUCCESS]: checkmarkIcon,
-    [AlertType.WARNING]: warningIcon
+    [AlertType.WARNING]: warningIcon,
 };
 /**
  * Lookup table of alert type to icon color.
@@ -44,7 +44,7 @@ const TypeToIcon = {
 const TypeToIconColor = {
     [AlertType.ERROR]: Color.RED,
     [AlertType.SUCCESS]: Color.GREEN,
-    [AlertType.WARNING]: Color.WHITE
+    [AlertType.WARNING]: Color.WHITE,
 };
 /**
  * @constructor
@@ -66,10 +66,10 @@ export default class Alert extends PureComponent {
         isShaking: false,
         timeout: 0,
         onClose: () => { },
-        onCloseRequest: () => { }
+        onCloseRequest: () => { },
     };
     state = {
-        height: null
+        height: null,
     };
     componentDidMount() {
         if (this.props.timeout > 0) {
@@ -115,7 +115,7 @@ export default class Alert extends PureComponent {
      */
     _getCaption() {
         return (<span className={classNames(styles.caption, this.props.captionClassName, {
-                [styles.withCloseButton]: this.props.closeable
+                [styles.withCloseButton]: this.props.closeable,
             })} onClick={this._handleCaptionsLinksClick} 
         // We only process clicks on `a` elements, see above
         role="presentation">
@@ -129,10 +129,10 @@ export default class Alert extends PureComponent {
     _getIcon() {
         const glyph = TypeToIcon[this.props.type];
         if (glyph) {
-            return (<Icon glyph={glyph} className={styles.icon} color={TypeToIconColor[this.props.type] || Color.DEFAULT}/>);
+            return <Icon glyph={glyph} className={styles.icon} color={TypeToIconColor[this.props.type] || Color.DEFAULT}/>;
         }
         else if (this.props.type === AlertType.LOADING) {
-            return (<Loader className={styles.loader}/>);
+            return <Loader className={styles.loader}/>;
         }
         return '';
     }
@@ -140,23 +140,21 @@ export default class Alert extends PureComponent {
         this.node = node;
     };
     render() {
-        const { type, inline, isClosing, isShaking, closeButtonClassName, showWithAnimation, className, 'data-test': dataTest, theme } = this.props;
+        const { type, inline, isClosing, isShaking, closeButtonClassName, showWithAnimation, className, 'data-test': dataTest, theme, } = this.props;
         const classes = classNames(className, {
             [styles.alert]: true,
             [styles.animationOpen]: showWithAnimation,
             [styles.error]: type === 'error',
             [styles.alertInline]: inline,
             [styles.animationClosing]: isClosing,
-            [styles.animationShaking]: isShaking
+            [styles.animationShaking]: isShaking,
         });
         const height = this.state.height;
         const style = height ? { marginBottom: -height } : undefined;
         return (<ThemeProvider theme={theme} className={classes} data-test={dataTests('alert', dataTest)} data-test-type={type} style={style} ref={this.storeAlertRef}>
         {this._getIcon()}
         {this._getCaption()}
-        {this.props.closeable
-                ? (<Button icon={closeIcon} className={classNames(styles.close, closeButtonClassName)} data-test="alert-close" aria-label="close alert" onClick={this.closeRequest}/>)
-                : ''}
+        {this.props.closeable ? (<Button icon={closeIcon} className={classNames(styles.close, closeButtonClassName)} data-test="alert-close" aria-label="close alert" onClick={this.closeRequest}/>) : ('')}
       </ThemeProvider>);
     }
 }

package/components/alert/container.js

@@ -17,7 +17,7 @@ export default class Alerts extends PureComponent {
                 }
                 const alertClassNames = classNames(styles.alertInContainer, child.props.className);
                 return cloneElement(child, {
-                    className: alertClassNames
+                    className: alertClassNames,
                 });
             })}
       </div>, document.body);

package/components/alert-service/alert-service.js

@@ -20,7 +20,9 @@ class AlertService {
         return (<AlertContainer>
         {alerts.map(alert => {
                 const { message, key, ...rest } = alert;
-                return (<Alert key={key} {...rest}>{message}</Alert>);
+                return (<Alert key={key} {...rest}>
+              {message}
+            </Alert>);
             })}
       </AlertContainer>);
     }
@@ -78,7 +80,7 @@ class AlertService {
                 onClose?.();
                 this.removeWithoutAnimation(alert.key);
             },
-            ...restOptions
+            ...restOptions,
         };
         this.showingAlerts = [alert, ...this.showingAlerts];
         this.renderAlerts();

package/components/analytics/analytics__custom-plugin.js

@@ -12,7 +12,7 @@ export default class AnalyticsCustomPlugin {
         this.config({
             send,
             isDevelopment,
-            flushInterval
+            flushInterval,
         });
     }
     config(config) {

package/components/auth/auth.js

@@ -36,7 +36,7 @@ import Auth from './auth__core';
 Auth.DEFAULT_CONFIG = {
     ...Auth.DEFAULT_CONFIG,
     EmbeddedLoginFlow: WindowFlow,
-    onBackendDown: defaultOnBackendDown
+    onBackendDown: defaultOnBackendDown,
 };
 export * from './auth__core';
 export default Auth;

package/components/auth/auth__core.js

@@ -43,7 +43,7 @@ const DEFAULT_CONFIG = {
     onBackendDown: () => () => { },
     defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
     waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
-    translations: null
+    translations: null,
 };
 export default class Auth {
     static DEFAULT_CONFIG = DEFAULT_CONFIG;
@@ -76,7 +76,7 @@ export default class Auth {
             throw new Error('Config is required');
         }
         if (config.serverUri == null) {
-            throw new Error('\"serverUri\" property is required');
+            throw new Error('"serverUri" property is required');
         }
         const unsupportedParams = ['redirect_uri', 'request_credentials', 'client_id'].filter(param => config.hasOwnProperty(param));
         if (unsupportedParams.length !== 0) {
@@ -91,8 +91,8 @@ export default class Auth {
         }
         this.config.userParams = {
             query: {
-                fields: [...new Set(Auth.DEFAULT_CONFIG.userFields.concat(config.userFields))].join()
-            }
+                fields: [...new Set(Auth.DEFAULT_CONFIG.userFields.concat(config.userFields))].join(),
+            },
         };
         if (!scope.includes(Auth.DEFAULT_CONFIG.clientId)) {
             scope.push(Auth.DEFAULT_CONFIG.clientId);
@@ -101,7 +101,7 @@ export default class Auth {
             messagePrefix: `${clientId}-message-`,
             stateKeyPrefix: `${clientId}-states-`,
             tokenKey: `${clientId}-token`,
-            userKey: `${clientId}-user-`
+            userKey: `${clientId}-user-`,
         });
         this._domainStorage = new AuthStorage({ messagePrefix: 'domain-message-' });
         this._requestBuilder = new AuthRequestBuilder({
@@ -110,22 +110,18 @@ export default class Auth {
             redirect,
             redirectUri,
             requestCredentials,
-            scopes: scope
+            scopes: scope,
         }, this._storage);
         let { backgroundRefreshTimeout } = this.config;
         if (!backgroundRefreshTimeout) {
-            backgroundRefreshTimeout = this.config.embeddedLogin
-                ? DEFAULT_BACKGROUND_TIMEOUT
-                : BACKGROUND_REDIRECT_TIMEOUT;
+            backgroundRefreshTimeout = this.config.embeddedLogin ? DEFAULT_BACKGROUND_TIMEOUT : BACKGROUND_REDIRECT_TIMEOUT;
         }
         this._backgroundFlow = new BackgroundFlow(this._requestBuilder, this._storage, backgroundRefreshTimeout);
         if (this.config.EmbeddedLoginFlow) {
             this._embeddedFlow = new this.config.EmbeddedLoginFlow(this._requestBuilder, this._storage, this.config.translations ?? getTranslationsWithFallback());
         }
         const API_BASE = this.config.serverUri + Auth.API_PATH;
-        const fetchConfig = config.fetchCredentials
-            ? { credentials: config.fetchCredentials }
-            : undefined;
+        const fetchConfig = config.fetchCredentials ? { credentials: config.fetchCredentials } : undefined;
         this.http = new HTTP(this, API_BASE, fetchConfig);
         const getUser = async (token) => {
             const user = await this.getUser(token);
@@ -163,7 +159,7 @@ export default class Auth {
     _updateDomainUser(userID) {
         this._domainStorage.sendMessage(DOMAIN_USER_CHANGED_EVENT, {
             userID,
-            serviceID: this.config.clientId
+            serviceID: this.config.clientId,
         });
     }
     addListener(event, handler) {
@@ -333,7 +329,7 @@ export default class Auth {
             if (Auth.storageIsUnavailable) {
                 return null; // Forever guest if storage is unavailable
             }
-            return await this._tokenValidator?.validateTokenLocally() ?? null;
+            return (await this._tokenValidator?.validateTokenLocally()) ?? null;
         }
         catch (e) {
             return this.forceTokenUpdate();
@@ -357,7 +353,7 @@ export default class Auth {
             this._backendCheckPromise = null;
         }
         try {
-            return await this._backgroundFlow?.authorize() ?? null;
+            return (await this._backgroundFlow?.authorize()) ?? null;
         }
         catch (error) {
             if (!(error instanceof Error)) {
@@ -375,7 +371,7 @@ export default class Auth {
                                 this._showAuthDialog({
                                     nonInteractive: true,
                                     error: retryError,
-                                    onTryAgain
+                                    onTryAgain,
                                 });
                             }
                             throw retryError;
@@ -384,7 +380,7 @@ export default class Auth {
                     this._showAuthDialog({
                         nonInteractive: true,
                         error: error,
-                        onTryAgain
+                        onTryAgain,
                     });
                 });
             }
@@ -402,7 +398,7 @@ export default class Auth {
             return;
         }
         try {
-            const { serviceName, iconUrl: serviceImage } = await this.http.get(`oauth2/interactive/login/settings?client_id=${this.config.clientId}`) || {};
+            const { serviceName, iconUrl: serviceImage } = (await this.http.get(`oauth2/interactive/login/settings?client_id=${this.config.clientId}`)) || {};
             this.setCurrentService({ serviceImage, serviceName });
         }
         catch (e) {
@@ -469,7 +465,7 @@ export default class Auth {
                 onPostpone: () => {
                     this.listeners.trigger(USER_CHANGE_POSTPONED_EVENT);
                     this.config.onPostponeChangedUser(this.user, user);
-                }
+                },
             });
         }
     }
@@ -531,7 +527,7 @@ export default class Auth {
             errorMessage: this._extractErrorMessage(error, true),
             onConfirm,
             onCancel,
-            onTryAgain: onTryAgain ? onTryAgainClick : undefined
+            onTryAgain: onTryAgain ? onTryAgainClick : undefined,
         });
         const stopTokenListening = this._storage?.onTokenChange(token => {
             if (token) {
@@ -551,9 +547,10 @@ export default class Auth {
         };
         const hide = this._authDialogService?.({
             ...this._service,
-            title: translations?.youHaveLoggedInAs ?? translate('youHaveLoggedInAs').
-                replace('%userName%', newUser.name ?? '').
-                replace('{{userName}}', newUser.name ?? ''),
+            title: translations?.youHaveLoggedInAs ??
+                translate('youHaveLoggedInAs')
+                    .replace('%userName%', newUser.name ?? '')
+                    .replace('{{userName}}', newUser.name ?? ''),
             loginCaption: translations?.login ?? translate('login'),
             loginToCaption: translations?.loginTo ?? translate('loginTo'),
             confirmLabel: translations?.applyChange ?? translate('applyChange'),
@@ -566,7 +563,7 @@ export default class Auth {
             onCancel: () => {
                 done();
                 onPostpone();
-            }
+            },
         });
     }
     _extractErrorMessage(error, logError = false) {
@@ -580,7 +577,11 @@ export default class Auth {
         try {
             // We've got some error from this list
             // https://www.jetbrains.com/help/youtrack/devportal/OAuth-2.0-Errors.html
-            if ('code' in error && error.code && typeof error.code === 'object' && 'code' in error.code && typeof error.code.code === 'string') {
+            if ('code' in error &&
+                error.code &&
+                typeof error.code === 'object' &&
+                'code' in error.code &&
+                typeof error.code.code === 'string') {
                 const readableCode = error.code.code.split('_').join(' ');
                 return `Authorization error: ${readableCode}`;
             }
@@ -619,8 +620,10 @@ export default class Auth {
                 reject(new Error('Auth(@jetbrains/ring-ui): postponed by user'));
             };
             const hide = onBackendDown({
-                onCheckAgain, onPostpone, backendError,
-                translations: translations ?? getTranslationsWithFallback()
+                onCheckAgain,
+                onPostpone,
+                backendError,
+                translations: translations ?? getTranslationsWithFallback(),
             });
             window.addEventListener('online', onCheckAgain);
             function networkWatchdog() {
@@ -639,7 +642,7 @@ export default class Auth {
         const requestParams = {
             // eslint-disable-next-line camelcase
             request_credentials: 'required',
-            ...extraParams
+            ...extraParams,
         };
         await this._checkBackendsStatusesIfEnabled();
         await this.listeners.trigger('logout');
@@ -713,7 +716,7 @@ export default class Auth {
         return {
             restoreLocation: state,
             created: Date.now(),
-            scopes: defaultScope
+            scopes: defaultScope,
         };
     }
     /**
@@ -759,7 +762,7 @@ export default class Auth {
             this.setHash('');
         }
         const stateId = authResponse?.restoreAuthState;
-        return await (stateId && this._storage?.getState(stateId)) || {};
+        return (await (stateId && this._storage?.getState(stateId))) || {};
     }
     _checkBackendsAreUp() {
         const abortCtrl = new AbortController();
@@ -767,9 +770,9 @@ export default class Auth {
         return Promise.all([
             promiseWithTimeout(this.http.fetch('settings/public?fields=id', { signal: abortCtrl.signal }), backendCheckTimeout, {
                 error: new Error('The authorization server is taking too long to respond. Please try again later.'),
-                onTimeout: () => abortCtrl.abort()
+                onTimeout: () => abortCtrl.abort(),
             }),
-            this.config.checkBackendIsUp()
+            this.config.checkBackendIsUp(),
         ]).catch(err => {
             if (err instanceof TypeError) {
                 throw new TypeError('Could not connect to the server due to network error. Please check your connection and try again.');
@@ -832,10 +835,7 @@ export default class Auth {
             // a record in history.
             // NB! URL to redirect is formed manually because baseURI could be messed up,
             // in which case it's not obvious where redirect will lead.
-            const cleanedUrl = [
-                window.location.pathname,
-                window.location.search
-            ].join('');
+            const cleanedUrl = [window.location.pathname, window.location.search].join('');
             const hashIfExist = hash ? `#${hash}` : '';
             history.replaceState(undefined, '', `${cleanedUrl}${hashIfExist}`);
         }

package/components/auth/background-flow.js

@@ -40,9 +40,9 @@ export default class BackgroundFlow {
      * promise is rejected if no token was received after {@link BackgroundToken.BACKGROUND_TIMEOUT} ms.
      */
     async _load() {
-        const authRequest = await this._requestBuilder.
+        const authRequest = await this._requestBuilder
             // eslint-disable-next-line camelcase
-            prepareAuthRequest({ request_credentials: 'silent' }, { nonRedirect: true });
+            .prepareAuthRequest({ request_credentials: 'silent' }, { nonRedirect: true });
         return new Promise((resolve, reject) => {
             function onMessage(e) {
                 if (e.data === HUB_AUTH_PAGE_OPENED) {

package/components/auth/down-notification.js

@@ -23,7 +23,9 @@ function Message({ translations, onCheckAgain }) {
         <div className={styles.title}>{backendIsNotAvailable}</div>
       </Group>
       <span className={styles.error}>{errorMessage} </span>
-      <Link onClick={onCheckAgain} data-test="check-again">{checkAgain}</Link>
+      <Link onClick={onCheckAgain} data-test="check-again">
+        {checkAgain}
+      </Link>
     </div>);
 }
 export default function onBackendDown({ onCheckAgain, translations }) {

package/components/auth/iframe-flow.js

@@ -22,7 +22,9 @@ export default class IFrameFlow {
         const authRequest = await this._requestBuilder.prepareAuthRequest(
         // eslint-disable-next-line camelcase
         { request_credentials: 'required', auth_mode: 'bypass_to_login' }, { nonRedirect: false });
-        const renderFallbackLink = () => (<Link href={authRequest.url} target="_self">{this._translations.nothingHappensLink}</Link>);
+        const renderFallbackLink = () => (<Link href={authRequest.url} target="_self">
+        {this._translations.nothingHappensLink}
+      </Link>);
         return new Promise((resolve, reject) => {
             this.hideDialog = loginDialogService({
                 url: authRequest.url,
@@ -32,7 +34,7 @@ export default class IFrameFlow {
                     cleanUp();
                     this.stop();
                 },
-                renderFallbackLink
+                renderFallbackLink,
             });
             this.reject = reject;
             const removeTokenListener = this._storage.onTokenChange(token => {

package/components/auth/request-builder.js

@@ -38,19 +38,19 @@ export default class AuthRequestBuilder {
             redirect_uri: this.config.redirectUri,
             request_credentials: this.config.requestCredentials,
             client_id: this.config.clientId,
-            scope: scopes.join(' ')
+            scope: scopes.join(' '),
         }, extraParams || {});
         /* eslint-enable camelcase */
         const authURL = encodeURL(this.config.authorization, request);
         const state = Object.assign({
             restoreLocation: window.location.href,
-            scopes: this.config.scopes
+            scopes: this.config.scopes,
         }, extraState || {});
         await this._saveState(stateId, state);
-        return ({
+        return {
             url: authURL,
-            stateId
-        });
+            stateId,
+        };
     }
     /**
      * @param {string} id

package/components/auth/storage.js

@@ -41,16 +41,16 @@ export default class AuthStorage {
         const StorageConstructor = config.storage || Storage;
         this.stateQuota = config.stateQuota || DEFAULT_STATE_QUOTA;
         this._stateStorage = new StorageConstructor({
-            cookieName: 'ring-state'
+            cookieName: 'ring-state',
         });
         this._tokenStorage = new StorageConstructor({
-            cookieName: 'ring-token'
+            cookieName: 'ring-token',
         });
         this._messagesStorage = new StorageConstructor({
-            cookieName: 'ring-message'
+            cookieName: 'ring-message',
         });
         this._currentUserStorage = new StorageConstructor({
-            cookieName: 'ring-user'
+            cookieName: 'ring-user',
         });
     }
     /**
@@ -132,23 +132,24 @@ export default class AuthStorage {
                 return {
                     key,
                     created,
-                    size: JSON.stringify(state).length
+                    size: JSON.stringify(state).length,
                 };
             }
             return undefined;
         });
         const currentStates = removalResult.filter((state) => state != null);
-        let stateStorageSize = currentStates.
-            reduce((overallSize, state) => state.size + overallSize, 0);
+        let stateStorageSize = currentStates.reduce((overallSize, state) => state.size + overallSize, 0);
         if (stateStorageSize > this.stateQuota) {
             currentStates.sort((a, b) => a.created - b.created);
-            const removalPromises = currentStates.filter(state => {
+            const removalPromises = currentStates
+                .filter(state => {
                 if (stateStorageSize > this.stateQuota) {
                     stateStorageSize -= state.size;
                     return true;
                 }
                 return false;
-            }).map(state => this._stateStorage.remove(state.key));
+            })
+                .map(state => this._stateStorage.remove(state.key));
             return removalPromises.length && Promise.all(removalPromises);
         }
         return undefined;

package/components/auth/token-validator.js

@@ -48,7 +48,7 @@ export default class TokenValidator {
         return this._getValidatedToken([
             TokenValidator._validateExistence,
             TokenValidator._validateExpiration,
-            this._validateScopes.bind(this)
+            this._validateScopes.bind(this),
         ]);
     }
     /**
@@ -60,7 +60,7 @@ export default class TokenValidator {
             TokenValidator._validateExistence,
             TokenValidator._validateExpiration,
             this._validateScopes.bind(this),
-            this._validateAgainstUser.bind(this)
+            this._validateAgainstUser.bind(this),
         ]);
     }
     /**
@@ -82,10 +82,8 @@ export default class TokenValidator {
      */
     static _validateExpiration({ expires, lifeTime }) {
         const REFRESH_BEFORE_RATIO = 6;
-        const refreshBefore = lifeTime
-            ? Math.ceil(lifeTime / REFRESH_BEFORE_RATIO)
-            : TokenValidator.DEFAULT_REFRESH_BEFORE;
-        if (expires && expires < (TokenValidator._epoch() + refreshBefore)) {
+        const refreshBefore = lifeTime ? Math.ceil(lifeTime / REFRESH_BEFORE_RATIO) : TokenValidator.DEFAULT_REFRESH_BEFORE;
+        if (expires && expires < TokenValidator._epoch() + refreshBefore) {
             throw new TokenValidator.TokenValidationError('Token expired');
         }
     }
@@ -97,12 +95,10 @@ export default class TokenValidator {
      */
     _validateScopes(storedToken) {
         const { scope, optionalScopes } = this._config;
-        const requiredScopes = optionalScopes
-            ? scope.filter(scopeId => !optionalScopes.includes(scopeId))
-            : scope;
+        const requiredScopes = optionalScopes ? scope.filter(scopeId => !optionalScopes.includes(scopeId)) : scope;
         const hasAllScopes = requiredScopes.every(scopeId => storedToken.scopes?.includes(scopeId));
         if (!hasAllScopes) {
-            throw new TokenValidator.TokenValidationError('Token doesn\'t match required scopes');
+            throw new TokenValidator.TokenValidationError("Token doesn't match required scopes");
         }
     }
     /**
@@ -111,9 +107,7 @@ export default class TokenValidator {
      * @return {boolean}
      */
     static shouldRefreshToken(error) {
-        return error === 'invalid_grant' ||
-            error === 'invalid_request' ||
-            error === 'invalid_token';
+        return error === 'invalid_grant' || error === 'invalid_request' || error === 'invalid_token';
     }
     /**
      * Check scopes
@@ -134,8 +128,7 @@ export default class TokenValidator {
             catch (e) {
                 // Skip JSON parsing errors
             }
-            if (errorResponse.status === CODE.UNAUTHORIZED ||
-                TokenValidator.shouldRefreshToken(response.error)) {
+            if (errorResponse.status === CODE.UNAUTHORIZED || TokenValidator.shouldRefreshToken(response.error)) {
                 // Token expired
                 throw new TokenValidator.TokenValidationError(response.error || errorResponse.message, errorResponse.data?.error ? new Error(errorResponse.data?.error) : undefined);
             }