refactor: return created request file path and update sanitzation regex

usebruno · Oct 14, 2023 · 307c5d0 · 307c5d0
1 parent 992fcf2
commit 307c5d0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js b/packages/bruno-app/src/providers/ReduxStore/slices/collections/actions.js
@@ -572,7 +572,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) {
@@ -620,20 +620,22 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
       if (!reqWithSameNameExists) {
         const { ipcRenderer } = window;
 
-        ipcRenderer.invoke('renderer:new-request', collection.pathname, 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: collection.pathname + PATH_SEPARATOR + sanitizeFilenme(item.name) + '.bru'
+                pathname: newPath
               }
             },
             collectionUid
           })
         );
+
+        resolve();
       } else {
         return reject(new Error('Duplicate request names are not allowed under the same folder'));
       }
@@ -649,7 +651,7 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
         if (!reqWithSameNameExists) {
           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 +660,14 @@ export const newHttpRequest = (params) => (dispatch, getState) => {
               nextAction: {
                 type: 'OPEN_REQUEST',
                 payload: {
-                  pathname: collection.pathname + PATH_SEPARATOR + sanitizeFilenme(item.name) + '.bru'
+                  pathname: newPath
                 }
               },
               collectionUid
             })
           );
+
+          resolve();
         } else {
           return reject(new Error('Duplicate request names are not allowed under the same folder'));
         }

diff --git a/packages/bruno-electron/src/ipc/collection.js b/packages/bruno-electron/src/ipc/collection.js
@@ -119,6 +119,8 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
 
       const content = jsonToBru(request);
       await writeFile(sanitizedPathname, content);
+
+      return sanitizedPathname;
     } catch (error) {
       return Promise.reject(error);
     }

diff --git a/packages/bruno-electron/src/utils/filesystem.js b/packages/bruno-electron/src/utils/filesystem.js
@@ -119,7 +119,7 @@ const sanitizeDirectoryName = (name) => {
 };
 
 const sanitizeFilenme = (name) => {
-  return name.replace(/[^\w-_.]/g, '_');
+  return name.replace(/[<>:"/\\|?*\x00-\x1F]/g, '_');
 };
 
 module.exports = {