rayan/bruno
1
0
Fork 0
mirror of https://github.com/usebruno/bruno.git synced 2026-06-24 05:05:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

postman import useBrowser prop check

Browse Source
This commit is contained in:
lohxt1
2025-03-19 17:44:33 +05:30
parent c3f8959c54
commit ee5e260890
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bruno-app/src/components/RequestPane/Auth/OAuth2/AuthorizationCode/index.js
View File

@@ -12,7 +12,7 @@ import toast from 'react-hot-toast';
import Oauth2TokenViewer from '../Oauth2TokenViewer/index';
import { cloneDeep, find } from 'lodash';
import { interpolateStringUsingCollectionAndItem } from 'utils/collections/index';
const BRUNO_OAUTH2_SERVER_CALLBACK_URL = `http://localhost:9876/callback`;
import { BRUNO_OAUTH2_SERVER_CALLBACK_URL } from 'utils/common/index';
const OAuth2AuthorizationCode = ({ save, item = {}, request, handleRun, updateAuth, collection, folder }) => {
const dispatch = useDispatch();

2
packages/bruno-app/src/utils/common/index.js
View File

@@ -190,3 +190,5 @@ export const getEncoding = (headers) => {
const charsetMatch = /charset=([^()<>@,;:"/[\]?.=\s]*)/i.exec(headers?.['content-type'] || '');
return charsetMatch?.[1];
}
export const BRUNO_OAUTH2_SERVER_CALLBACK_URL = `http://localhost:9876/callback`;

8
packages/bruno-app/src/utils/importers/postman-collection.js
View File

@@ -5,6 +5,7 @@ import { BrunoError } from 'utils/common/error';
import { validateSchema, transformItemsInCollection, hydrateSeqInCollection } from './common';
import { postmanTranslation } from 'utils/importers/translators/postman_translation';
import each from 'lodash/each';
import { BRUNO_OAUTH2_SERVER_CALLBACK_URL } from 'utils/common/index';
const readFile = (files) => {
return new Promise((resolve, reject) => {
@@ -433,7 +434,7 @@ const importPostmanV2CollectionItem = (brunoParent, item, parentAuth, options) =
}
} else if (auth.type === 'oauth2'){
const findValueUsingKey = (key) => {
return auth?.oauth2?.find(v => v?.key == key)?.value || ''
return auth?.oauth2?.find(v => v?.key == key)?.value ?? ''
}
const oauth2GrantTypeMaps = {
'authorization_code_with_pkce': 'authorization_code',
@@ -449,7 +450,7 @@ const importPostmanV2CollectionItem = (brunoParent, item, parentAuth, options) =
brunoRequestItem.request.auth.oauth2 = {
grantType: 'authorization_code',
authorizationUrl: findValueUsingKey('authUrl'),
callbackUrl: findValueUsingKey('redirect_uri'),
callbackUrl: Boolean(findValueUsingKey('useBrowser')) ? BRUNO_OAUTH2_SERVER_CALLBACK_URL : findValueUsingKey('redirect_uri'),
accessTokenUrl: findValueUsingKey('accessTokenUrl'),
refreshUrl: findValueUsingKey('refreshTokenUrl'),
clientId: findValueUsingKey('clientId'),
@@ -458,7 +459,8 @@ const importPostmanV2CollectionItem = (brunoParent, item, parentAuth, options) =
state: findValueUsingKey('state'),
pkce: Boolean(findValueUsingKey('grant_type') == 'authorization_code_with_pkce'),
tokenPlacement: findValueUsingKey('addTokenTo') == 'header' ? 'header' : 'url',
credentialsPlacement: findValueUsingKey('client_authentication') == 'body' ? 'body' : 'basic_auth_header'
credentialsPlacement: findValueUsingKey('client_authentication') == 'body' ? 'body' : 'basic_auth_header',
authorizeInDefaultBrowser: Boolean(findValueUsingKey('useBrowser')),
};
break;
case 'password_credentials':