@ytsaurus/ui 1.75.0 → 1.76.0

package/dist/public/build/manifest.json

@@ -1,28 +1,28 @@
 {
-  "main.css": "css/main.2d3cbfcd.css",
-  "main.js": "js/main.7981a440.js",
-  "runtime.js": "js/runtime.1c3fbd5b.js",
+  "main.css": "css/main.0efa9da5.css",
+  "main.js": "js/main.2c4538cc.js",
+  "runtime.js": "js/runtime.e1d3f321.js",
   "odin.css": "css/odin.dc2c0c94.chunk.css",
-  "odin.js": "js/odin.df1cfe56.chunk.js",
+  "odin.js": "js/odin.127bf6dc.chunk.js",
   "cluster-menu.css": "css/cluster-menu.d8cafef3.chunk.css",
   "cluster-menu.js": "js/cluster-menu.381d4a48.chunk.js",
   "cluster-page-wrapper.css": "css/cluster-page-wrapper.4610796b.chunk.css",
-  "cluster-page-wrapper.js": "js/cluster-page-wrapper.894fbacc.chunk.js",
+  "cluster-page-wrapper.js": "js/cluster-page-wrapper.1d5c0664.chunk.js",
   "manage-tokens.css": "css/manage-tokens.67f9bab0.chunk.css",
-  "manage-tokens.js": "js/manage-tokens.286a4da9.chunk.js",
+  "manage-tokens.js": "js/manage-tokens.e1e791fc.chunk.js",
   "app-navigation.css": "css/app-navigation.6955071c.chunk.css",
-  "app-navigation.js": "js/app-navigation.b062662b.chunk.js",
+  "app-navigation.js": "js/app-navigation.13c65573.chunk.js",
   "js/6217.9bd9ce9d.chunk.js": "js/6217.9bd9ce9d.chunk.js",
   "support-comonent.js": "js/support-comonent.96d54c66.chunk.js",
   "yt-user-suggest.js": "js/yt-user-suggest.b961f4da.chunk.js",
   "yt-subject-suggest.css": "css/yt-subject-suggest.83a90268.chunk.css",
   "yt-subject-suggest.js": "js/yt-subject-suggest.6206f1fd.chunk.js",
   "acl.css": "css/acl.902af0d9.chunk.css",
-  "acl.js": "js/acl.dd99876f.chunk.js",
+  "acl.js": "js/acl.4cd54663.chunk.js",
   "default-subject-link.css": "css/default-subject-link.4dc8a973.chunk.css",
   "default-subject-link.js": "js/default-subject-link.17448a19.chunk.js",
   "query-results.css": "css/query-results.9145dc2c.chunk.css",
-  "query-results.js": "js/query-results.733b1795.chunk.js",
+  "query-results.js": "js/query-results.0a05cc41.chunk.js",
   "js/7776.b343bc40.chunk.js": "js/7776.b343bc40.chunk.js",
   "js/897.aff55e07.chunk.js": "js/897.aff55e07.chunk.js",
   "js/4163.848e1939.chunk.js": "js/4163.848e1939.chunk.js",
@@ -167,7 +167,7 @@
   "js/6015.82d07c89.chunk.js": "js/6015.82d07c89.chunk.js",
   "js/9385.68e39c6d.chunk.js": "js/9385.68e39c6d.chunk.js",
   "yt-df-dialog.css": "css/yt-df-dialog.79820430.chunk.css",
-  "yt-df-dialog.js": "js/yt-df-dialog.9ddda260.chunk.js",
+  "yt-df-dialog.js": "js/yt-df-dialog.4ad719bf.chunk.js",
   "ban-page.js": "js/ban-page.b938dd45.chunk.js",
   "components.css": "css/components.fd2fa23a.chunk.css",
   "components.js": "js/components.bbe331cb.chunk.js",
@@ -177,9 +177,9 @@
   "dashboard.css": "css/dashboard.b5a5a3e8.chunk.css",
   "dashboard.js": "js/dashboard.5d885065.chunk.js",
   "system.css": "css/system.fca5f8f3.chunk.css",
-  "system.js": "js/system.f759d3f0.chunk.js",
-  "navigation.css": "css/navigation.0a9042b3.chunk.css",
-  "navigation.js": "js/navigation.105812b5.chunk.js",
+  "system.js": "js/system.de3869c9.chunk.js",
+  "navigation.css": "css/navigation.bf4facc9.chunk.css",
+  "navigation.js": "js/navigation.8103294d.chunk.js",
   "path-viewer.css": "css/path-viewer.aa1a7d26.chunk.css",
   "path-viewer.js": "js/path-viewer.b1b3328d.chunk.js",
   "tablet.css": "css/tablet.94efb459.chunk.css",
@@ -190,14 +190,14 @@
   "groups.js": "js/groups.923ba865.chunk.js",
   "users.css": "css/users.c7f945d8.chunk.css",
   "users.js": "js/users.ddb96e8d.chunk.js",
-  "scheduling.css": "css/scheduling.40c36db6.chunk.css",
-  "scheduling.js": "js/scheduling.b70d4627.chunk.js",
+  "scheduling.css": "css/scheduling.00ec9179.chunk.css",
+  "scheduling.js": "js/scheduling.ad977895.chunk.js",
   "query-tracker.css": "css/query-tracker.94d91868.chunk.css",
-  "query-tracker.js": "js/query-tracker.06cc4fdc.chunk.js",
+  "query-tracker.js": "js/query-tracker.137d1cea.chunk.js",
   "job.css": "css/job.c7c99207.chunk.css",
   "job.js": "js/job.4fc50056.chunk.js",
   "chyt.css": "css/chyt.53f5c505.chunk.css",
-  "chyt.js": "js/chyt.7f99f87d.chunk.js",
+  "chyt.js": "js/chyt.25dce13f.chunk.js",
   "css/1195.0483c72f.chunk.css": "css/1195.0483c72f.chunk.css",
   "js/1195.23ad2156.chunk.js": "js/1195.23ad2156.chunk.js",
   "css/9329.3c9e8bf4.chunk.css": "css/9329.3c9e8bf4.chunk.css",
@@ -207,7 +207,7 @@
   "query-widget.css": "css/query-widget.deb0fab7.chunk.css",
   "query-widget.js": "js/query-widget.4bd0f75f.chunk.js",
   "navigation-flow.css": "css/navigation-flow.cdcf90a6.chunk.css",
-  "navigation-flow.js": "js/navigation-flow.eeb01518.chunk.js",
+  "navigation-flow.js": "js/navigation-flow.6d67215a.chunk.js",
   "tablet-errors-by-bundle.css": "css/tablet-errors-by-bundle.888e2522.chunk.css",
   "tablet-errors-by-bundle.js": "js/tablet-errors-by-bundle.ca917cd6.chunk.js",
   "vcs.css": "css/vcs.ca6825ac.chunk.css",
@@ -372,22 +372,22 @@
   "js/8427.0f8774cc.chunk.js": "js/8427.0f8774cc.chunk.js",
   "js/8356.fd6db053.chunk.js": "js/8356.fd6db053.chunk.js",
   "js/6692.dc416f50.chunk.js": "js/6692.dc416f50.chunk.js",
-  "js/5177.b4cec253.chunk.js": "js/5177.b4cec253.chunk.js",
-  "js/7959.fedd6b2e.chunk.js": "js/7959.fedd6b2e.chunk.js",
-  "js/8390.83f4531a.chunk.js": "js/8390.83f4531a.chunk.js",
+  "js/9569.30eceefe.chunk.js": "js/9569.30eceefe.chunk.js",
+  "js/7959.95ebd185.chunk.js": "js/7959.95ebd185.chunk.js",
+  "js/8390.c3d2de6a.chunk.js": "js/8390.c3d2de6a.chunk.js",
   "js/9045.07f8e292.chunk.js": "js/9045.07f8e292.chunk.js",
   "js/6673.00cb7533.chunk.js": "js/6673.00cb7533.chunk.js",
   "js/2447.b2877275.chunk.js": "js/2447.b2877275.chunk.js",
-  "js/8460.2d4d237e.chunk.js": "js/8460.2d4d237e.chunk.js",
+  "js/8460.fc8e2238.chunk.js": "js/8460.fc8e2238.chunk.js",
   "js/343.b926b68c.chunk.js": "js/343.b926b68c.chunk.js",
   "js/3302.b8eb7c9c.chunk.js": "js/3302.b8eb7c9c.chunk.js",
   "js/1306.2b116196.chunk.js": "js/1306.2b116196.chunk.js",
   "js/3934.054b2b2a.chunk.js": "js/3934.054b2b2a.chunk.js",
-  "js/6729.da9aa02f.chunk.js": "js/6729.da9aa02f.chunk.js",
+  "js/6729.ceb75c7e.chunk.js": "js/6729.ceb75c7e.chunk.js",
   "js/1879.23423388.chunk.js": "js/1879.23423388.chunk.js",
   "js/1983.666923be.chunk.js": "js/1983.666923be.chunk.js",
   "js/1260.534f3f75.chunk.js": "js/1260.534f3f75.chunk.js",
-  "js/8778.e18e655b.chunk.js": "js/8778.e18e655b.chunk.js",
+  "js/8778.f3ea089f.chunk.js": "js/8778.f3ea089f.chunk.js",
   "js/5088.64e090aa.chunk.js": "js/5088.64e090aa.chunk.js",
   "js/3784.80802eb0.chunk.js": "js/3784.80802eb0.chunk.js",
   "json.5239aa2e.worker.js": "json.5239aa2e.worker.js",
@@ -406,30 +406,30 @@
   "assets/images/user-avatar.svg": "assets/images/user-avatar.24a15921.svg",
   "assets/images/ui.jpg": "assets/images/ui.bab31938.jpg",
   "assets/images/cluster-2x.svg": "assets/images/cluster-2x.e53788d6.svg",
-  "main.2d3cbfcd.css.map": "css/main.2d3cbfcd.css.map",
-  "main.7981a440.js.map": "js/main.7981a440.js.map",
-  "runtime.1c3fbd5b.js.map": "js/runtime.1c3fbd5b.js.map",
+  "main.0efa9da5.css.map": "css/main.0efa9da5.css.map",
+  "main.2c4538cc.js.map": "js/main.2c4538cc.js.map",
+  "runtime.e1d3f321.js.map": "js/runtime.e1d3f321.js.map",
   "odin.dc2c0c94.chunk.css.map": "css/odin.dc2c0c94.chunk.css.map",
-  "odin.df1cfe56.chunk.js.map": "js/odin.df1cfe56.chunk.js.map",
+  "odin.127bf6dc.chunk.js.map": "js/odin.127bf6dc.chunk.js.map",
   "cluster-menu.d8cafef3.chunk.css.map": "css/cluster-menu.d8cafef3.chunk.css.map",
   "cluster-menu.381d4a48.chunk.js.map": "js/cluster-menu.381d4a48.chunk.js.map",
   "cluster-page-wrapper.4610796b.chunk.css.map": "css/cluster-page-wrapper.4610796b.chunk.css.map",
-  "cluster-page-wrapper.894fbacc.chunk.js.map": "js/cluster-page-wrapper.894fbacc.chunk.js.map",
+  "cluster-page-wrapper.1d5c0664.chunk.js.map": "js/cluster-page-wrapper.1d5c0664.chunk.js.map",
   "manage-tokens.67f9bab0.chunk.css.map": "css/manage-tokens.67f9bab0.chunk.css.map",
-  "manage-tokens.286a4da9.chunk.js.map": "js/manage-tokens.286a4da9.chunk.js.map",
+  "manage-tokens.e1e791fc.chunk.js.map": "js/manage-tokens.e1e791fc.chunk.js.map",
   "app-navigation.6955071c.chunk.css.map": "css/app-navigation.6955071c.chunk.css.map",
-  "app-navigation.b062662b.chunk.js.map": "js/app-navigation.b062662b.chunk.js.map",
+  "app-navigation.13c65573.chunk.js.map": "js/app-navigation.13c65573.chunk.js.map",
   "6217.9bd9ce9d.chunk.js.map": "js/6217.9bd9ce9d.chunk.js.map",
   "support-comonent.96d54c66.chunk.js.map": "js/support-comonent.96d54c66.chunk.js.map",
   "yt-user-suggest.b961f4da.chunk.js.map": "js/yt-user-suggest.b961f4da.chunk.js.map",
   "yt-subject-suggest.83a90268.chunk.css.map": "css/yt-subject-suggest.83a90268.chunk.css.map",
   "yt-subject-suggest.6206f1fd.chunk.js.map": "js/yt-subject-suggest.6206f1fd.chunk.js.map",
   "acl.902af0d9.chunk.css.map": "css/acl.902af0d9.chunk.css.map",
-  "acl.dd99876f.chunk.js.map": "js/acl.dd99876f.chunk.js.map",
+  "acl.4cd54663.chunk.js.map": "js/acl.4cd54663.chunk.js.map",
   "default-subject-link.4dc8a973.chunk.css.map": "css/default-subject-link.4dc8a973.chunk.css.map",
   "default-subject-link.17448a19.chunk.js.map": "js/default-subject-link.17448a19.chunk.js.map",
   "query-results.9145dc2c.chunk.css.map": "css/query-results.9145dc2c.chunk.css.map",
-  "query-results.733b1795.chunk.js.map": "js/query-results.733b1795.chunk.js.map",
+  "query-results.0a05cc41.chunk.js.map": "js/query-results.0a05cc41.chunk.js.map",
   "7776.b343bc40.chunk.js.map": "js/7776.b343bc40.chunk.js.map",
   "897.aff55e07.chunk.js.map": "js/897.aff55e07.chunk.js.map",
   "4163.848e1939.chunk.js.map": "js/4163.848e1939.chunk.js.map",
@@ -574,7 +574,7 @@
   "6015.82d07c89.chunk.js.map": "js/6015.82d07c89.chunk.js.map",
   "9385.68e39c6d.chunk.js.map": "js/9385.68e39c6d.chunk.js.map",
   "yt-df-dialog.79820430.chunk.css.map": "css/yt-df-dialog.79820430.chunk.css.map",
-  "yt-df-dialog.9ddda260.chunk.js.map": "js/yt-df-dialog.9ddda260.chunk.js.map",
+  "yt-df-dialog.4ad719bf.chunk.js.map": "js/yt-df-dialog.4ad719bf.chunk.js.map",
   "ban-page.b938dd45.chunk.js.map": "js/ban-page.b938dd45.chunk.js.map",
   "components.fd2fa23a.chunk.css.map": "css/components.fd2fa23a.chunk.css.map",
   "components.bbe331cb.chunk.js.map": "js/components.bbe331cb.chunk.js.map",
@@ -584,9 +584,9 @@
   "dashboard.b5a5a3e8.chunk.css.map": "css/dashboard.b5a5a3e8.chunk.css.map",
   "dashboard.5d885065.chunk.js.map": "js/dashboard.5d885065.chunk.js.map",
   "system.fca5f8f3.chunk.css.map": "css/system.fca5f8f3.chunk.css.map",
-  "system.f759d3f0.chunk.js.map": "js/system.f759d3f0.chunk.js.map",
-  "navigation.0a9042b3.chunk.css.map": "css/navigation.0a9042b3.chunk.css.map",
-  "navigation.105812b5.chunk.js.map": "js/navigation.105812b5.chunk.js.map",
+  "system.de3869c9.chunk.js.map": "js/system.de3869c9.chunk.js.map",
+  "navigation.bf4facc9.chunk.css.map": "css/navigation.bf4facc9.chunk.css.map",
+  "navigation.8103294d.chunk.js.map": "js/navigation.8103294d.chunk.js.map",
   "path-viewer.aa1a7d26.chunk.css.map": "css/path-viewer.aa1a7d26.chunk.css.map",
   "path-viewer.b1b3328d.chunk.js.map": "js/path-viewer.b1b3328d.chunk.js.map",
   "tablet.94efb459.chunk.css.map": "css/tablet.94efb459.chunk.css.map",
@@ -597,14 +597,14 @@
   "groups.923ba865.chunk.js.map": "js/groups.923ba865.chunk.js.map",
   "users.c7f945d8.chunk.css.map": "css/users.c7f945d8.chunk.css.map",
   "users.ddb96e8d.chunk.js.map": "js/users.ddb96e8d.chunk.js.map",
-  "scheduling.40c36db6.chunk.css.map": "css/scheduling.40c36db6.chunk.css.map",
-  "scheduling.b70d4627.chunk.js.map": "js/scheduling.b70d4627.chunk.js.map",
+  "scheduling.00ec9179.chunk.css.map": "css/scheduling.00ec9179.chunk.css.map",
+  "scheduling.ad977895.chunk.js.map": "js/scheduling.ad977895.chunk.js.map",
   "query-tracker.94d91868.chunk.css.map": "css/query-tracker.94d91868.chunk.css.map",
-  "query-tracker.06cc4fdc.chunk.js.map": "js/query-tracker.06cc4fdc.chunk.js.map",
+  "query-tracker.137d1cea.chunk.js.map": "js/query-tracker.137d1cea.chunk.js.map",
   "job.c7c99207.chunk.css.map": "css/job.c7c99207.chunk.css.map",
   "job.4fc50056.chunk.js.map": "js/job.4fc50056.chunk.js.map",
   "chyt.53f5c505.chunk.css.map": "css/chyt.53f5c505.chunk.css.map",
-  "chyt.7f99f87d.chunk.js.map": "js/chyt.7f99f87d.chunk.js.map",
+  "chyt.25dce13f.chunk.js.map": "js/chyt.25dce13f.chunk.js.map",
   "1195.0483c72f.chunk.css.map": "css/1195.0483c72f.chunk.css.map",
   "1195.23ad2156.chunk.js.map": "js/1195.23ad2156.chunk.js.map",
   "9329.3c9e8bf4.chunk.css.map": "css/9329.3c9e8bf4.chunk.css.map",
@@ -614,7 +614,7 @@
   "query-widget.deb0fab7.chunk.css.map": "css/query-widget.deb0fab7.chunk.css.map",
   "query-widget.4bd0f75f.chunk.js.map": "js/query-widget.4bd0f75f.chunk.js.map",
   "navigation-flow.cdcf90a6.chunk.css.map": "css/navigation-flow.cdcf90a6.chunk.css.map",
-  "navigation-flow.eeb01518.chunk.js.map": "js/navigation-flow.eeb01518.chunk.js.map",
+  "navigation-flow.6d67215a.chunk.js.map": "js/navigation-flow.6d67215a.chunk.js.map",
   "tablet-errors-by-bundle.888e2522.chunk.css.map": "css/tablet-errors-by-bundle.888e2522.chunk.css.map",
   "tablet-errors-by-bundle.ca917cd6.chunk.js.map": "js/tablet-errors-by-bundle.ca917cd6.chunk.js.map",
   "vcs.ca6825ac.chunk.css.map": "css/vcs.ca6825ac.chunk.css.map",
@@ -779,22 +779,22 @@
   "8427.0f8774cc.chunk.js.map": "js/8427.0f8774cc.chunk.js.map",
   "8356.fd6db053.chunk.js.map": "js/8356.fd6db053.chunk.js.map",
   "6692.dc416f50.chunk.js.map": "js/6692.dc416f50.chunk.js.map",
-  "5177.b4cec253.chunk.js.map": "js/5177.b4cec253.chunk.js.map",
-  "7959.fedd6b2e.chunk.js.map": "js/7959.fedd6b2e.chunk.js.map",
-  "8390.83f4531a.chunk.js.map": "js/8390.83f4531a.chunk.js.map",
+  "9569.30eceefe.chunk.js.map": "js/9569.30eceefe.chunk.js.map",
+  "7959.95ebd185.chunk.js.map": "js/7959.95ebd185.chunk.js.map",
+  "8390.c3d2de6a.chunk.js.map": "js/8390.c3d2de6a.chunk.js.map",
   "9045.07f8e292.chunk.js.map": "js/9045.07f8e292.chunk.js.map",
   "6673.00cb7533.chunk.js.map": "js/6673.00cb7533.chunk.js.map",
   "2447.b2877275.chunk.js.map": "js/2447.b2877275.chunk.js.map",
-  "8460.2d4d237e.chunk.js.map": "js/8460.2d4d237e.chunk.js.map",
+  "8460.fc8e2238.chunk.js.map": "js/8460.fc8e2238.chunk.js.map",
   "343.b926b68c.chunk.js.map": "js/343.b926b68c.chunk.js.map",
   "3302.b8eb7c9c.chunk.js.map": "js/3302.b8eb7c9c.chunk.js.map",
   "1306.2b116196.chunk.js.map": "js/1306.2b116196.chunk.js.map",
   "3934.054b2b2a.chunk.js.map": "js/3934.054b2b2a.chunk.js.map",
-  "6729.da9aa02f.chunk.js.map": "js/6729.da9aa02f.chunk.js.map",
+  "6729.ceb75c7e.chunk.js.map": "js/6729.ceb75c7e.chunk.js.map",
   "1879.23423388.chunk.js.map": "js/1879.23423388.chunk.js.map",
   "1983.666923be.chunk.js.map": "js/1983.666923be.chunk.js.map",
   "1260.534f3f75.chunk.js.map": "js/1260.534f3f75.chunk.js.map",
-  "8778.e18e655b.chunk.js.map": "js/8778.e18e655b.chunk.js.map",
+  "8778.f3ea089f.chunk.js.map": "js/8778.f3ea089f.chunk.js.map",
   "5088.64e090aa.chunk.js.map": "js/5088.64e090aa.chunk.js.map",
   "3784.80802eb0.chunk.js.map": "js/3784.80802eb0.chunk.js.map"
 }

package/dist/server/components/oauth.d.ts

@@ -9,6 +9,7 @@ export declare function getOAuthSettings(req: Request): {
     clientSecret: string;
     scope: string;
     buttonLabel?: string;
+    callbackBaseUrl?: string;
 };
 export type OAuthAuthorizationTokens = {
     access_token: string;
@@ -20,7 +21,7 @@ export declare function isUserOAuthLogged(req: Request): boolean;
 export declare function getOAuthAccessToken(req: Request, res: Response): Promise<any>;
 export declare function removeOAuthCookies(res: Response): void;
 export declare function saveOAuthTokensInCookies(res: Response, tokens: OAuthAuthorizationTokens): void;
-export declare function getOAuthLoginPath(req: Request): string;
+export declare function getOAuthLoginPath(req: Request, res: Response): string;
 export declare function getOAuthLogoutPath(req: Request): string;
 export declare function refreshOAuthToken(req: Request, token: string): Promise<OAuthAuthorizationTokens>;
 export declare function exchangeOAuthToken(req: Request, code: string): Promise<OAuthAuthorizationTokens>;

package/dist/server/components/oauth.js

@@ -14,7 +14,13 @@ exports.getOAuthLogoutPath = getOAuthLogoutPath;
 exports.refreshOAuthToken = refreshOAuthToken;
 exports.exchangeOAuthToken = exchangeOAuthToken;
 const axios_1 = __importDefault(require("axios"));
+const node_crypto_1 = __importDefault(require("node:crypto"));
 const constants_1 = require("../../shared/constants");
+function getRedirectURL(req) {
+    var _a;
+    const config = getOAuthSettings(req);
+    return (_a = config.callbackBaseUrl) !== null && _a !== void 0 ? _a : `https://${req.get('host')}`;
+}
 function isOAuthAllowed(req) {
     const config = req.ctx.config.ytOAuthSettings;
     return Boolean(config &&
@@ -64,14 +70,18 @@ function saveOAuthTokensInCookies(res, tokens) {
         });
     }
 }
-function getOAuthLoginPath(req) {
+function getOAuthLoginPath(req, res) {
+    var _a, _b, _c;
+    const { pathname, search, origin } = new URL((_a = req.get('referrer')) !== null && _a !== void 0 ? _a : '');
+    const state = `state_${node_crypto_1.default.randomUUID()}`;
+    res.cookie(state, { retPath: pathname + search });
     const config = getOAuthSettings(req);
-    const host = req.get('host');
     const params = new URLSearchParams({
         response_type: 'code',
         client_id: config.clientId,
         scope: config.scope,
-        redirect_uri: `https://${host}/api/oauth/callback`,
+        redirect_uri: `${(_c = (_b = config.callbackBaseUrl) !== null && _b !== void 0 ? _b : origin) !== null && _c !== void 0 ? _c : `https://${req.get('host')}`}/api/oauth/callback`,
+        state,
     });
     const url = new URL(config.authPath, config.baseURL);
     url.search = params.toString();
@@ -82,9 +92,8 @@ function getOAuthLogoutPath(req) {
     if (!config.logoutPath) {
         return '/api/oauth/logout/callback';
     }
-    const host = req.get('host');
     const params = new URLSearchParams({
-        post_logout_redirect_uri: `https://${host}/api/oauth/logout/callback`,
+        post_logout_redirect_uri: `${getRedirectURL(req)}/api/oauth/logout/callback`,
         client_id: config.clientId,
     });
     const url = new URL(config.logoutPath, config.baseURL);
@@ -108,13 +117,12 @@ async function refreshOAuthToken(req, token) {
 }
 async function exchangeOAuthToken(req, code) {
     const config = getOAuthSettings(req);
-    const host = req.get('host');
     const params = new URLSearchParams({
         grant_type: 'authorization_code',
         client_id: config.clientId,
         code: code,
         client_secret: config.clientSecret,
-        redirect_uri: `https://${host}/api/oauth/callback`,
+        redirect_uri: `${getRedirectURL(req)}/api/oauth/callback`,
     });
     const { data } = await axios_1.default.post(new URL(config.tokenPath, config.baseURL).toString(), params.toString(), {
         headers: {

package/dist/server/controllers/oauth-login.js

@@ -5,21 +5,26 @@ exports.oauthLogout = oauthLogout;
 exports.oauthCallback = oauthCallback;
 const oauth_1 = require("../components/oauth");
 function oauthLogin(req, res) {
-    res.redirect((0, oauth_1.getOAuthLoginPath)(req));
+    res.redirect((0, oauth_1.getOAuthLoginPath)(req, res));
 }
 function oauthLogout(_, res) {
     (0, oauth_1.removeOAuthCookies)(res);
     res.redirect('/');
 }
 async function oauthCallback(req, res) {
-    const { code } = req.query;
+    var _a, _b;
+    const { code, state } = req.query;
     if (!code) {
         throw new Error('Authorization code is not specified');
     }
+    let redirectURL = '/';
+    if (state) {
+        redirectURL = (_b = (_a = req.cookies[state]) === null || _a === void 0 ? void 0 : _a.retPath) !== null && _b !== void 0 ? _b : '/';
+    }
     try {
         const tokens = await (0, oauth_1.exchangeOAuthToken)(req, code);
         (0, oauth_1.saveOAuthTokensInCookies)(res, tokens);
-        res.redirect('/');
+        res.redirect(redirectURL);
     }
     catch (e) {
         req.ctx.logError('exchange token error', e);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ytsaurus/ui",
-  "version": "1.75.0",
+  "version": "1.76.0",
   "repository": {
     "type": "github",
     "url": "https://github.com/ytsaurus/ytsaurus-ui/tree/main/packages/ui"
@@ -188,7 +188,7 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "6c5bfe845a863b830eef64b9649c614be3efb257",
+  "gitHead": "61231dbc33588ddf44ac8dc971149155dccdc5ab",
   "overrides": {
     "axios": "$axios",
     "react-split-pane": {