@ytsaurus/ui 1.74.0 → 1.75.1

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/components/vcs/GitlabApi.d.ts

@@ -31,7 +31,7 @@ export declare class GitlabApi implements VcsApi {
         path?: string;
     }): Promise<{
         name: string;
-        type: 'tree' | 'blob';
+        type: 'file' | 'dir';
         url: string;
     }[]>;
     getFileContent({ repository, branch, path, }: {

package/dist/server/components/vcs/GitlabApi.js

@@ -65,7 +65,7 @@ class GitlabApi {
             return response.data.map((item) => {
                 return {
                     name: item.name,
-                    type: item.type,
+                    type: item.type === 'tree' ? 'dir' : 'file',
                     url: `/-/blob/${branch}/${item.name}`,
                 };
             });

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/dist/server/controllers/vcs.js

@@ -160,7 +160,13 @@ const getDirectoryContent = async (req, res) => {
                 res,
             },
         });
-        response.sort((a, b) => a.type.localeCompare(b.type));
+        response.sort((a, b) => {
+            if (a.type === 'dir' && b.type === 'file')
+                return -1;
+            if (a.type === 'file' && b.type === 'dir')
+                return 1;
+            return a.name.localeCompare(b.name, undefined, { sensitivity: 'base' });
+        });
         res.status(200).json(response);
     }
     catch (e) {

package/package.json

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