diff --git a/contributing.md b/contributing.md
index 904fdb168..0b1ee8fad 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,4 +1,4 @@
-**English** | [Українська](docs/contributing/contributing_ua.md) | [Русский](docs/contributing/contributing_ru.md) | [Türkçe](docs/contributing/contributing_tr.md) | [Deutsch](docs/contributing/contributing_de.md) | [Français](docs/contributing/contributing_fr.md) | [বাংলা](docs/contributing/contributing_bn.md)
+**English** | [Українська](docs/contributing/contributing_ua.md) | [Русский](docs/contributing/contributing_ru.md) | [Türkçe](docs/contributing/contributing_tr.md) | [Deutsch](docs/contributing/contributing_de.md) | [Français](docs/contributing/contributing_fr.md) | [Português (BR)](docs/contributing/contributing_pt_br.md) | [বাংলা](docs/contributing/contributing_bn.md)
## Let's make bruno better, together !!
diff --git a/docs/contributing/contributing_pt_br.md b/docs/contributing/contributing_pt_br.md
new file mode 100644
index 000000000..7f7baabb3
--- /dev/null
+++ b/docs/contributing/contributing_pt_br.md
@@ -0,0 +1,85 @@
+## Vamos tornar o Bruno melhor, juntos!!
+
+Estamos felizes que você queira ajudar a melhorar o Bruno. Abaixo estão as diretrizes e orientações para começar a executar o Bruno no seu computador.
+
+### Stack de Tecnologias
+
+O Bruno é construído usando Next.js e React. Também usamos o Electron para disponibilizar uma versão para desktop (que suporta coleções locais).
+
+Bibliotecas que utilizamos:
+
+- CSS - Tailwind
+- Editor de Código - Codemirror
+- Gerenciador de Estado - Redux
+- Ícones - Tabler Icons
+- Formulários - formik
+- Validador de Schema - Yup
+- Cliente de Requisições - axios
+- Monitor de Arquivos - chokidar
+
+### Dependências
+
+Você precisará do [Node v18.x (ou da versão LTS mais recente)](https://nodejs.org/en/) e do npm na versão 8.x. Nós utilizamos npm workspaces no projeto.
+
+## Desenvolvimento
+
+Bruno está sendo desenvolvido como um aplicativo de desktop. Você precisa carregar o programa executando o aplicativo Next.js em um terminal e, em seguida, executar o aplicativo Electron em outro terminal.
+
+### Dependências
+
+- NodeJS v18
+
+### Desenvolvimento Local
+
+```bash
+# use nodejs 18 version
+nvm use
+
+# install deps
+npm i --legacy-peer-deps
+
+# build graphql docs
+npm run build:graphql-docs
+
+# build bruno query
+npm run build:bruno-query
+
+# run next app (terminal 1)
+npm run dev:web
+
+# run electron app (terminal 2)
+npm run dev:electron
+```
+
+### Troubleshooting
+
+Você pode se deparar com o erro `Unsupported platform` ao executar o comando `npm install`. Para corrigir isso, você precisará excluir a pasta `node_modules` e o arquivo `package-lock.json` e, em seguida, executar o comando `npm install` novamente. Isso deve instalar todos os pacotes necessários para executar o aplicativo.
+
+```shell
+# delete node_modules in sub-directories
+find ./ -type d -name "node_modules" -print0 | while read -d $'\0' dir; do
+ rm -rf "$dir"
+done
+
+# delete package-lock in sub-directories
+find . -type f -name "package-lock.json" -delete
+```
+
+### Testando
+
+```bash
+# bruno-schema
+npm test --workspace=packages/bruno-schema
+
+# bruno-lang
+npm test --workspace=packages/bruno-lang
+```
+
+### Envio de Pull Request
+
+- Por favor, mantenha os PRs pequenos e focados em uma única coisa.
+- Siga o formato de criação de branches.
+ - feature/[nome da funcionalidade]: Esta branch deve conter alterações para uma funcionalidade específica.
+ - Exemplo: feature/dark-mode
+ - bugfix/[nome do bug]: Esta branch deve conter apenas correções para um bug específico.
+ - Exemplo: bugfix/bug-1
diff --git a/docs/publishing/publishing_pt_br.md b/docs/publishing/publishing_pt_br.md
new file mode 100644
index 000000000..b3d580ee0
--- /dev/null
+++ b/docs/publishing/publishing_pt_br.md
@@ -0,0 +1,5 @@
+### Publicando Bruno em um novo gerenciador de pacotes
+
+Embora nosso código seja de código aberto e esteja disponível para todos usarem, pedimos gentilmente que entre em contato conosco antes de considerar a publicação em novos gerenciadores de pacotes. Como o criador da ferramenta, mantenho a marca registrada `Bruno` para este projeto e gostaria de gerenciar sua distribuição. Se deseja ver o Bruno em um novo gerenciador de pacotes, por favor, solicite através de uma issue no GitHub.
+
+Embora a maioria de nossas funcionalidades seja gratuita e de código aberto (o que abrange API's REST e GraphQL), buscamos alcançar um equilíbrio harmonioso entre os princípios de código aberto e sustentabilidade. - https://github.com/usebruno/bruno/discussions/269
diff --git a/docs/readme/readme_kr.md b/docs/readme/readme_kr.md
new file mode 100644
index 000000000..070fd0866
--- /dev/null
+++ b/docs/readme/readme_kr.md
@@ -0,0 +1,121 @@
+
+
+ {Array.from(new Array(numPages), (el, index) => (
+
+
@@ -174,7 +193,7 @@ const NewRequest = ({ collection, item, isEphemeral, onClose }) => {
Name
v1.1.0
+ v1.1.1
diff --git a/packages/bruno-app/src/utils/codegenerator/har.js b/packages/bruno-app/src/utils/codegenerator/har.js
index b48fbc3c7..e0e2b2a6c 100644
--- a/packages/bruno-app/src/utils/codegenerator/har.js
+++ b/packages/bruno-app/src/utils/codegenerator/har.js
@@ -9,25 +9,17 @@ const createContentType = (mode) => {
case 'multipartForm':
return 'multipart/form-data';
default:
- return 'application/json';
+ return '';
}
};
-const createHeaders = (headers, mode) => {
- const contentType = createContentType(mode);
- const headersArray = headers
+const createHeaders = (headers) => {
+ return headers
.filter((header) => header.enabled)
- .map((header) => {
- return {
- name: header.name,
- value: header.value
- };
- });
- const headerNames = headersArray.map((header) => header.name);
- if (!headerNames.includes('Content-Type')) {
- return [...headersArray, { name: 'Content-Type', value: contentType }];
- }
- return headersArray;
+ .map((header) => ({
+ name: header.name,
+ value: header.value
+ }));
};
const createQuery = (queryParams = []) => {
@@ -56,13 +48,13 @@ const createPostData = (body) => {
}
};
-export const buildHarRequest = (request) => {
+export const buildHarRequest = ({ request, headers }) => {
return {
method: request.method,
url: request.url,
httpVersion: 'HTTP/1.1',
cookies: [],
- headers: createHeaders(request.headers, request.body.mode),
+ headers: createHeaders(headers),
queryString: createQuery(request.params),
postData: createPostData(request.body),
headersSize: 0,
diff --git a/packages/bruno-app/src/utils/common/codemirror.js b/packages/bruno-app/src/utils/common/codemirror.js
index 6074dbdcf..4be4dc473 100644
--- a/packages/bruno-app/src/utils/common/codemirror.js
+++ b/packages/bruno-app/src/utils/common/codemirror.js
@@ -1,5 +1,4 @@
import get from 'lodash/get';
-import isString from 'lodash/isString';
let CodeMirror;
const SERVER_RENDERED = typeof navigator === 'undefined' || global['PREVENT_CODEMIRROR_RENDER'] === true;
diff --git a/packages/bruno-app/src/utils/common/index.js b/packages/bruno-app/src/utils/common/index.js
index 992ec233e..be6982436 100644
--- a/packages/bruno-app/src/utils/common/index.js
+++ b/packages/bruno-app/src/utils/common/index.js
@@ -94,3 +94,15 @@ export const getContentType = (headers) => {
return '';
};
+
+export const startsWith = (str, search) => {
+ if (!str || !str.length || typeof str !== 'string') {
+ return false;
+ }
+
+ if (!search || !search.length || typeof search !== 'string') {
+ return false;
+ }
+
+ return str.substr(0, search.length) === search;
+};
diff --git a/packages/bruno-app/src/utils/common/index.spec.js b/packages/bruno-app/src/utils/common/index.spec.js
index 6d52ed1aa..3484fac9c 100644
--- a/packages/bruno-app/src/utils/common/index.spec.js
+++ b/packages/bruno-app/src/utils/common/index.spec.js
@@ -1,6 +1,6 @@
const { describe, it, expect } = require('@jest/globals');
-import { normalizeFileName } from './index';
+import { normalizeFileName, startsWith } from './index';
describe('common utils', () => {
describe('normalizeFileName', () => {
@@ -16,4 +16,37 @@ describe('common utils', () => {
expect(normalizeFileName('foo\\bar\\')).toBe('foo-bar-');
});
});
+
+ describe('startsWith', () => {
+ it('should return false if str is not a string', () => {
+ expect(startsWith(null, 'foo')).toBe(false);
+ expect(startsWith(undefined, 'foo')).toBe(false);
+ expect(startsWith(123, 'foo')).toBe(false);
+ expect(startsWith({}, 'foo')).toBe(false);
+ expect(startsWith([], 'foo')).toBe(false);
+ });
+
+ it('should return false if search is not a string', () => {
+ expect(startsWith('foo', null)).toBe(false);
+ expect(startsWith('foo', undefined)).toBe(false);
+ expect(startsWith('foo', 123)).toBe(false);
+ expect(startsWith('foo', {})).toBe(false);
+ expect(startsWith('foo', [])).toBe(false);
+ });
+
+ it('should return false if str does not start with search', () => {
+ expect(startsWith('foo', 'bar')).toBe(false);
+ expect(startsWith('foo', 'baz')).toBe(false);
+ expect(startsWith('foo', 'bar')).toBe(false);
+ expect(startsWith('foo', 'baz')).toBe(false);
+ expect(startsWith('foo', 'bar')).toBe(false);
+ expect(startsWith('foo', 'baz')).toBe(false);
+ });
+
+ it('should return true if str starts with search', () => {
+ expect(startsWith('foo', 'f')).toBe(true);
+ expect(startsWith('foo', 'fo')).toBe(true);
+ expect(startsWith('foo', 'foo')).toBe(true);
+ });
+ });
});
diff --git a/packages/bruno-app/src/utils/curl/curl-to-json.js b/packages/bruno-app/src/utils/curl/curl-to-json.js
new file mode 100644
index 000000000..8313e0a79
--- /dev/null
+++ b/packages/bruno-app/src/utils/curl/curl-to-json.js
@@ -0,0 +1,169 @@
+/**
+ * Copyright (c) 2014-2016 Nick Carneiro
+ * https://github.com/curlconverter/curlconverter
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import parseCurlCommand from './parse-curl';
+import * as querystring from 'query-string';
+import * as jsesc from 'jsesc';
+
+function getContentType(headers = {}) {
+ const contentType = Object.keys(headers).find((key) => key.toLowerCase() === 'content-type');
+
+ return contentType ? headers[contentType] : null;
+}
+
+function repr(value, isKey) {
+ return isKey ? "'" + jsesc(value, { quotes: 'single' }) + "'" : value;
+}
+
+function getQueries(request) {
+ const queries = {};
+ for (const paramName in request.query) {
+ const rawValue = request.query[paramName];
+ let paramValue;
+ if (Array.isArray(rawValue)) {
+ paramValue = rawValue.map(repr);
+ } else {
+ paramValue = repr(rawValue);
+ }
+ queries[repr(paramName)] = paramValue;
+ }
+
+ return queries;
+}
+
+function getDataString(request) {
+ if (typeof request.data === 'number') {
+ request.data = request.data.toString();
+ }
+
+ const contentType = getContentType(request.headers);
+
+ if (contentType && contentType.includes('application/json')) {
+ return { data: request.data.toString() };
+ }
+
+ const parsedQueryString = querystring.parse(request.data, { sort: false });
+ const keyCount = Object.keys(parsedQueryString).length;
+ const singleKeyOnly = keyCount === 1 && !parsedQueryString[Object.keys(parsedQueryString)[0]];
+ const singularData = request.isDataBinary || singleKeyOnly;
+ if (singularData) {
+ const data = {};
+ data[repr(request.data)] = '';
+ return { data: data };
+ } else {
+ return getMultipleDataString(request, parsedQueryString);
+ }
+}
+
+function getMultipleDataString(request, parsedQueryString) {
+ const data = {};
+
+ for (const key in parsedQueryString) {
+ const value = parsedQueryString[key];
+ if (Array.isArray(value)) {
+ data[repr(key)] = value;
+ } else {
+ data[repr(key)] = repr(value);
+ }
+ }
+
+ return { data: data };
+}
+
+function getFilesString(request) {
+ const data = {};
+
+ data.files = {};
+ data.data = {};
+
+ for (const multipartKey in request.multipartUploads) {
+ const multipartValue = request.multipartUploads[multipartKey];
+ if (multipartValue.startsWith('@')) {
+ const fileName = multipartValue.slice(1);
+ data.files[repr(multipartKey)] = repr(fileName);
+ } else {
+ data.data[repr(multipartKey)] = repr(multipartValue);
+ }
+ }
+
+ if (Object.keys(data.files).length === 0) {
+ delete data.files;
+ }
+
+ if (Object.keys(data.data).length === 0) {
+ delete data.data;
+ }
+
+ return data;
+}
+
+const curlToJson = (curlCommand) => {
+ const request = parseCurlCommand(curlCommand);
+
+ const requestJson = {};
+
+ // curl automatically prepends 'http' if the scheme is missing, but python fails and returns an error
+ // we tack it on here to mimic curl
+ if (!request.url.match(/https?:/)) {
+ request.url = 'http://' + request.url;
+ }
+ if (!request.urlWithoutQuery.match(/https?:/)) {
+ request.urlWithoutQuery = 'http://' + request.urlWithoutQuery;
+ }
+
+ requestJson.url = request.urlWithoutQuery.replace(/\/$/, '');
+ requestJson.raw_url = request.url;
+ requestJson.method = request.method;
+
+ if (request.cookies) {
+ const cookies = {};
+ for (const cookieName in request.cookies) {
+ cookies[repr(cookieName)] = repr(request.cookies[cookieName]);
+ }
+
+ requestJson.cookies = cookies;
+ }
+
+ if (request.headers) {
+ const headers = {};
+ for (const headerName in request.headers) {
+ headers[repr(headerName)] = repr(request.headers[headerName]);
+ }
+
+ requestJson.headers = headers;
+ }
+
+ if (request.query) {
+ requestJson.queries = getQueries(request);
+ }
+
+ if (typeof request.data === 'string' || typeof request.data === 'number') {
+ Object.assign(requestJson, getDataString(request));
+ } else if (request.multipartUploads) {
+ Object.assign(requestJson, getFilesString(request));
+ }
+
+ if (request.insecure) {
+ requestJson.insecure = false;
+ }
+
+ if (request.auth) {
+ const splitAuth = request.auth.split(':');
+ const user = splitAuth[0] || '';
+ const password = splitAuth[1] || '';
+
+ requestJson.auth = {
+ user: repr(user),
+ password: repr(password)
+ };
+ }
+
+ return Object.keys(requestJson).length ? requestJson : {};
+};
+
+export default curlToJson;
diff --git a/packages/bruno-app/src/utils/curl/curl-to-json.spec.js b/packages/bruno-app/src/utils/curl/curl-to-json.spec.js
new file mode 100644
index 000000000..c8f7d1c03
--- /dev/null
+++ b/packages/bruno-app/src/utils/curl/curl-to-json.spec.js
@@ -0,0 +1,62 @@
+const { describe, it, expect } = require('@jest/globals');
+
+import curlToJson from './curl-to-json';
+
+describe('curlToJson', () => {
+ it('should return a parse a simple curl command', () => {
+ const curlCommand = 'curl https://www.usebruno.com';
+ const result = curlToJson(curlCommand);
+
+ expect(result).toEqual({
+ url: 'https://www.usebruno.com',
+ raw_url: 'https://www.usebruno.com',
+ method: 'get'
+ });
+ });
+
+ it('should return a parse a curl command with headers', () => {
+ const curlCommand = `curl https://www.usebruno.com
+ -H 'Accept: application/json, text/plain, */*'
+ -H 'Accept-Language: en-US,en;q=0.9,hi;q=0.8'
+ `;
+
+ const result = curlToJson(curlCommand);
+
+ expect(result).toEqual({
+ url: 'https://www.usebruno.com',
+ raw_url: 'https://www.usebruno.com',
+ method: 'get',
+ headers: {
+ Accept: 'application/json, text/plain, */*',
+ 'Accept-Language': 'en-US,en;q=0.9,hi;q=0.8'
+ }
+ });
+ });
+
+ it('should return a parse a curl with a post body', () => {
+ const curlCommand = `curl 'https://www.usebruno.com'
+ -H 'Accept: application/json, text/plain, */*'
+ -H 'Accept-Language: en-US,en;q=0.9,hi;q=0.8'
+ -H 'Content-Type: application/json;charset=utf-8'
+ -H 'Origin: https://www.usebruno.com'
+ -H 'Referer: https://www.usebruno.com/'
+ --data-raw '{"email":"test@usebruno.com","password":"test"}'
+ `;
+
+ const result = curlToJson(curlCommand);
+
+ expect(result).toEqual({
+ url: 'https://www.usebruno.com',
+ raw_url: 'https://www.usebruno.com',
+ method: 'post',
+ headers: {
+ Accept: 'application/json, text/plain, */*',
+ 'Accept-Language': 'en-US,en;q=0.9,hi;q=0.8',
+ 'Content-Type': 'application/json;charset=utf-8',
+ Origin: 'https://www.usebruno.com',
+ Referer: 'https://www.usebruno.com/'
+ },
+ data: '{"email":"test@usebruno.com","password":"test"}'
+ });
+ });
+});
diff --git a/packages/bruno-app/src/utils/curl/index.js b/packages/bruno-app/src/utils/curl/index.js
index 30080e467..ecaf582c7 100644
--- a/packages/bruno-app/src/utils/curl/index.js
+++ b/packages/bruno-app/src/utils/curl/index.js
@@ -1,18 +1,29 @@
-import * as parse from 'parse-curl';
-import { BrunoError } from 'utils/common/error';
-import { parseQueryParams } from 'utils/url';
+import { forOwn } from 'lodash';
+import { safeStringifyJSON } from 'utils/common';
+import curlToJson from './curl-to-json';
-export const getRequestFromCurlCommand = (command) => {
+export const getRequestFromCurlCommand = (curlCommand) => {
const parseFormData = (parsedBody) => {
- parseQueryParams(parsedBody);
- };
- try {
- const request = parse(command);
- const parsedHeader = request?.header;
- const headers =
- parsedHeader && Object.keys(parsedHeader).map((key) => ({ name: key, value: parsedHeader[key], enabled: true }));
+ const formData = [];
+ forOwn(parsedBody, (value, key) => {
+ formData.push({ name: key, value, enabled: true });
+ });
- const contentType = headers?.find((h) => h.name.toLowerCase() === 'content-type');
+ return formData;
+ };
+
+ try {
+ if (!curlCommand || typeof curlCommand !== 'string' || curlCommand.length === 0) {
+ return null;
+ }
+
+ const request = curlToJson(curlCommand);
+ const parsedHeaders = request?.headers;
+ const headers =
+ parsedHeaders &&
+ Object.keys(parsedHeaders).map((key) => ({ name: key, value: parsedHeaders[key], enabled: true }));
+
+ const contentType = headers?.find((h) => h.name.toLowerCase() === 'content-type')?.value;
const body = {
mode: 'none',
json: null,
@@ -22,30 +33,25 @@ export const getRequestFromCurlCommand = (command) => {
multipartForm: null,
formUrlEncoded: null
};
- const parsedBody = request?.body;
- if (parsedBody && contentType) {
- switch (contentType.value.toLowerCase()) {
- case 'application/json':
- body.mode = 'json';
- body.json = parsedBody;
- break;
- case 'text/xml':
- body.mode = 'xml';
- body.xml = parsedBody;
- break;
- case 'application/x-www-form-urlencoded':
- body.mode = 'formUrlEncoded';
- body.formUrlEncoded = parseFormData(parsedBody);
- break;
- case 'multipart/form-data':
- body.mode = 'multipartForm';
- body.multipartForm = parsedBody;
- break;
- case 'text/plain':
- default:
- body.mode = 'text';
- body.text = parsedBody;
- break;
+ const parsedBody = request.data;
+ if (parsedBody && contentType && typeof contentType === 'string') {
+ if (contentType.includes('application/json')) {
+ body.mode = 'json';
+ body.json = safeStringifyJSON(parsedBody);
+ } else if (contentType.includes('text/xml')) {
+ body.mode = 'xml';
+ body.xml = parsedBody;
+ } else if (contentType.includes('application/x-www-form-urlencoded')) {
+ body.mode = 'formUrlEncoded';
+ console.log(parsedBody);
+ console.log(parseFormData(parsedBody));
+ body.formUrlEncoded = parseFormData(parsedBody);
+ } else if (contentType.includes('multipart/form-data')) {
+ body.mode = 'multipartForm';
+ body.multipartForm = parsedBody;
+ } else if (contentType.includes('text/plain')) {
+ body.mode = 'text';
+ body.text = parsedBody;
}
}
return {
@@ -55,6 +61,7 @@ export const getRequestFromCurlCommand = (command) => {
headers: headers
};
} catch (error) {
+ console.error(error);
return null;
}
};
diff --git a/packages/bruno-app/src/utils/curl/parse-curl.js b/packages/bruno-app/src/utils/curl/parse-curl.js
new file mode 100644
index 000000000..b7f6572f7
--- /dev/null
+++ b/packages/bruno-app/src/utils/curl/parse-curl.js
@@ -0,0 +1,238 @@
+/**
+ * Copyright (c) 2014-2016 Nick Carneiro
+ * https://github.com/curlconverter/curlconverter
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as cookie from 'cookie';
+import * as URL from 'url';
+import * as querystring from 'query-string';
+import yargs from 'yargs-parser';
+
+const parseCurlCommand = (curlCommand) => {
+ // Remove newlines (and from continuations)
+ curlCommand = curlCommand.replace(/\\\r|\\\n/g, '');
+
+ // Remove extra whitespace
+ curlCommand = curlCommand.replace(/\s+/g, ' ');
+
+ // yargs parses -XPOST as separate arguments. just prescreen for it.
+ curlCommand = curlCommand.replace(/ -XPOST/, ' -X POST');
+ curlCommand = curlCommand.replace(/ -XGET/, ' -X GET');
+ curlCommand = curlCommand.replace(/ -XPUT/, ' -X PUT');
+ curlCommand = curlCommand.replace(/ -XPATCH/, ' -X PATCH');
+ curlCommand = curlCommand.replace(/ -XDELETE/, ' -X DELETE');
+ curlCommand = curlCommand.replace(/ -XOPTIONS/, ' -X OPTIONS');
+ // Safari adds `-Xnull` if is unable to determine the request type, it can be ignored
+ curlCommand = curlCommand.replace(/ -Xnull/, ' ');
+ curlCommand = curlCommand.trim();
+
+ const parsedArguments = yargs(curlCommand, {
+ boolean: ['I', 'head', 'compressed', 'L', 'k', 'silent', 's'],
+ alias: {
+ H: 'header',
+ A: 'user-agent'
+ }
+ });
+
+ let cookieString;
+ let cookies;
+ let url = parsedArguments._[1] || '';
+
+ // remove surrounding quotes if present
+ if (url && url.length) {
+ url = url.replace(/^['"]|['"]$/g, '');
+ }
+
+ // if url argument wasn't where we expected it, try to find it in the other arguments
+ if (!url) {
+ for (const argName in parsedArguments) {
+ if (typeof parsedArguments[argName] === 'string') {
+ if (parsedArguments[argName].indexOf('http') === 0 || parsedArguments[argName].indexOf('www.') === 0) {
+ url = parsedArguments[argName];
+ }
+ }
+ }
+ }
+
+ let headers;
+
+ if (parsedArguments.header) {
+ if (!headers) {
+ headers = {};
+ }
+ if (!Array.isArray(parsedArguments.header)) {
+ parsedArguments.header = [parsedArguments.header];
+ }
+ parsedArguments.header.forEach((header) => {
+ if (header.indexOf('Cookie') !== -1) {
+ cookieString = header;
+ } else {
+ const components = header.split(/:(.*)/);
+ if (components[1]) {
+ headers[components[0]] = components[1].trim();
+ }
+ }
+ });
+ }
+
+ if (parsedArguments['user-agent']) {
+ if (!headers) {
+ headers = {};
+ }
+ headers['User-Agent'] = parsedArguments['user-agent'];
+ }
+
+ if (parsedArguments.b) {
+ cookieString = parsedArguments.b;
+ }
+ if (parsedArguments.cookie) {
+ cookieString = parsedArguments.cookie;
+ }
+ let multipartUploads;
+ if (parsedArguments.F) {
+ multipartUploads = {};
+ if (!Array.isArray(parsedArguments.F)) {
+ parsedArguments.F = [parsedArguments.F];
+ }
+ parsedArguments.F.forEach((multipartArgument) => {
+ // input looks like key=value. value could be json or a file path prepended with an @
+ const splitArguments = multipartArgument.split('=', 2);
+ const key = splitArguments[0];
+ const value = splitArguments[1];
+ multipartUploads[key] = value;
+ });
+ }
+ if (cookieString) {
+ const cookieParseOptions = {
+ decode: function (s) {
+ return s;
+ }
+ };
+ // separate out cookie headers into separate data structure
+ // note: cookie is case insensitive
+ cookies = cookie.parse(cookieString.replace(/^Cookie: /gi, ''), cookieParseOptions);
+ }
+ let method;
+ if (parsedArguments.X === 'POST') {
+ method = 'post';
+ } else if (parsedArguments.X === 'PUT' || parsedArguments.T) {
+ method = 'put';
+ } else if (parsedArguments.X === 'PATCH') {
+ method = 'patch';
+ } else if (parsedArguments.X === 'DELETE') {
+ method = 'delete';
+ } else if (parsedArguments.X === 'OPTIONS') {
+ method = 'options';
+ } else if (
+ (parsedArguments.d ||
+ parsedArguments.data ||
+ parsedArguments['data-ascii'] ||
+ parsedArguments['data-binary'] ||
+ parsedArguments['data-raw'] ||
+ parsedArguments.F ||
+ parsedArguments.form) &&
+ !(parsedArguments.G || parsedArguments.get)
+ ) {
+ method = 'post';
+ } else if (parsedArguments.I || parsedArguments.head) {
+ method = 'head';
+ } else {
+ method = 'get';
+ }
+
+ const compressed = !!parsedArguments.compressed;
+ const urlObject = URL.parse(url || '');
+
+ // if GET request with data, convert data to query string
+ // NB: the -G flag does not change the http verb. It just moves the data into the url.
+ if (parsedArguments.G || parsedArguments.get) {
+ urlObject.query = urlObject.query ? urlObject.query : '';
+ const option = 'd' in parsedArguments ? 'd' : 'data' in parsedArguments ? 'data' : null;
+ if (option) {
+ let urlQueryString = '';
+
+ if (url.indexOf('?') < 0) {
+ url += '?';
+ } else {
+ urlQueryString += '&';
+ }
+
+ if (typeof parsedArguments[option] === 'object') {
+ urlQueryString += parsedArguments[option].join('&');
+ } else {
+ urlQueryString += parsedArguments[option];
+ }
+ urlObject.query += urlQueryString;
+ url += urlQueryString;
+ delete parsedArguments[option];
+ }
+ }
+ if (urlObject.query && urlObject.query.endsWith('&')) {
+ urlObject.query = urlObject.query.slice(0, -1);
+ }
+ const query = querystring.parse(urlObject.query, { sort: false });
+ for (const param in query) {
+ if (query[param] === null) {
+ query[param] = '';
+ }
+ }
+
+ urlObject.search = null; // Clean out the search/query portion.
+ const request = {
+ url: url,
+ urlWithoutQuery: URL.format(urlObject)
+ };
+ if (compressed) {
+ request.compressed = true;
+ }
+
+ if (Object.keys(query).length > 0) {
+ request.query = query;
+ }
+ if (headers) {
+ request.headers = headers;
+ }
+ request.method = method;
+
+ if (cookies) {
+ request.cookies = cookies;
+ request.cookieString = cookieString.replace('Cookie: ', '');
+ }
+ if (multipartUploads) {
+ request.multipartUploads = multipartUploads;
+ }
+ if (parsedArguments.data) {
+ request.data = parsedArguments.data;
+ } else if (parsedArguments['data-binary']) {
+ request.data = parsedArguments['data-binary'];
+ request.isDataBinary = true;
+ } else if (parsedArguments.d) {
+ request.data = parsedArguments.d;
+ } else if (parsedArguments['data-ascii']) {
+ request.data = parsedArguments['data-ascii'];
+ } else if (parsedArguments['data-raw']) {
+ request.data = parsedArguments['data-raw'];
+ request.isDataRaw = true;
+ }
+
+ if (parsedArguments.u) {
+ request.auth = parsedArguments.u;
+ }
+ if (parsedArguments.user) {
+ request.auth = parsedArguments.user;
+ }
+ if (Array.isArray(request.data)) {
+ request.dataArray = request.data;
+ request.data = request.data.join('&');
+ }
+
+ if (parsedArguments.k || parsedArguments.insecure) {
+ request.insecure = true;
+ }
+ return request;
+};
+
+export default parseCurlCommand;
diff --git a/packages/bruno-app/src/utils/importers/openapi-collection.js b/packages/bruno-app/src/utils/importers/openapi-collection.js
index 20a915bd4..febe7d61d 100644
--- a/packages/bruno-app/src/utils/importers/openapi-collection.js
+++ b/packages/bruno-app/src/utils/importers/openapi-collection.js
@@ -187,18 +187,24 @@ const transformOpenapiRequestItem = (request) => {
return brunoRequestItem;
};
-const resolveRefs = (spec, components = spec.components) => {
+const resolveRefs = (spec, components = spec.components, visitedItems = new Set()) => {
if (!spec || typeof spec !== 'object') {
return spec;
}
if (Array.isArray(spec)) {
- return spec.map((item) => resolveRefs(item, components));
+ return spec.map((item) => resolveRefs(item, components, visitedItems));
}
if ('$ref' in spec) {
const refPath = spec.$ref;
+ if (visitedItems.has(refPath)) {
+ return spec;
+ } else {
+ visitedItems.add(refPath);
+ }
+
if (refPath.startsWith('#/components/')) {
// Local reference within components
const refKeys = refPath.replace('#/components/', '').split('/');
@@ -213,7 +219,7 @@ const resolveRefs = (spec, components = spec.components) => {
}
}
- return resolveRefs(ref, components);
+ return resolveRefs(ref, components, visitedItems);
} else {
// Handle external references (not implemented here)
// You would need to fetch the external reference and resolve it.
@@ -223,7 +229,7 @@ const resolveRefs = (spec, components = spec.components) => {
// Recursively resolve references in nested objects
for (const prop in spec) {
- spec[prop] = resolveRefs(spec[prop], components);
+ spec[prop] = resolveRefs(spec[prop], components, visitedItems);
}
return spec;
@@ -267,12 +273,7 @@ const getDefaultUrl = (serverObject) => {
};
const getSecurity = (apiSpec) => {
- let supportedSchemes = apiSpec.security || [];
- if (supportedSchemes.length === 0) {
- return {
- supported: []
- };
- }
+ let defaultSchemes = apiSpec.security || [];
let securitySchemes = get(apiSpec, 'components.securitySchemes', {});
if (Object.keys(securitySchemes) === 0) {
@@ -282,7 +283,7 @@ const getSecurity = (apiSpec) => {
}
return {
- supported: supportedSchemes.map((scheme) => {
+ supported: defaultSchemes.map((scheme) => {
var schemeName = Object.keys(scheme)[0];
return securitySchemes[schemeName];
}),
diff --git a/packages/bruno-cli/changelog.md b/packages/bruno-cli/changelog.md
index adfa14c1a..1d6729309 100644
--- a/packages/bruno-cli/changelog.md
+++ b/packages/bruno-cli/changelog.md
@@ -1,5 +1,9 @@
# Changelog
+## 1.1.0
+
+- Upgraded axios to 1.5.1
+
## 1.0.0
- Announcing Stable Release
diff --git a/packages/bruno-cli/package.json b/packages/bruno-cli/package.json
index 88c6eb91d..37ea480a8 100644
--- a/packages/bruno-cli/package.json
+++ b/packages/bruno-cli/package.json
@@ -1,6 +1,6 @@
{
"name": "@usebruno/cli",
- "version": "1.0.0",
+ "version": "1.1.1",
"license": "MIT",
"main": "src/index.js",
"bin": {
@@ -24,7 +24,7 @@
"package.json"
],
"dependencies": {
- "@usebruno/js": "0.9.1",
+ "@usebruno/js": "0.9.2",
"@usebruno/lang": "0.9.0",
"axios": "^1.5.1",
"chai": "^4.3.7",
diff --git a/packages/bruno-cli/src/runner/run-single-request.js b/packages/bruno-cli/src/runner/run-single-request.js
index e047969f6..32122f744 100644
--- a/packages/bruno-cli/src/runner/run-single-request.js
+++ b/packages/bruno-cli/src/runner/run-single-request.js
@@ -3,7 +3,7 @@ const qs = require('qs');
const chalk = require('chalk');
const decomment = require('decomment');
const fs = require('fs');
-const { forOwn, each, extend, get, compact } = require('lodash');
+const { forOwn, isUndefined, isNull, each, extend, get, compact } = require('lodash');
const FormData = require('form-data');
const prepareRequest = require('./prepare-request');
const interpolateVars = require('./interpolate-vars');
@@ -136,14 +136,15 @@ const runSingleRequest = async function (
const proxyAuthEnabled = get(brunoConfig, 'proxy.auth.enabled', false);
const socksEnabled = proxyProtocol.includes('socks');
+ let uriPort = isUndefined(proxyPort) || isNull(proxyPort) ? '' : `:${proxyPort}`;
let proxyUri;
if (proxyAuthEnabled) {
const proxyAuthUsername = interpolateString(get(brunoConfig, 'proxy.auth.username'), interpolationOptions);
const proxyAuthPassword = interpolateString(get(brunoConfig, 'proxy.auth.password'), interpolationOptions);
- proxyUri = `${proxyProtocol}://${proxyAuthUsername}:${proxyAuthPassword}@${proxyHostname}:${proxyPort}`;
+ proxyUri = `${proxyProtocol}://${proxyAuthUsername}:${proxyAuthPassword}@${proxyHostname}${uriPort}`;
} else {
- proxyUri = `${proxyProtocol}://${proxyHostname}:${proxyPort}`;
+ proxyUri = `${proxyProtocol}://${proxyHostname}${uriPort}`;
}
if (socksEnabled) {
diff --git a/packages/bruno-electron/package.json b/packages/bruno-electron/package.json
index 57dff832f..7fa75c1bc 100644
--- a/packages/bruno-electron/package.json
+++ b/packages/bruno-electron/package.json
@@ -1,5 +1,5 @@
{
- "version": "v1.1.0",
+ "version": "v1.1.1",
"name": "bruno",
"description": "Opensource API Client for Exploring and Testing APIs",
"homepage": "https://www.usebruno.com",
@@ -20,7 +20,7 @@
},
"dependencies": {
"@aws-sdk/credential-providers": "^3.425.0",
- "@usebruno/js": "0.9.1",
+ "@usebruno/js": "0.9.2",
"@usebruno/lang": "0.9.0",
"@usebruno/schema": "0.6.0",
"about-window": "^1.15.2",
diff --git a/packages/bruno-electron/src/index.js b/packages/bruno-electron/src/index.js
index 602517b5b..a65dc28c6 100644
--- a/packages/bruno-electron/src/index.js
+++ b/packages/bruno-electron/src/index.js
@@ -14,16 +14,18 @@ const { loadWindowState, saveBounds, saveMaximized } = require('./utils/window')
const lastOpenedCollections = new LastOpenedCollections();
+// Reference: https://content-security-policy.com/
const contentSecurityPolicy = [
- isDev ? "default-src 'self' 'unsafe-inline' 'unsafe-eval'" : "default-src 'self'",
- "connect-src 'self' https://api.github.com/repos/usebruno/bruno",
- "font-src 'self' https://fonts.gstatic.com",
+ "default-src 'self'",
+ "script-src * 'unsafe-inline' 'unsafe-eval'",
+ "connect-src 'self' api.github.com",
+ "font-src 'self' https:",
"form-action 'none'",
- "img-src 'self' blob: data:",
- "style-src 'self' https://fonts.googleapis.com"
+ "img-src 'self' blob: data: https:",
+ "style-src 'self' 'unsafe-inline' https:"
];
-setContentSecurityPolicy(contentSecurityPolicy.join(';'));
+setContentSecurityPolicy(contentSecurityPolicy.join(';') + ';');
const menu = Menu.buildFromTemplate(menuTemplate);
Menu.setApplicationMenu(menu);
diff --git a/packages/bruno-electron/src/ipc/network/index.js b/packages/bruno-electron/src/ipc/network/index.js
index 7e4b7ee2a..d6afbe6f5 100644
--- a/packages/bruno-electron/src/ipc/network/index.js
+++ b/packages/bruno-electron/src/ipc/network/index.js
@@ -6,11 +6,10 @@ const axios = require('axios');
const path = require('path');
const decomment = require('decomment');
const Mustache = require('mustache');
-const FormData = require('form-data');
const contentDispositionParser = require('content-disposition');
const mime = require('mime-types');
const { ipcMain } = require('electron');
-const { forOwn, extend, each, get, compact } = require('lodash');
+const { isUndefined, isNull, each, get, compact } = require('lodash');
const { VarsRuntime, AssertRuntime, ScriptRuntime, TestRuntime } = require('@usebruno/js');
const prepareRequest = require('./prepare-request');
const prepareGqlIntrospectionRequest = require('./prepare-gql-introspection-request');
@@ -72,22 +71,6 @@ const getEnvVars = (environment = {}) => {
};
};
-const getSize = (data) => {
- if (!data) {
- return 0;
- }
-
- if (typeof data === 'string') {
- return Buffer.byteLength(data, 'utf8');
- }
-
- if (typeof data === 'object') {
- return Buffer.byteLength(safeStringifyJSON(data), 'utf8');
- }
-
- return 0;
-};
-
const configureRequest = async (
collectionUid,
request,
@@ -143,7 +126,7 @@ const configureRequest = async (
// proxy configuration
let proxyConfig = get(brunoConfig, 'proxy', {});
- let proxyEnabled = get(proxyConfig, 'enabled', false);
+ let proxyEnabled = get(proxyConfig, 'enabled', 'global');
if (proxyEnabled === 'global') {
proxyConfig = preferencesUtil.getGlobalProxyConfig();
proxyEnabled = get(proxyConfig, 'enabled', false);
@@ -156,14 +139,15 @@ const configureRequest = async (
const proxyAuthEnabled = get(proxyConfig, 'auth.enabled', false);
const socksEnabled = proxyProtocol.includes('socks');
+ let uriPort = isUndefined(proxyPort) || isNull(proxyPort) ? '' : `:${proxyPort}`;
let proxyUri;
if (proxyAuthEnabled) {
const proxyAuthUsername = interpolateString(get(proxyConfig, 'auth.username'), interpolationOptions);
const proxyAuthPassword = interpolateString(get(proxyConfig, 'auth.password'), interpolationOptions);
- proxyUri = `${proxyProtocol}://${proxyAuthUsername}:${proxyAuthPassword}@${proxyHostname}:${proxyPort}`;
+ proxyUri = `${proxyProtocol}://${proxyAuthUsername}:${proxyAuthPassword}@${proxyHostname}${uriPort}`;
} else {
- proxyUri = `${proxyProtocol}://${proxyHostname}:${proxyPort}`;
+ proxyUri = `${proxyProtocol}://${proxyHostname}${uriPort}`;
}
if (socksEnabled) {
@@ -203,10 +187,10 @@ const configureRequest = async (
const parseDataFromResponse = (response) => {
const dataBuffer = Buffer.from(response.data);
// Parse the charset from content type: https://stackoverflow.com/a/33192813
- const charset = /charset=([^()<>@,;:\"/[\]?.=\s]*)/i.exec(response.headers['Content-Type'] || '');
+ const charset = /charset=([^()<>@,;:"/[\]?.=\s]*)/i.exec(response.headers['Content-Type'] || '');
// Overwrite the original data for backwards compatability
let data = dataBuffer.toString(charset || 'utf-8');
- // Try to parse response to JSON, this can quitly fail
+ // Try to parse response to JSON, this can quietly fail
try {
data = JSON.parse(response.data);
} catch {}
diff --git a/packages/bruno-js/package.json b/packages/bruno-js/package.json
index b6a83c07b..d751c0328 100644
--- a/packages/bruno-js/package.json
+++ b/packages/bruno-js/package.json
@@ -1,6 +1,6 @@
{
"name": "@usebruno/js",
- "version": "0.9.1",
+ "version": "0.9.2",
"license": "MIT",
"main": "src/index.js",
"files": [
@@ -17,7 +17,7 @@
"@usebruno/query": "0.1.0",
"ajv": "^8.12.0",
"atob": "^2.1.2",
- "axios": "^0.26.0",
+ "axios": "^1.5.1",
"btoa": "^1.2.1",
"chai": "^4.3.7",
"chai-string": "^1.5.0",
diff --git a/packages/bruno-js/src/bru.js b/packages/bruno-js/src/bru.js
index 078aacc78..4813a73db 100644
--- a/packages/bruno-js/src/bru.js
+++ b/packages/bruno-js/src/bru.js
@@ -45,7 +45,7 @@ class Bru {
setEnvVar(key, value) {
if (!key) {
- throw new Error('Key is required');
+ throw new Error('Creating a env variable without specifying a name is not allowed.');
}
// gracefully ignore if key is not present in environment
@@ -58,7 +58,7 @@ class Bru {
setVar(key, value) {
if (!key) {
- throw new Error('Key is required');
+ throw new Error('Creating a variable without specifying a name is not allowed.');
}
if (envVariableNameRegex.test(key) === false) {
diff --git a/publishing.md b/publishing.md
index 430baa94e..0d23e1f36 100644
--- a/publishing.md
+++ b/publishing.md
@@ -1,3 +1,5 @@
+**English** | [Português (BR)](docs/publishing/publishing_pt_br.md)
+
### Publishing Bruno to a new package manager
While our code is open source and available for everyone to use, we kindly request that you reach out to us before considering publication on new package managers. As the creator of Bruno, I hold the trademark `Bruno` for this project and would like to manage its distribution. If you'd like to see Bruno on a new package manager, please raise a GitHub issue.
diff --git a/readme.md b/readme.md
index d5306e6d1..ad78994e2 100644
--- a/readme.md
+++ b/readme.md
@@ -10,7 +10,7 @@
[](https://www.usebruno.com)
[](https://www.usebruno.com/downloads)
-**English** | [Українська](docs/readme/readme_ua.md) | [Русский](docs/readme/readme_ru.md) | [Türkçe](docs/readme/readme_tr.md) | [Deutsch](docs/readme/readme_de.md) | [Français](docs/readme/readme_fr.md) | [বাংলা](docs/readme/readme_bn.md)
+**English** | [Українська](docs/readme/readme_ua.md) | [Русский](docs/readme/readme_ru.md) | [Türkçe](docs/readme/readme_tr.md) | [Deutsch](docs/readme/readme_de.md) | [Français](docs/readme/readme_fr.md) | [Português (BR)](docs/readme/readme_pt_br.md)) | [한국어](docs/readme/readme_kr.md) ) | [বাংলা](docs/readme/readme_bn.md)
Bruno is a new and innovative API client, aimed at revolutionizing the status quo represented by Postman and similar tools out there.
@@ -65,6 +65,7 @@ Or any version control system of your choice
- [Our Long Term Vision](https://github.com/usebruno/bruno/discussions/269)
- [Roadmap](https://github.com/usebruno/bruno/discussions/384)
- [Documentation](https://docs.usebruno.com)
+- [Stack Overflow](https://stackoverflow.com/questions/tagged/bruno)
- [Website](https://www.usebruno.com)
- [Pricing](https://www.usebruno.com/pricing)
- [Download](https://www.usebruno.com/downloads)
+
+### Bruno - API 탐색 및 테스트를 위한 오픈소스 IDE.
+
+[](https://badge.fury.io/gh/usebruno%bruno)
+[](https://github.com/usebruno/bruno/workflows/unit-tests.yml)
+[](https://github.com/usebruno/bruno/pulse)
+[](https://twitter.com/use_bruno)
+[](https://www.usebruno.com)
+[](https://www.usebruno.com/downloads)
+
+Bruno는 새롭고 혁신적인 API 클라이언트로, Postman과 유사한 툴들을 혁신하는 것을 목표로 합니다.
+
+Bruno는 사용자의 컬렉션을 파일 시스템의 폴더에 직접 저장합니다. 일반 텍스트 마크업 언어인 Bru를 사용해 API 요청에 대한 정보를 저장합니다.
+
+Git 또는 원하는 버전 관리 도구를 사용하여 API 컬렉션을 연동할 수 있습니다.
+
+브루는 오프라인 전용입니다. 브루노에 클라우드 동기화 기능을 추가할 계획은 없습니다. 저희는 사용자의 데이터 프라이버시를 소중히 여기며, 데이터는 사용자의 기기에 남아 있어야 한다고 믿습니다. 장기 비전 읽기 [링크](https://github.com/usebruno/bruno/discussions/269)
+
+📢 Watch our recent talk at India FOSS 3.0 Conference [here](https://www.youtube.com/watch?v=7bSMFpbcPiY)
+
+