handleCancel() : null}>
+
handleCancel() : null} data-test-id="modal-close-button">
×
) : null}
diff --git a/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js
new file mode 100644
index 000000000..568284dfd
--- /dev/null
+++ b/packages/bruno-app/src/components/RequestPane/QueryUrl/HttpMethodSelector/index.spec.js
@@ -0,0 +1,248 @@
+import '@testing-library/jest-dom';
+import React from 'react';
+import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { ThemeProvider } from 'styled-components';
+import HttpMethodSelector from './index';
+import themes from 'themes/index';
+import userEvent from '@testing-library/user-event';
+
+const renderWithTheme = (component) => {
+ return render(
+
+ {component}
+
+ );
+};
+
+describe('HttpMethodSelector', () => {
+ const mockOnMethodSelect = jest.fn();
+
+ beforeEach(() => {
+ mockOnMethodSelect.mockClear();
+ });
+
+ describe('Initial Render', () => {
+ it('should render with default GET method when no method prop is provided', () => {
+ renderWithTheme(
);
+
+ const methodSpan = screen.getByText('GET');
+ expect(methodSpan).toBeInTheDocument();
+ expect(methodSpan).toHaveClass('method-span');
+ expect(methodSpan).toHaveAttribute('title', 'GET');
+ });
+
+ it('should render with a standard method when method prop is provided', () => {
+ renderWithTheme(
);
+
+ const methodSpan = screen.getByText('POST');
+ expect(methodSpan).toBeInTheDocument();
+ expect(methodSpan).toHaveAttribute('title', 'POST');
+ });
+
+ it('should render with a custom method when method prop is provided', () => {
+ renderWithTheme(
);
+
+ const methodSpan = screen.getByText('CUSTOM');
+ expect(methodSpan).toBeInTheDocument();
+ expect(methodSpan).toHaveAttribute('title', 'CUSTOM');
+ });
+ });
+
+ describe('Dropdown Interaction', () => {
+ it('should display all standard HTTP methods in dropdown when clicked', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const standardMethods = ['GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT'];
+ const dropdownItems = screen.getAllByText((content, element) => {
+ return element?.classList.contains('dropdown-item');
+ });
+ const renderedMethods = dropdownItems.map(item => item.textContent);
+
+ standardMethods.forEach(method => {
+ expect(renderedMethods).toContain(method);
+ });
+ });
+ });
+
+ it('should display "Add Custom" option in dropdown', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustomSpan = screen.getByText('+ Add Custom');
+ expect(addCustomSpan).toBeInTheDocument();
+ expect(addCustomSpan).toHaveClass('text-link');
+ });
+ });
+
+ it('should call onMethodSelect when a standard method is clicked', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const postMethod = screen.getByText('POST');
+ fireEvent.click(postMethod);
+ });
+
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('POST');
+ });
+ });
+
+ describe('Custom Method Mode', () => {
+ it('should enter custom mode when "Add Custom" is clicked', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('');
+
+ // Should show input field
+ await waitFor(() => {
+ const input = screen.getByRole('textbox');
+ expect(input).toBeInTheDocument();
+ expect(input).toHaveFocus();
+ });
+ });
+
+ it('should call onMethodSelect with uppercase value when typing in custom input', async () => {
+ const user = userEvent.setup();
+
+ // Create a wrapper component that manages the method state
+ const TestWrapper = () => {
+ const [method, setMethod] = React.useState('GET');
+
+ const handleMethodSelect = (newMethod) => {
+ mockOnMethodSelect(newMethod);
+ setMethod(newMethod);
+ };
+
+ return (
+
+ );
+ };
+
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ const input = await screen.findByRole('textbox');
+ await user.type(input, 'custom');
+
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('C');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CU');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUS');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUST');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTO');
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTOM');
+ expect(mockOnMethodSelect).toHaveBeenCalledTimes(7);
+ });
+
+ it('should exit custom mode and set method on Enter key', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ const input = await screen.findByRole('textbox');
+ fireEvent.change(input, { target: { value: 'CUSTOM' } });
+ fireEvent.keyDown(input, { key: 'Enter' });
+
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTOM');
+
+ // Should exit custom mode
+ await waitFor(() => {
+ expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
+ });
+ });
+
+ it('should set default method on Enter key with empty input', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ const input = await screen.findByRole('textbox');
+ fireEvent.keyDown(input, { key: 'Enter' });
+
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('GET');
+ });
+
+ it('should exit custom mode on Escape key and keep the custom method', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ const input = await screen.findByRole('textbox');
+ fireEvent.change(input, { target: { value: 'CUSTOM' } });
+ fireEvent.keyDown(input, { key: 'Escape' });
+
+ // Should exit custom mode and onMethodSelect should be called with custom method
+ await waitFor(() => {
+ expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTOM');
+ });
+ });
+
+ it('should exit custom mode on blur and keep the custom method', async () => {
+ renderWithTheme(
);
+
+ const button = screen.getByRole('button');
+ fireEvent.click(button);
+
+ await waitFor(() => {
+ const addCustom = screen.getByText('+ Add Custom');
+ fireEvent.click(addCustom);
+ });
+
+ const input = await screen.findByRole('textbox');
+ fireEvent.change(input, { target: { value: 'CUSTOM' } });
+ fireEvent.blur(input);
+
+ // Should exit custom mode and onMethodSelect should be called with custom method
+ await waitFor(() => {
+ expect(screen.queryByRole('textbox')).not.toBeInTheDocument();
+ expect(mockOnMethodSelect).toHaveBeenCalledWith('CUSTOM');
+ });
+ });
+ });
+});
\ No newline at end of file
diff --git a/packages/bruno-app/src/components/RequestTabPanel/StyledWrapper.js b/packages/bruno-app/src/components/RequestTabPanel/StyledWrapper.js
index 5349f2410..a119245e8 100644
--- a/packages/bruno-app/src/components/RequestTabPanel/StyledWrapper.js
+++ b/packages/bruno-app/src/components/RequestTabPanel/StyledWrapper.js
@@ -63,7 +63,8 @@ const StyledWrapper = styled.div`
}
div.graphql-docs-explorer-container {
- background: white;
+ background: ${(props) => props.theme.requestTabPanel.graphqlDocsExplorer.bg};
+ color: ${(props) => props.theme.requestTabPanel.graphqlDocsExplorer.color};
outline: none;
box-shadow: rgb(0 0 0 / 15%) 0px 0px 8px;
position: absolute;
@@ -72,6 +73,14 @@ const StyledWrapper = styled.div`
width: 350px;
height: 100%;
+ .doc-explorer-contents,
+ .doc-explorer,
+ .search-box > input,
+ .search-box-clear {
+ background-color: ${(props) => props.theme.requestTabPanel.graphqlDocsExplorer.bg};
+ color: ${(props) => props.theme.requestTabPanel.graphqlDocsExplorer.color};
+ }
+
div.doc-explorer-title {
text-align: left;
}
diff --git a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
index 65badf3aa..f3ec920a2 100644
--- a/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
+++ b/packages/bruno-app/src/components/Sidebar/TitleBar/index.js
@@ -78,7 +78,7 @@ const TitleBar = () => {
) : null}
-
+
diff --git a/packages/bruno-app/src/components/StatusBar/index.js b/packages/bruno-app/src/components/StatusBar/index.js
index a98db747b..25b984ffe 100644
--- a/packages/bruno-app/src/components/StatusBar/index.js
+++ b/packages/bruno-app/src/components/StatusBar/index.js
@@ -1,9 +1,11 @@
import React, { useState } from 'react';
import { useSelector, useDispatch } from 'react-redux';
-import { IconSettings, IconCookie, IconTool } from '@tabler/icons';
-import IconSidebarToggle from 'components/Icons/IconSidebarToggle';
+import { IconSettings, IconCookie, IconTool, IconSearch } from '@tabler/icons';
+import Mousetrap from 'mousetrap';
+import { getKeyBindingsForActionAllOS } from 'providers/Hotkeys/keyMappings';
import ToolHint from 'components/ToolHint';
import Preferences from 'components/Preferences';
+import IconSidebarToggle from 'components/Icons/IconSidebarToggle';
import Cookies from 'components/Cookies';
import Notifications from 'components/Notifications';
import Portal from 'components/Portal';
@@ -26,6 +28,13 @@ const StatusBar = () => {
dispatch(openConsole());
};
+ const openGlobalSearch = () => {
+ const bindings = getKeyBindingsForActionAllOS('globalSearch') || [];
+ bindings.forEach((binding) => {
+ Mousetrap.trigger(binding);
+ });
+ };
+
return (
{preferencesOpen && (
@@ -93,6 +102,19 @@ const StatusBar = () => {
+
+
+ Search
+
+
+
props.theme.modal.input.border};
+ border-radius: 4px;
+ background: ${(props) =>
+ props.theme.mode === 'dark' ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.06)'};
+ font-size: 0.75rem;
+ font-weight: 500;
+ font-family: inherit;
+ line-height: 1;
+ color: ${(props) => props.theme.text};
+ }
`;
export default StyledWrapper;
diff --git a/packages/bruno-app/src/components/Welcome/index.js b/packages/bruno-app/src/components/Welcome/index.js
index fd8cbd756..f36b9eb4a 100644
--- a/packages/bruno-app/src/components/Welcome/index.js
+++ b/packages/bruno-app/src/components/Welcome/index.js
@@ -138,6 +138,12 @@ const Welcome = () => {
{t('COMMON.GITHUB')}
+
+
+ {t('WELCOME.GLOBAL_SEARCH_TIP_PART1')} ⌘ {' '}K {' '}
+ {t('WELCOME.GLOBAL_SEARCH_TIP_PART2')} Ctrl {' '}K {' '}
+ {t('WELCOME.GLOBAL_SEARCH_TIP_PART3')}
+
);
diff --git a/packages/bruno-app/src/i18n/translation/en.json b/packages/bruno-app/src/i18n/translation/en.json
index 7dda41e42..4f3aff16e 100644
--- a/packages/bruno-app/src/i18n/translation/en.json
+++ b/packages/bruno-app/src/i18n/translation/en.json
@@ -15,6 +15,9 @@
"IMPORT_COLLECTION": "Import Collection",
"COLLECTION_IMPORT_SUCCESS": "Collection imported successfully",
"COLLECTION_IMPORT_ERROR": "An error occurred while importing the collection. Check the logs for more information.",
- "COLLECTION_OPEN_ERROR": "An error occurred while opening the collection"
+ "COLLECTION_OPEN_ERROR": "An error occurred while opening the collection",
+ "GLOBAL_SEARCH_TIP_PART1": "Press",
+ "GLOBAL_SEARCH_TIP_PART2": "(mac) or",
+ "GLOBAL_SEARCH_TIP_PART3": "(windows) anytime to quickly search collections, folders, and requests"
}
}
diff --git a/packages/bruno-app/src/providers/Hotkeys/index.js b/packages/bruno-app/src/providers/Hotkeys/index.js
index d8a239907..7aef15122 100644
--- a/packages/bruno-app/src/providers/Hotkeys/index.js
+++ b/packages/bruno-app/src/providers/Hotkeys/index.js
@@ -6,6 +6,7 @@ import { useSelector, useDispatch } from 'react-redux';
import EnvironmentSettings from 'components/Environments/EnvironmentSettings';
import NetworkError from 'components/ResponsePane/NetworkError';
import NewRequest from 'components/Sidebar/NewRequest';
+import GlobalSearchModal from 'components/GlobalSearchModal';
import {
sendRequest,
saveRequest,
@@ -27,6 +28,7 @@ export const HotkeysProvider = (props) => {
const isEnvironmentSettingsModalOpen = useSelector((state) => state.app.isEnvironmentSettingsModalOpen);
const [showEnvSettingsModal, setShowEnvSettingsModal] = useState(false);
const [showNewRequestModal, setShowNewRequestModal] = useState(false);
+ const [showGlobalSearchModal, setShowGlobalSearchModal] = useState(false);
const getCurrentCollection = () => {
const activeTab = find(tabs, (t) => t.uid === activeTabUid);
@@ -149,6 +151,19 @@ export const HotkeysProvider = (props) => {
};
}, [activeTabUid, tabs, collections, setShowNewRequestModal]);
+ // global search (ctrl/cmd + k)
+ useEffect(() => {
+ Mousetrap.bind([...getKeyBindingsForActionAllOS('globalSearch')], (e) => {
+ setShowGlobalSearchModal(true);
+
+ return false; // stop bubbling
+ });
+
+ return () => {
+ Mousetrap.unbind([...getKeyBindingsForActionAllOS('globalSearch')]);
+ };
+ }, []);
+
// close tab hotkey
useEffect(() => {
Mousetrap.bind([...getKeyBindingsForActionAllOS('closeTab')], (e) => {
@@ -247,6 +262,9 @@ export const HotkeysProvider = (props) => {
{showNewRequestModal && (
setShowNewRequestModal(false)} />
)}
+ {showGlobalSearchModal && (
+ setShowGlobalSearchModal(false)} />
+ )}
{props.children}
);
diff --git a/packages/bruno-app/src/providers/Hotkeys/keyMappings.js b/packages/bruno-app/src/providers/Hotkeys/keyMappings.js
index 0fd9bf1bc..997eb2cd0 100644
--- a/packages/bruno-app/src/providers/Hotkeys/keyMappings.js
+++ b/packages/bruno-app/src/providers/Hotkeys/keyMappings.js
@@ -3,6 +3,7 @@ const KeyMapping = {
sendRequest: { mac: 'command+enter', windows: 'ctrl+enter', name: 'Send Request' },
editEnvironment: { mac: 'command+e', windows: 'ctrl+e', name: 'Edit Environment' },
newRequest: { mac: 'command+b', windows: 'ctrl+b', name: 'New Request' },
+ globalSearch: { mac: 'command+k', windows: 'ctrl+k', name: 'Global Search' },
closeTab: { mac: 'command+w', windows: 'ctrl+w', name: 'Close Tab' },
openPreferences: { mac: 'command+,', windows: 'ctrl+,', name: 'Open Preferences' },
closeBruno: {
diff --git a/packages/bruno-app/src/themes/dark.js b/packages/bruno-app/src/themes/dark.js
index 02f895a10..1b4e6ade8 100644
--- a/packages/bruno-app/src/themes/dark.js
+++ b/packages/bruno-app/src/themes/dark.js
@@ -160,6 +160,10 @@ const darkTheme = {
color: '#ccc'
}
}
+ },
+ graphqlDocsExplorer: {
+ bg: '#1e1e1e',
+ color: '#d4d4d4'
}
},
diff --git a/packages/bruno-app/src/themes/light.js b/packages/bruno-app/src/themes/light.js
index e6d230e23..d4fe21fd4 100644
--- a/packages/bruno-app/src/themes/light.js
+++ b/packages/bruno-app/src/themes/light.js
@@ -157,6 +157,10 @@ const lightTheme = {
color: 'rgb(75 85 99)'
}
}
+ },
+ graphqlDocsExplorer: {
+ bg: '#fff',
+ color: 'rgb(52, 52, 52)'
}
},
diff --git a/packages/bruno-app/src/utils/curl/parse-curl.js b/packages/bruno-app/src/utils/curl/parse-curl.js
index d44aa547a..558611810 100644
--- a/packages/bruno-app/src/utils/curl/parse-curl.js
+++ b/packages/bruno-app/src/utils/curl/parse-curl.js
@@ -312,7 +312,22 @@ const isURL = (arg) => {
if (typeof arg !== 'string') {
return false;
}
- return !!URL.parse(arg || '').host;
+
+ // First try to parse as a regular URL (with protocol)
+ if (URL.parse(arg || '').host) {
+ return true;
+ }
+
+ // Check if it looks like a domain without protocol
+ // This regex matches domain patterns like:
+ // - example.com
+ // - sub.example.com
+ // - example.com/path
+ // - example.com/path?query=value
+ // Must contain at least one dot to be considered a domain
+ const DOMAIN_PATTERN = /^[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(\.[a-zA-Z0-9]([a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(\/[^\s]*)?(\?[^\s]*)?$/;
+
+ return DOMAIN_PATTERN.test(arg);
};
/**
@@ -320,8 +335,9 @@ const isURL = (arg) => {
* Handles shell-quote operator objects and query parameter patterns
*/
const isURLFragment = (arg) => {
+ // If it's a glob pattern that looks like a URL, treat it as a complete URL
if (arg && typeof arg === 'object' && arg.op === 'glob') {
- return !!URL.parse(arg.pattern || '').host;
+ return isURL(arg.pattern);
}
if (arg && typeof arg === 'object' && arg.op === '&') {
return true;
@@ -341,7 +357,13 @@ const setURL = (request, url) => {
const urlString = getUrlString(url);
if (!urlString) return;
- const newUrl = request.url ? request.url + urlString : urlString;
+ // Add default protocol if none is present
+ let processedUrl = urlString;
+ if (!request.url && !urlString.match(/^[a-zA-Z]+:\/\//)) {
+ processedUrl = 'https://' + urlString;
+ }
+
+ const newUrl = request.url ? request.url + processedUrl : processedUrl;
const { url: formattedUrl, queries, urlWithoutQuery } = parseUrl(newUrl);
diff --git a/packages/bruno-app/src/utils/curl/parse-curl.spec.js b/packages/bruno-app/src/utils/curl/parse-curl.spec.js
index 3ab767f62..7e8cff58a 100644
--- a/packages/bruno-app/src/utils/curl/parse-curl.spec.js
+++ b/packages/bruno-app/src/utils/curl/parse-curl.spec.js
@@ -438,6 +438,73 @@ describe('parseCurlCommand', () => {
});
});
+ describe('handling URLs without protocols', () => {
+ it('should parse URL without protocol and default to https', () => {
+ const result = parseCurlCommand(`
+ curl echo.usebruno.com
+ `);
+
+ expect(result).toEqual({
+ method: 'get',
+ url: 'https://echo.usebruno.com',
+ urlWithoutQuery: 'https://echo.usebruno.com'
+ });
+ });
+
+ it('should parse URL without protocol with path and query parameters', () => {
+ const result = parseCurlCommand(`
+ curl api.example.com/users?page=1&limit=10
+ `);
+
+ expect(result).toEqual({
+ method: 'get',
+ url: 'https://api.example.com/users?page=1&limit=10',
+ urlWithoutQuery: 'https://api.example.com/users',
+ queries: [
+ { name: 'page', value: '1' },
+ { name: 'limit', value: '10' }
+ ]
+ });
+ });
+
+ it('should parse a complex curl command with multiple features and no protocol', () => {
+ const result = parseCurlCommand(`
+ curl -X POST \
+ -H "Content-Type: application/json" \
+ -H "Authorization: Bearer token123" \
+ -H "X-Custom-Header: custom header" \
+ -d '{"name": "John\\'s data", "email": "john@example.com", "message": "Don\\'t stop believing!", "path": "/home/user/file.txt", "json": {"nested": "value", "array": [1, 2, 3]}}' \
+ -u "api_user:api_pass" \
+ --compressed \
+ api.example.com/v1/users?param1=value1¶m2=custom+param
+ `);
+
+ expect(result).toEqual({
+ method: 'post',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer token123',
+ 'X-Custom-Header': 'custom header',
+ 'Accept-Encoding': 'deflate, gzip'
+ },
+ data: '{"name": "John\'s data", "email": "john@example.com", "message": "Don\'t stop believing!", "path": "/home/user/file.txt", "json": {"nested": "value", "array": [1, 2, 3]}}',
+ auth: {
+ mode: 'basic',
+ basic: {
+ username: 'api_user',
+ password: 'api_pass'
+ }
+ },
+ queries: [
+ { name: 'param1', value: 'value1' },
+ { name: 'param2', value: 'custom+param' }
+ ],
+ url: 'https://api.example.com/v1/users?param1=value1¶m2=custom+param',
+ urlWithoutQuery: 'https://api.example.com/v1/users'
+ });
+ });
+ });
+
describe('Edge Cases', () => {
it('should handle compressed flag', () => {
const result = parseCurlCommand(`
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index 6dd102707..41e3dc714 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -351,6 +351,8 @@ const runSingleRequest = async function (
if (contentTypeHeader && request.headers[contentTypeHeader] === 'multipart/form-data') {
if (!(request?.data instanceof FormData)) {
+ request._originalMultipartData = request.data;
+ request.collectionPath = collectionPath;
let form = createFormData(request.data, collectionPath);
request.data = form;
extend(request.headers, form.getHeaders());
diff --git a/packages/bruno-cli/src/utils/axios-instance.js b/packages/bruno-cli/src/utils/axios-instance.js
index 1d0e7ccd9..4bba1af73 100644
--- a/packages/bruno-cli/src/utils/axios-instance.js
+++ b/packages/bruno-cli/src/utils/axios-instance.js
@@ -1,6 +1,7 @@
const axios = require('axios');
const { CLI_VERSION } = require('../constants');
const { addCookieToJar, getCookieStringForUrl } = require('./cookies');
+const { createFormData } = require('./form-data');
const redirectResponseCodes = [301, 302, 303, 307, 308];
const METHOD_CHANGING_REDIRECTS = [301, 302, 303];
@@ -38,6 +39,28 @@ const createRedirectConfig = (error, redirectUrl) => {
delete requestConfig.headers['Content-Length'];
delete requestConfig.headers['content-type'];
delete requestConfig.headers['Content-Type'];
+ } else {
+ // For 307, 308 and other status codes: preserve method and body
+ if (requestConfig.data && typeof requestConfig.data === 'object' &&
+ requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
+
+ const formData = requestConfig.data;
+ if (formData._released || (formData._streams && formData._streams.length === 0)) {
+ if (error.config._originalMultipartData && error.config.collectionPath) {
+ const recreatedForm = createFormData(error.config._originalMultipartData, error.config.collectionPath);
+ requestConfig.data = recreatedForm;
+ const formHeaders = recreatedForm.getHeaders();
+ Object.assign(requestConfig.headers, formHeaders);
+
+ // preserve the original data for potential future redirects
+ requestConfig._originalMultipartData = error.config._originalMultipartData;
+ requestConfig.collectionPath = error.config.collectionPath;
+ }
+ } else {
+ requestConfig._originalMultipartData = error.config._originalMultipartData;
+ requestConfig.collectionPath = error.config.collectionPath;
+ }
+ }
}
return requestConfig;
diff --git a/packages/bruno-electron/src/ipc/network/axios-instance.js b/packages/bruno-electron/src/ipc/network/axios-instance.js
index 3b3cc2b14..1dd180cee 100644
--- a/packages/bruno-electron/src/ipc/network/axios-instance.js
+++ b/packages/bruno-electron/src/ipc/network/axios-instance.js
@@ -7,6 +7,7 @@ const { setupProxyAgents } = require('../../utils/proxy-util');
const { addCookieToJar, getCookieStringForUrl } = require('../../utils/cookies');
const { preferencesUtil } = require('../../store/preferences');
const { safeStringifyJSON } = require('../../utils/common');
+const { createFormData } = require('../../utils/form-data');
const LOCAL_IPV6 = '::1';
const LOCAL_IPV4 = '127.0.0.1';
@@ -328,6 +329,41 @@ function makeAxiosInstance({
type: 'info',
message: `Changed method from ${originalMethod.toUpperCase()} to GET for ${statusCode} redirect and removed request body`,
});
+ } else {
+ // For 307, 308 and other status codes: preserve method and body
+ if (requestConfig.data && typeof requestConfig.data === 'object' &&
+ requestConfig.data.constructor && requestConfig.data.constructor.name === 'FormData') {
+
+ const formData = requestConfig.data;
+ if (formData._released || (formData._streams && formData._streams.length === 0)) {
+ if (error.config._originalMultipartData && error.config.collectionPath) {
+ timeline.push({
+ timestamp: new Date(),
+ type: 'info',
+ message: `Recreating consumed FormData for ${statusCode} redirect`,
+ });
+
+ const recreatedForm = createFormData(error.config._originalMultipartData, error.config.collectionPath);
+ requestConfig.data = recreatedForm;
+
+ const formHeaders = recreatedForm.getHeaders();
+ Object.assign(requestConfig.headers, formHeaders);
+
+ // preserve the original data for potential future redirects
+ requestConfig._originalMultipartData = error.config._originalMultipartData;
+ requestConfig.collectionPath = error.config.collectionPath;
+ } else {
+ timeline.push({
+ timestamp: new Date(),
+ type: 'info',
+ message: `FormData consumed but no original data available for ${statusCode} redirect`,
+ });
+ }
+ } else {
+ requestConfig._originalMultipartData = error.config._originalMultipartData;
+ requestConfig.collectionPath = error.config.collectionPath;
+ }
+ }
}
if (preferencesUtil.shouldSendCookies()) {
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 3c7f68727..11b30abc8 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -452,6 +452,8 @@ const registerNetworkIpc = (mainWindow) => {
if (request.headers['content-type'] === 'multipart/form-data') {
if (!(request.data instanceof FormData)) {
+ request._originalMultipartData = request.data;
+ request.collectionPath = collectionPath;
let form = createFormData(request.data, collectionPath);
request.data = form;
extend(request.headers, form.getHeaders());
diff --git a/packages/bruno-tests/collection/environments/Local.bru b/packages/bruno-tests/collection/environments/Local.bru
index a7ac3f541..9980c994e 100644
--- a/packages/bruno-tests/collection/environments/Local.bru
+++ b/packages/bruno-tests/collection/environments/Local.bru
@@ -1,5 +1,6 @@
vars {
host: http://localhost:8080
+ localhost: http://localhost:8081
httpfaker: https://www.httpfaker.org
bearer_auth_token: your_secret_token
basic_auth_password: della
diff --git a/packages/bruno-tests/collection/environments/Prod.bru b/packages/bruno-tests/collection/environments/Prod.bru
index f33c1bb05..92ba5fc76 100644
--- a/packages/bruno-tests/collection/environments/Prod.bru
+++ b/packages/bruno-tests/collection/environments/Prod.bru
@@ -1,5 +1,6 @@
vars {
host: https://testbench-sanity.usebruno.com
+ localhost: http://localhost:8081
httpfaker: https://www.httpfaker.org
bearer_auth_token: your_secret_token
basic_auth_password: della
diff --git a/packages/bruno-tests/collection/redirects/Test Multipart Redirect Consumed FormData.bru b/packages/bruno-tests/collection/redirects/Test Multipart Redirect Consumed FormData.bru
new file mode 100644
index 000000000..1b00a438a
--- /dev/null
+++ b/packages/bruno-tests/collection/redirects/Test Multipart Redirect Consumed FormData.bru
@@ -0,0 +1,45 @@
+meta {
+ name: Test Multipart Redirect Consumed FormData
+ type: http
+ seq: 7
+}
+
+post {
+ url: {{localhost}}/api/redirect/multipart-redirect-source
+ body: multipartForm
+ auth: none
+}
+
+body:multipart-form {
+ consumed-field: consumed-value
+}
+
+assert {
+ res.status: 200
+}
+
+tests {
+ test("should handle consumed FormData recreation during 308 redirect", function() {
+ const data = res.getBody();
+ expect(data).to.be.an('object');
+ expect(data.status).to.equal('success');
+ expect(data.method).to.equal('POST');
+ });
+
+ test("should preserve POST method when FormData is consumed and recreated", function() {
+ const data = res.getBody();
+ expect(data.method).to.equal('POST');
+ });
+
+ test("should receive form data after FormData recreation", function() {
+ const data = res.getBody();
+ expect(data.body).to.have.property('consumed-field');
+ expect(data.body['consumed-field']).to.equal('consumed-value');
+ });
+
+ test("should maintain proper content-type after FormData recreation", function() {
+ const data = res.getBody();
+ expect(data.headers).to.have.property('content-type');
+ expect(data.headers['content-type']).to.include('multipart/form-data');
+ });
+}
diff --git a/packages/bruno-tests/collection/redirects/Test Multipart Redirect Multiple Fields.bru b/packages/bruno-tests/collection/redirects/Test Multipart Redirect Multiple Fields.bru
new file mode 100644
index 000000000..29da01222
--- /dev/null
+++ b/packages/bruno-tests/collection/redirects/Test Multipart Redirect Multiple Fields.bru
@@ -0,0 +1,48 @@
+meta {
+ name: Test Multipart Redirect Multiple Fields
+ type: http
+ seq: 5
+}
+
+post {
+ url: {{localhost}}/api/redirect/multipart-redirect-source
+ body: multipartForm
+ auth: none
+}
+
+body:multipart-form {
+ field1: value1
+ field2: value2
+ field3: value3
+}
+
+assert {
+ res.status: 200
+}
+
+tests {
+ test("should successfully redirect complex multipart form data with 308", function() {
+ const data = res.getBody();
+ expect(data).to.be.an('object');
+ expect(data.status).to.equal('success');
+ expect(data.method).to.equal('POST');
+ });
+
+ test("should preserve POST method during redirect", function() {
+ const data = res.getBody();
+ expect(data.method).to.equal('POST');
+ });
+
+ test("should receive all text fields at target endpoint", function() {
+ const data = res.getBody();
+ expect(data.body).to.have.property('field1');
+ expect(data.body).to.have.property('field2');
+ expect(data.body).to.have.property('field3');
+ });
+
+ test("should maintain content-type header during redirect", function() {
+ const data = res.getBody();
+ expect(data.headers).to.have.property('content-type');
+ expect(data.headers['content-type']).to.include('multipart/form-data');
+ });
+}
diff --git a/packages/bruno-tests/collection/redirects/Test Multipart Redirect.bru b/packages/bruno-tests/collection/redirects/Test Multipart Redirect.bru
new file mode 100644
index 000000000..099ed4ba6
--- /dev/null
+++ b/packages/bruno-tests/collection/redirects/Test Multipart Redirect.bru
@@ -0,0 +1,41 @@
+meta {
+ name: Test Multipart Redirect
+ type: http
+ seq: 3
+}
+
+post {
+ url: {{localhost}}/api/redirect/multipart-redirect-source
+ body: multipartForm
+ auth: none
+}
+
+body:multipart-form {
+ test-field: test-value
+}
+
+assert {
+ res.status: 200
+}
+
+tests {
+ test("should successfully redirect multipart form data with 308", function() {
+ const data = res.getBody();
+ expect(data).to.be.an('object');
+ expect(data.status).to.equal('success');
+ expect(data.method).to.equal('POST');
+ expect(data.body).to.be.an('object');
+ expect(data.body['test-field']).to.equal('test-value');
+ });
+
+ test("should preserve POST method during redirect", function() {
+ const data = res.getBody();
+ expect(data.method).to.equal('POST');
+ });
+
+ test("should receive form data at target endpoint", function() {
+ const data = res.getBody();
+ expect(data.body).to.have.property('test-field');
+ expect(data.body['test-field']).to.equal('test-value');
+ });
+}
diff --git a/packages/bruno-tests/src/index.js b/packages/bruno-tests/src/index.js
index 735bd929b..2e39f7a9c 100644
--- a/packages/bruno-tests/src/index.js
+++ b/packages/bruno-tests/src/index.js
@@ -6,6 +6,7 @@ const authRouter = require('./auth');
const echoRouter = require('./echo');
const xmlParser = require('./utils/xmlParser');
const multipartRouter = require('./multipart');
+const redirectRouter = require('./redirect');
const app = new express();
const port = process.env.PORT || 8081;
@@ -28,6 +29,7 @@ formDataParser.init(app, express);
app.use('/api/auth', authRouter);
app.use('/api/echo', echoRouter);
app.use('/api/multipart', multipartRouter);
+app.use('/api/redirect', redirectRouter);
app.get('/ping', function (req, res) {
return res.send('pong');
diff --git a/packages/bruno-tests/src/redirect/index.js b/packages/bruno-tests/src/redirect/index.js
new file mode 100644
index 000000000..4573fdf74
--- /dev/null
+++ b/packages/bruno-tests/src/redirect/index.js
@@ -0,0 +1,64 @@
+const express = require('express');
+const formDataParser = require('../multipart/form-data-parser');
+const router = express.Router();
+
+const parseMultipartFormData = (req) => {
+ if (req.headers['content-type'] && req.headers['content-type'].includes('multipart/form-data')) {
+ try {
+ const parts = formDataParser.parse(req);
+ const parsedBody = {};
+ const files = [];
+
+ parts.forEach(part => {
+ if (part.filename) {
+ files.push({
+ fieldname: part.name,
+ originalname: part.filename,
+ mimetype: part.contentType,
+ size: part.value ? part.value.length : 0
+ });
+ } else {
+ parsedBody[part.name] = part.value;
+ }
+ });
+
+ return { body: parsedBody, files };
+ } catch (error) {
+ console.error('Error parsing multipart form data:', error);
+ return { body: {}, files: [] };
+ }
+ }
+ return { body: req.body, files: [] };
+};
+
+router.post('/multipart-redirect-source', function (req, res) {
+ console.log('Multipart redirect source endpoint hit');
+ console.log('Method:', req.method);
+ console.log('Headers:', req.headers);
+
+ const { body, files } = parseMultipartFormData(req);
+ console.log('Parsed Body:', body);
+ console.log('Files:', files);
+
+ res.status(308).location('/api/redirect/multipart-redirect-target').send('Permanently moved');
+});
+
+router.post('/multipart-redirect-target', function (req, res) {
+ console.log('Multipart redirect target endpoint hit');
+ console.log('Method:', req.method);
+ console.log('Headers:', req.headers);
+
+ const { body, files } = parseMultipartFormData(req);
+ console.log('Parsed Body:', body);
+ console.log('Files:', files);
+
+ res.json({
+ status: 'success',
+ method: req.method,
+ body: body,
+ files: files,
+ headers: req.headers
+ });
+});
+
+module.exports = router;
\ No newline at end of file
diff --git a/readme.md b/readme.md
index 3c800536a..7954a914a 100644
--- a/readme.md
+++ b/readme.md
@@ -95,9 +95,12 @@ flatpak install com.usebruno.Bruno
# On Linux via Apt
sudo mkdir -p /etc/apt/keyrings
sudo apt update && sudo apt install gpg curl
-sudo gpg --list-keys
-curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9FA6017ECABE0266" | gpg --dearmor | sudo tee /etc/apt/keyrings/bruno.gpg > /dev/null
-echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" | sudo tee /etc/apt/sources.list.d/bruno.list
+curl -fsSL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x9FA6017ECABE0266" \
+ | gpg --dearmor \
+ | sudo tee /etc/apt/keyrings/bruno.gpg > /dev/null
+sudo chmod 644 /etc/apt/keyrings/bruno.gpg
+echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/bruno.gpg] http://debian.usebruno.com/ bruno stable" \
+ | sudo tee /etc/apt/sources.list.d/bruno.list
sudo apt update && sudo apt install bruno
```