@ytsaurus/ui 1.12.1 → 1.13.0

package/dist/server/middlewares/oauth.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createOAuthAuthorizationResolver = void 0;
+const oauth_1 = require("../components/oauth");
+function createOAuthAuthorizationResolver() {
+    return async function resoleOAuthAuthorize(req, res, next) {
+        if (!(0, oauth_1.isOAuthAllowed)(req) || !(0, oauth_1.isUserOAuthLogged)(req)) {
+            next();
+            return;
+        }
+        try {
+            const token = await (0, oauth_1.getOAuthAccessToken)(req, res);
+            req.yt = {
+                ytApiAuthHeaders: {
+                    Authorization: `OAuth ${token}`,
+                },
+            };
+            req.ctx.log('OAuth: provide a token');
+        }
+        catch (e) {
+            req.ctx.logError('Can not resolve access token', e);
+        }
+        next();
+        return;
+    };
+}
+exports.createOAuthAuthorizationResolver = createOAuthAuthorizationResolver;

package/dist/server/middlewares/yt-auth.d.ts

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

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

@@ -1,48 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createYTAuthMiddleware = void 0;
-const axios_1 = __importDefault(require("axios"));
+exports.createYTAuthorizationResolver = void 0;
 const constants_1 = require("../../shared/constants");
-const cluster_queries_1 = require("../components/cluster-queries");
-const requestsSetup_1 = require("../components/requestsSetup");
-const utils_1 = require("../utils");
-class AuthError extends Error {
-    constructor() {
-        super('Authorization required');
-    }
-}
-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 createYTAuthMiddleware(ytAuthCluster) {
-    return async function ytAuthMiddleware(req, res, next) {
-        try {
-            const secret = req.cookies[constants_1.YT_CYPRESS_COOKIE_NAME];
-            req.yt = {
-                ytApiAuthHeaders: {
-                    Cookie: `${constants_1.YT_CYPRESS_COOKIE_NAME}=${secret};`,
-                },
-            };
-            if (!secret) {
-                throw new AuthError();
-            }
-            const cfg = (0, requestsSetup_1.getUserYTApiSetup)(ytAuthCluster, req);
-            const { login } = await (0, cluster_queries_1.getXSRFToken)(req, cfg);
-            req.yt.login = login;
-        }
-        catch (e) {
-            const isAuthFailed = isAuthError(e);
-            const error = isAuthFailed ? undefined : e;
-            if (!req.routeInfo.ui && isAuthFailed) {
-                (0, utils_1.sendError)(res, error, 401);
-                return;
-            }
-        }
+function createYTAuthorizationResolver() {
+    return async function resoleOAuthAuthorize(req, _, next) {
+        const secret = req.cookies[constants_1.YT_CYPRESS_COOKIE_NAME];
+        req.yt = {
+            ytApiAuthHeaders: {
+                Cookie: `${constants_1.YT_CYPRESS_COOKIE_NAME}=${secret};`,
+            },
+        };
         next();
     };
 }
-exports.createYTAuthMiddleware = createYTAuthMiddleware;
+exports.createYTAuthorizationResolver = createYTAuthorizationResolver;

package/dist/server/routes.js

@@ -17,6 +17,8 @@ const markdown_to_html_1 = require("./controllers/markdown-to-html");
 const odin_proxy_api_1 = require("./controllers/odin-proxy-api");
 const availability_1 = require("./controllers/availability");
 const chyt_api_1 = require("./controllers/chyt-api");
+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,
@@ -27,7 +29,10 @@ const routes = {
     '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 },
-    'POST /api/yt/logout': { handler: login_1.handleLogout, 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/remote-copy': { handler: remote_copy_1.handleRemoteCopy },
     'POST /api/markdown-to-html': { handler: markdown_to_html_1.markdownToHtmlHandler },

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

@@ -0,0 +1,6 @@
+import type { Request } from 'express';
+import { AppMiddleware } from '@gravity-ui/expresskit';
+import { AuthWay } from '../../shared/constants';
+export declare function isAuthorized(req: Request): boolean;
+export declare function getAuthWay(req: Request): AuthWay | undefined;
+export declare function authorizationResolver(resolver: AppMiddleware): AppMiddleware;

package/dist/server/utils/authorization.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.authorizationResolver = exports.getAuthWay = exports.isAuthorized = void 0;
+const oauth_1 = require("../components/oauth");
+function isAuthorized(req) {
+    var _a;
+    if (req.yt) {
+        return Boolean(Object.keys((_a = req.yt.ytApiAuthHeaders) !== null && _a !== void 0 ? _a : {}));
+    }
+    return false;
+}
+exports.isAuthorized = isAuthorized;
+function getAuthWay(req) {
+    if (!isAuthorized(req)) {
+        return undefined;
+    }
+    if ((0, oauth_1.isUserOAuthLogged)(req)) {
+        return 'oauth';
+    }
+    return 'passwd';
+}
+exports.getAuthWay = getAuthWay;
+function authorizationResolver(resolver) {
+    return (req, res, next) => {
+        if (isAuthorized(req)) {
+            next();
+            return;
+        }
+        resolver(req, res, next);
+        return;
+    };
+}
+exports.authorizationResolver = authorizationResolver;

package/dist/shared/constants/index.d.ts

@@ -2,6 +2,9 @@ export declare const YT_API_REQUEST_ID_HEADER = "X-Custom-Request-Id";
 export declare const YT_CYPRESS_COOKIE_NAME = "YTCypressCookie";
 export declare const YT_LOCAL_CLUSTER_ID = "ui";
 export declare const ODIN_PAGE_ID = "odin";
+export declare const YT_OAUTH_ACCESS_TOKEN_NAME = "yt_oauth_access_token";
+export declare const YT_OAUTH_REFRESH_TOKEN_NAME = "yt_oauth_refresh_token";
+export type AuthWay = 'oauth' | 'passwd';
 /**
  * Allows to succeed requests when master are in read-only mode and the transaction coordinator cell is evicted
  */

package/dist/shared/constants/index.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.USE_SUPRESS_SYNC = exports.ODIN_PAGE_ID = exports.YT_LOCAL_CLUSTER_ID = exports.YT_CYPRESS_COOKIE_NAME = exports.YT_API_REQUEST_ID_HEADER = void 0;
+exports.USE_SUPRESS_SYNC = exports.YT_OAUTH_REFRESH_TOKEN_NAME = exports.YT_OAUTH_ACCESS_TOKEN_NAME = exports.ODIN_PAGE_ID = exports.YT_LOCAL_CLUSTER_ID = exports.YT_CYPRESS_COOKIE_NAME = exports.YT_API_REQUEST_ID_HEADER = void 0;
 exports.YT_API_REQUEST_ID_HEADER = 'X-Custom-Request-Id';
 exports.YT_CYPRESS_COOKIE_NAME = 'YTCypressCookie';
 exports.YT_LOCAL_CLUSTER_ID = 'ui';
 exports.ODIN_PAGE_ID = 'odin';
+exports.YT_OAUTH_ACCESS_TOKEN_NAME = 'yt_oauth_access_token';
+exports.YT_OAUTH_REFRESH_TOKEN_NAME = 'yt_oauth_refresh_token';
 /**
  * Allows to succeed requests when master are in read-only mode and the transaction coordinator cell is evicted
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ytsaurus/ui",
-  "version": "1.12.1",
+  "version": "1.13.0",
   "repository": {
     "type": "github",
     "url": "https://github.com/YTsaurus/ytsaurus-ui/tree/main/packages/ui"
@@ -185,7 +185,7 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "ed3e93a33f916458e9560e6926e9ee97235c5922",
+  "gitHead": "ced3f74cdee2c9c3411c6b5417d2cf895ce6b5d6",
   "overrides": {
     "react-split-pane": {
       "react": "$react",