fix: Fix name validation consistency

contributing_ru.md

@@ -34,4 +34,4 @@ Bruno построен с использованием NextJs и React. Мы т
   - feature/[название функции]: Эта ветка должна содержать изменения для конкретной функции
     - Пример: feature/dark-mode
   - bugfix/[название ошибки]: Эта ветка должна содержать только исправления для конкретной ошибки
-    - Пример bugfix/bug-1
+    - Пример bugfix/bug-1

packages/bruno-app/src/components/Environments/EnvironmentSettings/CreateEnvironment/index.js

@@ -17,8 +17,8 @@ const CreateEnvironment = ({ collection, onClose }) => {
     },
     validationSchema: Yup.object({
       name: Yup.string()
-        .min(1, 'must be at least 1 character')
-        .max(50, 'must be 50 characters or less')
+        .min(1, 'must be atleast 1 characters')
+        .max(250, 'must be 250 characters or less')
         .required('name is required')
     }),
     onSubmit: (values) => {

packages/bruno-app/src/components/Environments/EnvironmentSettings/RenameEnvironment/index.js

@@ -18,7 +18,7 @@ const RenameEnvironment = ({ onClose, environment, collection }) => {
     validationSchema: Yup.object({
       name: Yup.string()
         .min(1, 'must be at least 1 character')
-        .max(50, 'must be 50 characters or less')
+        .max(250, 'must be 250 characters or less')
         .required('name is required')
     }),
     onSubmit: (values) => {

packages/bruno-app/src/components/Sidebar/Collections/Collection/CollectionItem/RenameCollectionItem/index.js

@@ -5,6 +5,7 @@ import Modal from 'components/Modal';
 import { useDispatch } from 'react-redux';
 import { isItemAFolder } from 'utils/tabs';
 import { renameItem } from 'providers/ReduxStore/slices/collections/actions';
+import { dirnameRegex } from 'utils/common/regex';
 
 const RenameCollectionItem = ({ collection, item, onClose }) => {
   const dispatch = useDispatch();
@@ -18,7 +19,9 @@ const RenameCollectionItem = ({ collection, item, onClose }) => {
     validationSchema: Yup.object({
       name: Yup.string()
         .min(1, 'must be at least 1 character')
-        .max(50, 'must be 50 characters or less')
+        .max(250, 'must be 250 characters or less')
+        .trim()
+        .matches(isFolder ? dirnameRegex : /.*/g, `${isFolder ? 'folder' : 'request'} name contains invalid characters`)
         .required('name is required')
     }),
     onSubmit: (values) => {

packages/bruno-app/src/components/Sidebar/CreateCollection/index.js

@@ -7,6 +7,7 @@ import { createCollection } from 'providers/ReduxStore/slices/collections/action
 import toast from 'react-hot-toast';
 import Tooltip from 'components/Tooltip';
 import Modal from 'components/Modal';
+import { dirnameRegex } from 'utils/common/regex';
 
 const CreateCollection = ({ onClose }) => {
   const inputRef = useRef();
@@ -25,9 +26,10 @@ const CreateCollection = ({ onClose }) => {
         .max(50, 'must be 50 characters or less')
         .required('collection name is required'),
       collectionFolderName: Yup.string()
+        .max(250, 'must be 250 characters or less')
+        .trim()
+        .matches(dirnameRegex, 'Folder name contains invalid characters')
         .min(1, 'must be at least 1 character')
-        .max(50, 'must be 50 characters or less')
-        .matches(/^[\w\-. ]+$/, 'Folder name contains invalid characters')
         .required('folder name is required'),
       collectionLocation: Yup.string().min(1, 'location is required').required('location is required')
     }),
@@ -76,14 +78,12 @@ const CreateCollection = ({ onClose }) => {
             name="collectionName"
             ref={inputRef}
             className="block textbox mt-2 w-full"
-            onChange = {
-                (e) => {
-                    formik.handleChange(e);
-                    if (formik.values.collectionName === formik.values.collectionFolderName) {
-                        formik.setFieldValue("collectionFolderName", e.target.value);
-                    }
-                }
-            }
+            onChange={(e) => {
+              formik.handleChange(e);
+              if (formik.values.collectionName === formik.values.collectionFolderName) {
+                formik.setFieldValue('collectionFolderName', e.target.value);
+              }
+            }}
             autoComplete="off"
             autoCorrect="off"
             autoCapitalize="off"

packages/bruno-app/src/components/Sidebar/NewFolder/index.js

@@ -5,6 +5,7 @@ import * as Yup from 'yup';
 import Modal from 'components/Modal';
 import { useDispatch } from 'react-redux';
 import { newFolder } from 'providers/ReduxStore/slices/collections/actions';
+import { dirnameRegex } from 'utils/common/regex';
 
 const NewFolder = ({ collection, item, onClose }) => {
   const dispatch = useDispatch();
@@ -19,6 +20,9 @@ const NewFolder = ({ collection, item, onClose }) => {
         .trim()
         .min(1, 'must be at least 1 character')
         .required('name is required')
+        .max(250, 'must be 250 characters or less')
+        .trim()
+        .matches(dirnameRegex, 'Folder name contains invalid characters')
         .test({
           name: 'folderName',
           message: 'The folder name "environments" at the root of the collection is reserved in bruno',

packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js

@@ -1,4 +1,3 @@
-import path from 'path';
 import toast from 'react-hot-toast';
 import trim from 'lodash/trim';
 import find from 'lodash/find';
@@ -19,9 +18,9 @@ import {
   isItemAFolder,
   refreshUidsInItem
 } from 'utils/collections';
-import { collectionSchema, itemSchema, environmentSchema, environmentsSchema } from '@usebruno/schema';
+import { collectionSchema, itemSchema, environmentSchema } from '@usebruno/schema';
 import { waitForNextTick } from 'utils/common';
-import { getDirectoryName, isWindowsOS, PATH_SEPARATOR } from 'utils/common/platform';
+import { getDirectoryName, PATH_SEPARATOR } from 'utils/common/platform';
 import { sendNetworkRequest, cancelNetworkRequest } from 'utils/network';
 
 import {
@@ -93,7 +92,6 @@ export const saveRequest = (itemUid, collectionUid) => (dispatch, getState) => {
 export const saveCollectionRoot = (collectionUid) => (dispatch, getState) => {
   const state = getState();
   const collection = findCollectionByUid(state.collections.collections, collectionUid);
-  console.log(collection.root);
 
   return new Promise((resolve, reject) => {
     if (!collection) {
@@ -282,25 +280,16 @@ export const renameItem = (newName, itemUid, collectionUid) => (dispatch, getSta
     if (!collection) {
       return reject(new Error('Collection not found'));
     }
-
     const collectionCopy = cloneDeep(collection);
     const item = findItemInCollection(collectionCopy, itemUid);
     if (!item) {
       return reject(new Error('Unable to locate item'));
     }
 
     const dirname = getDirectoryName(item.pathname);
-
-    let newPathname = '';
-    if (item.type === 'folder') {
-      newPathname = path.join(dirname, trim(newName));
-    } else {
-      const filename = resolveRequestFilename(newName);
-      newPathname = path.join(dirname, filename);
-    }
     const { ipcRenderer } = window;
 
-    ipcRenderer.invoke('renderer:rename-item', item.pathname, newPathname, newName).then(resolve).catch(reject);
+    ipcRenderer.invoke('renderer:rename-item', item.pathname, dirname, newName).then(resolve).catch(reject);
   });
 };
 
@@ -332,14 +321,13 @@ export const cloneItem = (newName, itemUid, collectionUid) => (dispatch, getStat
         (i) => i.type !== 'folder' && trim(i.filename) === trim(filename)
       );
       if (!reqWithSameNameExists) {
-        const fullName = `${collection.pathname}${PATH_SEPARATOR}${filename}`;
         const { ipcRenderer } = window;
         const requestItems = filter(collection.items, (i) => i.type !== 'folder');
         itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
 
         itemSchema
           .validate(itemToSave)
-          .then(() => ipcRenderer.invoke('renderer:new-request', fullName, itemToSave))
+          .then(() => ipcRenderer.invoke('renderer:new-request', collection.pathname, itemToSave))
           .then(resolve)
           .catch(reject);
       } else {
@@ -351,15 +339,14 @@ export const cloneItem = (newName, itemUid, collectionUid) => (dispatch, getStat
         (i) => i.type !== 'folder' && trim(i.filename) === trim(filename)
       );
       if (!reqWithSameNameExists) {
-        const dirname = getDirectoryName(item.pathname);
-        const fullName = path.join(dirname, filename);
+        const pathname = getDirectoryName(item.pathname);
         const { ipcRenderer } = window;
         const requestItems = filter(parentItem.items, (i) => i.type !== 'folder');
         itemToSave.seq = requestItems ? requestItems.length + 1 : 1;
 
         itemSchema
           .validate(itemToSave)
-          .then(() => ipcRenderer.invoke('renderer:new-request', fullName, itemToSave))
+          .then(() => ipcRenderer.invoke('renderer:new-request', pathname, itemToSave))
           .then(resolve)
           .catch(reject);
       } else {
@@ -382,12 +369,7 @@ export const deleteItem = (itemUid, collectionUid) => (dispatch, getState) => {
     if (item) {
       const { ipcRenderer } = window;
 
-      ipcRenderer
-        .invoke('renderer:delete-item', item.pathname, item.type)
-        .then(() => {
-          resolve();
-        })
-        .catch((error) => reject(error));
+      ipcRenderer.invoke('renderer:delete-item', item.pathname, item.type).then(resolve).catch(reject);
     }
     return;
   });
@@ -570,7 +552,7 @@ export const moveItemToRootOfCollection = (collectionUid, draggedItemUid) => (di
 export const newHttpRequest = (params) => (dispatch, getState) => {
   const { requestName, requestType, requestUrl, requestMethod, collectionUid, itemUid } = params;
 
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
     const state = getState();
     const collection = findCollectionByUid(state.collections.collections, collectionUid);
     if (!collection) {
@@ -616,23 +598,24 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
       item.seq = requestItems.length + 1;
 
       if (!reqWithSameNameExists) {
-        const fullName = `${collection.pathname}${PATH_SEPARATOR}${filename}`;
         const { ipcRenderer } = window;
 
-        ipcRenderer.invoke('renderer:new-request', fullName, item).then(resolve).catch(reject);
+        const newPath = await ipcRenderer.invoke('renderer:new-request', collection.pathname, item);
         // the useCollectionNextAction() will track this and open the new request in a new tab
         // once the request is created
         dispatch(
           updateNextAction({
             nextAction: {
               type: 'OPEN_REQUEST',
               payload: {
-                pathname: fullName
+                pathname: newPath
               }
             },
             collectionUid
           })
         );
+
+        resolve();
       } else {
         return reject(new Error('Duplicate request names are not allowed under the same folder'));
       }
@@ -646,10 +629,9 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
         const requestItems = filter(currentItem.items, (i) => i.type !== 'folder');
         item.seq = requestItems.length + 1;
         if (!reqWithSameNameExists) {
-          const fullName = `${currentItem.pathname}${PATH_SEPARATOR}${filename}`;
           const { ipcRenderer } = window;
 
-          ipcRenderer.invoke('renderer:new-request', fullName, item).then(resolve).catch(reject);
+          const newPath = await ipcRenderer.invoke('renderer:new-request', fullName, item);
 
           // the useCollectionNextAction() will track this and open the new request in a new tab
           // once the request is created
@@ -658,12 +640,14 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
               nextAction: {
                 type: 'OPEN_REQUEST',
                 payload: {
-                  pathname: fullName
+                  pathname: newPath
                 }
               },
               collectionUid
             })
           );
+
+          resolve();
         } else {
           return reject(new Error('Duplicate request names are not allowed under the same folder'));
         }

packages/bruno-app/src/providers/ReduxStore/slices/collections/index.js

@@ -185,6 +185,9 @@ export const collectionsSlice = createSlice({
 
         if (item) {
           item.name = action.payload.newName;
+          if (item.type === 'folder') {
+            item.pathname = path.join(path.dirname(item.pathname), action.payload.newName);
+          }
         }
       }
     },
@@ -1203,6 +1206,7 @@ export const collectionsSlice = createSlice({
 
         if (existingEnv) {
           existingEnv.variables = environment.variables;
+          existingEnv.name = environment.name;
         } else {
           collection.environments.push(environment);
 

packages/bruno-app/src/utils/common/index.js

@@ -94,3 +94,7 @@ export const getContentType = (headers) => {
 
   return '';
 };
+
+export const sanitizeFilenme = (name) => {
+  return name.replace(/[^\w-_.]/g, '_');
+};

packages/bruno-app/src/utils/common/regex.js

@@ -0,0 +1,3 @@
+// See https://github.com/usebruno/bruno/pull/349 for more info
+// Scrict regex for validating directories. Covers most edge cases like windows device names
+export const dirnameRegex = /^(?!CON|PRN|AUX|NUL|COM\d|LPT\d|^ |^\-)[^<>:"/\\|?*\x00-\x1F]+[^\. ]$/;

packages/bruno-electron/src/app/watcher.js

@@ -100,7 +100,10 @@ const addEnvironmentFile = async (win, pathname, collectionUid, collectionPath)
     let bruContent = fs.readFileSync(pathname, 'utf8');
 
     file.data = bruToEnvJson(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    // Older env files do not have a meta block
+    if (!file.data.name) {
+      file.data.name = basename.substring(0, basename.length - 4);
+    }
     file.data.uid = getRequestUid(pathname);
 
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));
@@ -135,7 +138,10 @@ const changeEnvironmentFile = async (win, pathname, collectionUid, collectionPat
 
     const bruContent = fs.readFileSync(pathname, 'utf8');
     file.data = bruToEnvJson(bruContent);
-    file.data.name = basename.substring(0, basename.length - 4);
+    // Older env files do not have a meta block
+    if (!file.data.name) {
+      file.data.name = basename.substring(0, basename.length - 4);
+    }
     file.data.uid = getRequestUid(pathname);
     _.each(_.get(file, 'data.variables', []), (variable) => (variable.uid = uuid()));