@jetbrains/ring-ui 7.0.94 → 7.0.95

package/components/auth/auth-core.d.ts

@@ -80,6 +80,7 @@ export interface AuthConfig extends TokenValidatorConfig {
     translations?: AuthTranslations | null | undefined;
     userParams?: RequestParams | undefined;
     waitForRedirectTimeout: number;
+    rpInitiatedLogout: boolean;
 }
 type AuthPayloadMap = {
     userChange: [AuthUser | undefined | void, void];
@@ -120,6 +121,7 @@ declare class Auth implements HTTPAuth {
     static DEFAULT_CONFIG: Omit<AuthConfig, "serverUri">;
     static API_PATH: string;
     static API_AUTH_PATH: string;
+    static API_LOGOUT_PATH: string;
     static API_PROFILE_PATH: string;
     static CLOSE_BACKEND_DOWN_MESSAGE: string;
     static CLOSE_WINDOW_MESSAGE: string;
@@ -187,7 +189,10 @@ declare class Auth implements HTTPAuth {
     private _extractErrorMessage;
     private _showBackendDownDialog;
     /**
-     * Wipe accessToken and redirect to auth page with required authorization
+     * Wipe accessToken and redirect to logout endpoint.
+     * Uses RP-initiated logout flow (oauth2/logout) when rpInitiatedLogout config is enabled,
+     * falls back to oauth2/auth redirect otherwise.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
      */
     logout(extraParams?: Record<string, unknown>): Promise<void>;
     private _runEmbeddedLogin;

package/components/auth/auth-core.js

@@ -43,12 +43,14 @@ const DEFAULT_CONFIG = {
     onBackendDown: () => () => { },
     defaultExpiresIn: DEFAULT_EXPIRES_TIMEOUT,
     waitForRedirectTimeout: DEFAULT_WAIT_FOR_REDIRECT_TIMEOUT,
+    rpInitiatedLogout: true,
     translations: null,
 };
 class Auth {
     static DEFAULT_CONFIG = DEFAULT_CONFIG;
     static API_PATH = 'api/rest/';
     static API_AUTH_PATH = 'oauth2/auth';
+    static API_LOGOUT_PATH = 'oauth2/logout';
     static API_PROFILE_PATH = 'users/me';
     static CLOSE_BACKEND_DOWN_MESSAGE = 'backend-check-succeeded';
     static CLOSE_WINDOW_MESSAGE = 'close-login-window';
@@ -106,6 +108,7 @@ class Auth {
         this._domainStorage = new AuthStorage({ messagePrefix: 'domain-message-' });
         this._requestBuilder = new AuthRequestBuilder({
             authorization: this.config.serverUri + Auth.API_PATH + Auth.API_AUTH_PATH,
+            logout: this.config.serverUri + Auth.API_PATH + Auth.API_LOGOUT_PATH,
             clientId,
             redirect,
             redirectUri,
@@ -633,20 +636,24 @@ class Auth {
         });
     }
     /**
-     * Wipe accessToken and redirect to auth page with required authorization
+     * Wipe accessToken and redirect to logout endpoint.
+     * Uses RP-initiated logout flow (oauth2/logout) when rpInitiatedLogout config is enabled,
+     * falls back to oauth2/auth redirect otherwise.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
      */
     async logout(extraParams) {
-        const requestParams = {
-            request_credentials: 'required',
-            ...extraParams,
-        };
         await this._checkBackendsStatusesIfEnabled();
         await this.listeners.trigger('logout');
         this._updateDomainUser(null);
         await this._storage?.wipeToken();
-        const authRequest = await this._requestBuilder?.prepareAuthRequest(requestParams);
-        if (authRequest) {
-            this._redirectCurrentPage(authRequest.url);
+        const request = this.config.rpInitiatedLogout
+            ? await this._requestBuilder?.prepareLogoutRequest(extraParams)
+            : await this._requestBuilder?.prepareAuthRequest({
+                request_credentials: 'required',
+                ...extraParams,
+            });
+        if (request) {
+            this._redirectCurrentPage(request.url);
         }
     }
     async _runEmbeddedLogin() {

package/components/auth/request-builder.d.ts

@@ -3,6 +3,7 @@ import type { AuthState } from './storage';
 import type AuthStorage from './storage';
 export interface AuthRequestBuilderConfig {
     authorization: string;
+    logout?: string | null | undefined;
     redirectUri?: string | null | undefined;
     requestCredentials?: string | null | undefined;
     clientId?: string | null | undefined;
@@ -38,6 +39,17 @@ export default class AuthRequestBuilder {
         url: string;
         stateId: string;
     }>;
+    /**
+     * Build a logout URL for RP-initiated logout flow.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
+     *
+     * @param {object=} extraParams additional query parameters for logout request
+     * @return {Promise.<{url: string, stateId: string}>} logout URL with required parameters
+     */
+    prepareLogoutRequest(extraParams?: Record<string, unknown> | null | undefined): Promise<{
+        url: string;
+        stateId: string;
+    }>;
     /**
      * @param {string} id
      * @param {StoredState} storedState

package/components/auth/request-builder.js

@@ -51,6 +51,33 @@ export default class AuthRequestBuilder {
             stateId,
         };
     }
+    /**
+     * Build a logout URL for RP-initiated logout flow.
+     * See: https://youtrack.jetbrains.com/projects/HUB/articles/HUB-A-43#rp-initiated-logout
+     *
+     * @param {object=} extraParams additional query parameters for logout request
+     * @return {Promise.<{url: string, stateId: string}>} logout URL with required parameters
+     */
+    async prepareLogoutRequest(extraParams) {
+        if (!this.config.logout) {
+            throw new Error('Logout URL is not configured');
+        }
+        // eslint-disable-next-line no-underscore-dangle
+        const stateId = AuthRequestBuilder._uuid();
+        const logoutParams = {
+            client_id: this.config.clientId,
+            state: stateId,
+            ...extraParams,
+        };
+        await this._saveState(stateId, {
+            restoreLocation: window.location.href,
+            scopes: [...this.config.scopes],
+        });
+        return {
+            url: encodeURL(this.config.logout, logoutParams),
+            stateId,
+        };
+    }
     /**
      * @param {string} id
      * @param {StoredState} storedState

package/components/tabs/dumb-tabs.js

@@ -15,7 +15,7 @@ class Tabs extends PureComponent {
         const { selected, children } = this.props;
         const childrenArray = React.Children.toArray(children).filter(Boolean);
         const selectedIndex = childrenArray.findIndex((tab, i) => getTabId(tab, i) === selected);
-        const actualSelectedIndex = selectedIndex === -1 ? 0 : selectedIndex;
+        const actualSelectedIndex = selectedIndex === -1 ? childrenArray.findIndex(tab => tab.type !== CustomItem) : selectedIndex;
         const selectedItem = childrenArray[actualSelectedIndex];
         return { selectedItem, selectedKey: getTabId(selectedItem, actualSelectedIndex) };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetbrains/ring-ui",
-  "version": "7.0.94",
+  "version": "7.0.95",
   "description": "JetBrains UI library",
   "author": {
     "name": "JetBrains"