@ytsaurus/ui 1.16.2 → 1.17.1

package/dist/server/controllers/home.js

@@ -35,6 +35,7 @@ const ServerFactory_1 = __importStar(require("../ServerFactory"));
 const utils_2 = require("../utils");
 const default_settings_1 = require("../utils/default-settings");
 const constants_1 = require("../../shared/constants");
+const settings_2 = require("../../server/components/settings");
 function isRootPage(page) {
     var _a;
     const rootPages = [
@@ -44,7 +45,7 @@ function isRootPage(page) {
     return -1 !== rootPages.indexOf(page);
 }
 function homeRedirect(req, res) {
-    const cluster = req.params.cluster;
+    const cluster = req.params.ytAuthCluster;
     const { referrer } = req.query;
     const url = referrer ? referrer : `/${cluster}`;
     res.redirect(url);
@@ -52,8 +53,8 @@ function homeRedirect(req, res) {
 exports.homeRedirect = homeRedirect;
 async function homeIndex(req, res) {
     var _a, _b;
-    const isRoot = isRootPage(req.params.cluster);
-    const cluster = isRoot ? undefined : req.params.cluster;
+    const isRoot = isRootPage(req.params.ytAuthCluster);
+    const cluster = isRoot ? undefined : req.params.ytAuthCluster;
     try {
         const url = await ServerFactory_1.default.getHomeRedirectedUrl(cluster, req);
         if (url) {
@@ -87,10 +88,13 @@ async function homeIndex(req, res) {
             errorMessage: undefined,
         },
     };
-    if (login && useRemoteSettings) {
+    const settingsConfig = (0, settings_2.getSettingsConfig)(cluster);
+    if (login && useRemoteSettings && settingsConfig.cluster) {
         try {
-            await (0, settings_1.create)({ ctx, username: login });
-            const userSettings = login ? await (0, settings_1.get)({ ctx, username: login }) : {};
+            await (0, settings_1.create)({ ctx, username: login, cluster: settingsConfig.cluster });
+            const userSettings = login
+                ? await (0, settings_1.get)({ ctx, username: login, cluster: settingsConfig.cluster })
+                : {};
             settings.data = Object.assign(Object.assign({}, settings.data), userSettings);
         }
         catch (e) {

package/dist/server/controllers/login.js

@@ -13,11 +13,10 @@ const crypto_1 = __importDefault(require("crypto"));
 // @ts-ignore
 const javascript_wrapper_1 = __importDefault(require("@ytsaurus/javascript-wrapper"));
 const cluster_queries_1 = require("../components/cluster-queries");
-const yt_auth_1 = require("../components/yt-auth");
 const yt = (0, javascript_wrapper_1.default)();
 async function handleLogin(req, res) {
     try {
-        const ytAuthCluster = (0, yt_auth_1.getAuthCluster)(req.ctx.config);
+        const { ytAuthCluster } = req.params;
         const { username, password } = JSON.parse(req.body) || {};
         if (!username || !password) {
             throw new Error('Username and password must not be empty');
@@ -34,7 +33,18 @@ async function handleLogin(req, res) {
             responseType: 'stream',
         })
             .then(async (response) => {
-            const pipedSize = await (0, utils_1.pipeAxiosResponse)(req.ctx, res, response, undefined, (headers) => removeSecureFlagIfOriginInsecure(req, headers));
+            const pipedSize = await (0, utils_1.pipeAxiosResponse)(req.ctx, res, response, undefined, (headers) => {
+                if (headers['set-cookie']) {
+                    headers['set-cookie'] = headers['set-cookie'].reduce((ret, item) => {
+                        ret.push(item);
+                        if (item.startsWith(constants_1.YT_CYPRESS_COOKIE_NAME)) {
+                            ret.push(item.replace(constants_1.YT_CYPRESS_COOKIE_NAME, `${ytAuthCluster}:${constants_1.YT_CYPRESS_COOKIE_NAME}`));
+                        }
+                        return ret;
+                    }, []);
+                }
+                return removeSecureFlagIfOriginInsecure(req, headers);
+            });
             if (!pipedSize) {
                 throw new Error(utils_1.UNEXPECTED_PIPE_AXIOS_RESPONSE);
             }
@@ -57,7 +67,7 @@ function removeSecureFlagIfOriginInsecure(req, headers) {
         }
         else {
             const tmp = lodash_1.default.map(v, (item) => {
-                if (item.startsWith(constants_1.YT_CYPRESS_COOKIE_NAME)) {
+                if (item.includes(constants_1.YT_CYPRESS_COOKIE_NAME)) {
                     return item.replace(/\s*Secure;/, '');
                 }
                 return item;
@@ -69,7 +79,10 @@ function removeSecureFlagIfOriginInsecure(req, headers) {
 }
 async function handleChangePassword(req, res) {
     try {
-        const ytAuthCluster = (0, yt_auth_1.getAuthCluster)(req.ctx.config);
+        const ytAuthCluster = req.params.ytAuthCluster;
+        if (!ytAuthCluster) {
+            throw new Error('You have to define ytAuthCluster.');
+        }
         const { newPassword, currentPassword } = JSON.parse(req.body) || {};
         if (!newPassword || !currentPassword) {
             throw new Error('New and current password must not be empty');

package/dist/server/controllers/odin-proxy-api.js

@@ -30,7 +30,7 @@ async function odinProxyApiImpl(req, res) {
     }
     const { ctx, query } = req;
     const search = lodash_1.default.isEmpty(query) ? '' : `?${qs_1.default.stringify(query)}`;
-    const { action, cluster } = req.params;
+    const { action, ytAuthCluster: cluster } = req.params;
     const allowedActionsUrls = {
         service_list: `${odinPath}/service_list`,
         exists: `${odinPath}/${action}/${cluster}`,

package/dist/server/controllers/scheduling-pools.js

@@ -13,11 +13,11 @@ const yt = (0, javascript_wrapper_1.default)();
 async function getClusterPools(req, res) {
     try {
         req.ctx.log('Test', req.params);
-        const { cluster } = req.params;
+        const { ytAuthCluster } = req.params;
         const { poolTree } = req.query;
         let cfg;
         try {
-            cfg = (0, requestsSetup_1.getUserYTApiSetup)(cluster, req);
+            cfg = (0, requestsSetup_1.getUserYTApiSetup)(ytAuthCluster, req);
         }
         catch (e) {
             (0, utils_1.sendAndLogError)(req.ctx, res, 400, e);

package/dist/server/controllers/settings.js

@@ -7,36 +7,36 @@ function sendResponse(_req, res, data) {
     return res.set('content-type', 'application/json').status(200).send(JSON.stringify(data));
 }
 function settingsCreate(req, res) {
-    const { ctx, params: { username }, } = req;
-    return (0, settings_1.create)({ ctx, username })
+    const { ctx, params: { username, ytAuthCluster }, } = req;
+    return (0, settings_1.create)({ ctx, username, cluster: ytAuthCluster })
         .then(sendResponse.bind(null, req, res))
         .catch(utils_1.sendError.bind(null, res));
 }
 exports.settingsCreate = settingsCreate;
 function settingsGet(req, res) {
-    const { ctx, params: { username }, } = req;
-    return (0, settings_1.get)({ ctx, username })
+    const { ctx, params: { username, ytAuthCluster }, } = req;
+    return (0, settings_1.get)({ ctx, username, cluster: ytAuthCluster })
         .then(sendResponse.bind(null, req, res))
         .catch(utils_1.sendError.bind(null, res));
 }
 exports.settingsGet = settingsGet;
 async function settingsGetItem(req, res) {
-    const { ctx, params: { username, path }, } = req;
-    return (0, settings_1.getItem)({ ctx, username, path })
+    const { ctx, params: { username, path, ytAuthCluster }, } = req;
+    return (0, settings_1.getItem)({ ctx, username, path, cluster: ytAuthCluster })
         .then(sendResponse.bind(null, req, res))
         .catch(utils_1.sendError.bind(null, res));
 }
 exports.settingsGetItem = settingsGetItem;
 function settingsSetItem(req, res) {
-    const { ctx, params: { username, path }, body: { value } = {}, } = req;
-    return (0, settings_1.setItem)({ ctx, username, path, value })
+    const { ctx, params: { username, path, ytAuthCluster }, body: { value } = {}, } = req;
+    return (0, settings_1.setItem)({ ctx, username, path, value, cluster: ytAuthCluster })
         .then(sendResponse.bind(null, req, res))
         .catch(utils_1.sendError.bind(null, res));
 }
 exports.settingsSetItem = settingsSetItem;
 function settingsDeleteItem(req, res) {
-    const { ctx, params: { username, path }, } = req;
-    return (0, settings_1.deleteItem)({ ctx, username, path })
+    const { ctx, params: { username, path, ytAuthCluster }, } = req;
+    return (0, settings_1.deleteItem)({ ctx, username, path, cluster: ytAuthCluster })
         .then(sendResponse.bind(null, req, res))
         .catch(utils_1.sendError.bind(null, res));
 }

package/dist/server/controllers/table-column-preset.js

@@ -4,10 +4,10 @@ exports.isUserColumnPresetsEnabled = exports.tableColumnPresetSave = exports.tab
 const table_1 = require("../components/table");
 const utils_1 = require("../utils");
 async function tableColumnPresetGet(req, res) {
-    const { params: { hash }, } = req;
+    const { params: { hash, ytAuthCluster }, } = req;
     try {
         const presetsConfig = checkEnabled(req);
-        const columns = await (0, table_1.getColumnPreset)(presetsConfig, hash);
+        const columns = await (0, table_1.getColumnPreset)(presetsConfig, hash, ytAuthCluster);
         if (!columns) {
             const err = new Error(`Cannot find column-preset by the hash '${hash}'`);
             req.ctx.logError('Failed to get preset of columns', err);
@@ -23,9 +23,10 @@ async function tableColumnPresetGet(req, res) {
 exports.tableColumnPresetGet = tableColumnPresetGet;
 async function tableColumnPresetSave(req, res) {
     const { body } = req;
+    const { params: { ytAuthCluster }, } = req;
     try {
         const presetsConfig = checkEnabled(req);
-        const result = await (0, table_1.saveColumnPreset)(presetsConfig, body);
+        const result = await (0, table_1.saveColumnPreset)(presetsConfig, body, ytAuthCluster);
         res.status(200).send(result);
     }
     catch (err) {

package/dist/server/controllers/yt-api.js

@@ -65,7 +65,7 @@ async function ytTvmApiHandler(req, res) {
     }
     let cfg;
     try {
-        cfg = (0, requestsSetup_1.getUserYTApiSetup)(params.cluster, req);
+        cfg = (0, requestsSetup_1.getUserYTApiSetup)(params.ytAuthCluster, req);
     }
     catch (e) {
         return sendError(e, 400);

package/dist/server/controllers/yt-proxy-api.js

@@ -28,7 +28,7 @@ const ALLOWED_ACTION = {
 };
 async function ytProxyApiImpl(req, res) {
     const { ctx, query } = req;
-    const { command, cluster } = req.params;
+    const { command, ytAuthCluster } = req.params;
     const proxyAction = ALLOWED_ACTION[command];
     if (!proxyAction) {
         throw new Error('Unexpected action ' + command);
@@ -36,7 +36,7 @@ async function ytProxyApiImpl(req, res) {
     const search = lodash_1.default.isEmpty(query) ? '' : `?${qs_1.default.stringify(query)}`;
     let cfg;
     try {
-        cfg = (0, requestsSetup_1.getUserYTApiSetup)(cluster, req);
+        cfg = (0, requestsSetup_1.getUserYTApiSetup)(ytAuthCluster, req);
     }
     catch (e) {
         return (0, utils_1.sendAndLogError)(req.ctx, res, 400, e);

package/dist/server/index.js

@@ -21,17 +21,20 @@ nodekit.ctx.log('AppConfig details', {
     appInstallation,
     appDevMode,
 });
-const { ytAuthCluster, appAuthHandler } = nodekit.config;
-if (ytAuthCluster) {
-    if (appAuthHandler) {
-        nodekit.ctx.fail(new Error('"appAuthHandler" option will be ignored cause "ytAuthCluster" option is provided.'));
-    }
+const { allowPasswordAuth, ytOAuthSettings } = nodekit.config;
+const authMiddlewares = [];
+if (ytOAuthSettings) {
+    authMiddlewares.push((0, authorization_2.authorizationResolver)((0, oauth_1.createOAuthAuthorizationResolver)()));
+}
+if (allowPasswordAuth) {
+    authMiddlewares.push((0, authorization_2.authorizationResolver)((0, yt_auth_1.createYTAuthorizationResolver)()));
+}
+if (authMiddlewares.length) {
     nodekit.config.appBeforeAuthMiddleware = [
         ...(nodekit.config.appBeforeAuthMiddleware || []),
-        (0, authorization_2.authorizationResolver)((0, oauth_1.createOAuthAuthorizationResolver)()),
-        (0, authorization_2.authorizationResolver)((0, yt_auth_1.createYTAuthorizationResolver)()),
+        ...authMiddlewares,
     ];
-    nodekit.config.appAuthHandler = (0, authorization_1.createAuthMiddleware)(ytAuthCluster);
+    nodekit.config.appAuthHandler = (0, authorization_1.createAuthMiddleware)();
 }
 (_b = (_a = nodekit.config).adjustAppConfig) === null || _b === void 0 ? void 0 : _b.call(_a, nodekit);
 const app = new expresskit_1.ExpressKit(nodekit, routes_1.default);

package/dist/server/middlewares/authorization.d.ts

@@ -1,2 +1,2 @@
 import { AppMiddleware } from '@gravity-ui/expresskit';
-export declare function createAuthMiddleware(ytAuthCluster: string): AppMiddleware;
+export declare function createAuthMiddleware(): AppMiddleware;

package/dist/server/middlewares/authorization.js

@@ -18,8 +18,9 @@ function isAuthError(e) {
     var _a;
     return e instanceof AuthError || (axios_1.default.isAxiosError(e) && ((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) === 401);
 }
-function createAuthMiddleware(ytAuthCluster) {
+function createAuthMiddleware() {
     return async function authMiddleware(req, res, next) {
+        const { ytAuthCluster } = req.params;
         try {
             if (!(0, authorization_1.isAuthorized)(req)) {
                 throw new AuthError();
@@ -30,7 +31,7 @@ function createAuthMiddleware(ytAuthCluster) {
         }
         catch (e) {
             const isAuthFailed = isAuthError(e);
-            const error = isAuthFailed ? undefined : e;
+            const error = isAuthFailed ? { extraData: { ytAuthCluster } } : e;
             if (!req.routeInfo.ui && isAuthFailed) {
                 (0, utils_1.sendError)(res, error, 401);
                 return;

package/dist/server/middlewares/yt-auth.js

@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createYTAuthorizationResolver = void 0;
 const constants_1 = require("../../shared/constants");
 function createYTAuthorizationResolver() {
-    return async function resoleOAuthAuthorize(req, _, next) {
-        const secret = req.cookies[constants_1.YT_CYPRESS_COOKIE_NAME];
+    return async function resolveYTAuthorization(req, _, next) {
+        const { ytAuthCluster } = req.params;
+        const secret = req.cookies[`${ytAuthCluster}:${constants_1.YT_CYPRESS_COOKIE_NAME}`];
         req.yt = {
             ytApiAuthHeaders: {
                 Cookie: `${constants_1.YT_CYPRESS_COOKIE_NAME}=${secret};`,

package/dist/server/routes.js

@@ -21,42 +21,43 @@ const oauth_login_1 = require("./controllers/oauth-login");
 const logout_1 = require("./controllers/logout");
 const HOME_INDEX_TARGET = { handler: home_1.homeIndex, ui: true };
 const routes = {
-    'GET /change-password/': HOME_INDEX_TARGET,
+    'GET /:ytAuthCluster/change-password/': HOME_INDEX_TARGET,
     'GET /': HOME_INDEX_TARGET,
     'GET /ping': { handler: ping_1.ping, authPolicy: expresskit_1.AuthPolicy.disabled },
-    'GET /api/cluster-info/:cluster': { handler: cluster_info_1.handleClusterInfo },
-    'GET /api/cluster-params/:cluster': { handler: cluster_params_1.clusterParams },
+    'GET /api/cluster-info/:ytAuthCluster': { handler: cluster_info_1.handleClusterInfo },
+    'GET /api/cluster-params/:ytAuthCluster': { handler: cluster_params_1.clusterParams },
     'GET /api/clusters/versions': { handler: clusters_1.clusterVersions },
-    'GET /api/pool-names/:cluster': { handler: scheduling_pools_1.getClusterPools },
-    'POST /api/yt/login': { handler: login_1.handleLogin, ui: true },
+    'GET /api/clusters/auth-status': { handler: clusters_1.clusterAuthStatus },
+    'GET /api/pool-names/:ytAuthCluster': { handler: scheduling_pools_1.getClusterPools },
+    'POST /api/yt/:ytAuthCluster/login': { handler: login_1.handleLogin, ui: true },
     'GET /api/yt/logout': { handler: logout_1.handleLogout, ui: true },
     'GET /oauth/login': { handler: oauth_login_1.oauthLogin, ui: true },
     'GET /api/oauth/callback': { handler: oauth_login_1.oauthCallback, ui: true },
     'GET /api/oauth/logout/callback': { handler: oauth_login_1.oauthLogout, ui: true },
-    'POST /api/yt/change-password': { handler: login_1.handleChangePassword, ui: true },
+    'POST /api/yt/:ytAuthCluster/change-password': { handler: login_1.handleChangePassword, ui: true },
     'POST /api/remote-copy': { handler: remote_copy_1.handleRemoteCopy },
     'POST /api/markdown-to-html': { handler: markdown_to_html_1.markdownToHtmlHandler },
-    'GET  /api/yt/:cluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
-    'POST /api/yt/:cluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
-    'PUT  /api/yt/:cluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
-    'GET /api/yt-proxy/:cluster/:command': { handler: yt_proxy_api_1.ytProxyApi },
-    'GET /api/odin/proxy/:action/:cluster?': { handler: odin_proxy_api_1.odinProxyApi },
+    'GET  /api/yt/:ytAuthCluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
+    'POST /api/yt/:ytAuthCluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
+    'PUT  /api/yt/:ytAuthCluster/api/:version/:command': { handler: yt_api_1.ytTvmApiHandler },
+    'GET /api/yt-proxy/:ytAuthCluster/:command': { handler: yt_proxy_api_1.ytProxyApi },
+    'GET /api/odin/proxy/:action/:ytAuthCluster?': { handler: odin_proxy_api_1.odinProxyApi },
     'GET /api/odin/clusters/availability': { handler: availability_1.getClustersAvailability },
-    'POST /api/chyt/:cluster/:action': { handler: chyt_api_1.chytProxyApi },
-    'GET    /api/settings/:username': { handler: settings_1.settingsGet },
-    'POST   /api/settings/:username': { handler: settings_1.settingsCreate },
-    'GET    /api/settings/:username/:path': { handler: settings_1.settingsGetItem },
-    'PUT    /api/settings/:username/:path': { handler: settings_1.settingsSetItem },
-    'DELETE /api/settings/:username/:path': { handler: settings_1.settingsDeleteItem },
-    'GET  /api/table-column-preset/:hash': {
+    'POST /api/chyt/:ytAuthCluster/:action': { handler: chyt_api_1.chytProxyApi },
+    'GET    /api/settings/:ytAuthCluster/:username': { handler: settings_1.settingsGet },
+    'POST   /api/settings/:ytAuthCluster/:username': { handler: settings_1.settingsCreate },
+    'GET    /api/settings/:ytAuthCluster/:username/:path': { handler: settings_1.settingsGetItem },
+    'PUT    /api/settings/:ytAuthCluster/:username/:path': { handler: settings_1.settingsSetItem },
+    'DELETE /api/settings/:ytAuthCluster/:username/:path': { handler: settings_1.settingsDeleteItem },
+    'GET  /api/table-column-preset/:ytAuthCluster/:hash': {
         handler: table_column_preset_1.tableColumnPresetGet,
     },
-    'POST /api/table-column-preset': { handler: table_column_preset_1.tableColumnPresetSave },
-    'GET /:cluster/': HOME_INDEX_TARGET,
-    'GET /:cluster/maintenance': { handler: home_1.homeRedirect },
-    'GET /:cluster/:page': HOME_INDEX_TARGET,
-    'GET /:cluster/:page/:tab': HOME_INDEX_TARGET,
-    'GET /:cluster/:page/:operation/:tab': HOME_INDEX_TARGET,
-    'GET /:cluster/:page/:operation/:job/:tab': HOME_INDEX_TARGET,
+    'POST /api/table-column-preset/:ytAuthCluster': { handler: table_column_preset_1.tableColumnPresetSave },
+    'GET /:ytAuthCluster/': HOME_INDEX_TARGET,
+    'GET /:ytAuthCluster/maintenance': { handler: home_1.homeRedirect },
+    'GET /:ytAuthCluster/:page': HOME_INDEX_TARGET,
+    'GET /:ytAuthCluster/:page/:tab': HOME_INDEX_TARGET,
+    'GET /:ytAuthCluster/:page/:operation/:tab': HOME_INDEX_TARGET,
+    'GET /:ytAuthCluster/:page/:operation/:job/:tab': HOME_INDEX_TARGET,
 };
 exports.default = routes;

package/dist/server/utils/index.d.ts

@@ -6,7 +6,7 @@ import { AppContext } from '@gravity-ui/nodekit';
 export declare function isProductionEnv(): boolean;
 export declare function isLocalModeByEnvironment(): boolean;
 export declare function getInterfaceVersion(): any;
-export declare function prepareErrorToSend(e: unknown): import("../../@types/types").YTError;
+export declare function prepareErrorToSend(e: unknown): import("../../@types/types").YTError | Record<string, any>;
 export declare function sendResponse(res: Response, data: object): Response<any, Record<string, any>>;
 export declare function sendError(res: Response, error: unknown, errCode?: number): Response<any, Record<string, any>>;
 export declare const UNEXPECTED_PIPE_AXIOS_RESPONSE = "Unexpected behavior: response.data should be an instance of stream.Readable";

package/dist/server/utils/index.js

@@ -63,18 +63,26 @@ function getInterfaceVersion() {
     }
 }
 exports.getInterfaceVersion = getInterfaceVersion;
+function isExtraDataError(error) {
+    return error.extraData !== undefined;
+}
 function prepareErrorToSend(e) {
-    let message = '';
+    const res = {
+        message: '',
+    };
     if (e instanceof Error) {
-        message = lodash_1.default.toString(e);
+        res.message = lodash_1.default.toString(e);
     }
     else if ((0, utils_1.isYTError)(e)) {
         return e;
     }
     else {
-        message = JSON.stringify(e);
+        res.message = JSON.stringify(e);
+    }
+    if (isExtraDataError(e)) {
+        res.extraData = e.extraData;
     }
-    return { message };
+    return res;
 }
 exports.prepareErrorToSend = prepareErrorToSend;
 function sendResponse(res, data) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ytsaurus/ui",
-  "version": "1.16.2",
+  "version": "1.17.1",
   "repository": {
     "type": "github",
     "url": "https://github.com/YTsaurus/ytsaurus-ui/tree/main/packages/ui"
@@ -64,7 +64,7 @@
     "@gravity-ui/nodekit": "^1.0.0",
     "@types/rbush": "^3.0.0",
     "@ytsaurus/interface-helpers": "^0.3.0",
-    "@ytsaurus/javascript-wrapper": "^0.7.0",
+    "@ytsaurus/javascript-wrapper": "^0.7.1",
     "axios": "^1.5.0",
     "cookie-parser": "1.4.6",
     "dayjs": "^1.11.10",
@@ -184,7 +184,7 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "775c64c669396868ff1dd011c5f007febe04894a",
+  "gitHead": "5bc2008dbc9909408a722c6f4ded458cca00fce1",
   "overrides": {
     "react-split-pane": {
       "react": "$react",