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

oauth2 fixes

Browse Source
This commit is contained in:
lohxt1
2025-03-25 18:29:44 +05:30
parent eb0d746082
commit 7635230c88
3 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ import { sendCollectionOauth2Request as _sendCollectionOauth2Request } from 'uti
import { getGlobalEnvironmentVariables } from 'utils/collections/index';
import { findCollectionByPathname, findEnvironmentInCollectionByName } from 'utils/collections/index';
import { sanitizeName } from 'utils/common/regex';
import { safeParseJSON, safeStringifyJSON } from 'utils/common/index';
export const renameCollection = (newName, collectionUid) => (dispatch, getState) => {
const state = getState();
@@ -1281,7 +1282,7 @@ export const fetchOauth2Credentials = (payload) => async (dispatch, getState) =>
url,
collectionUid,
credentialsId,
debugInfo,
debugInfo: safeParseJSON(safeStringifyJSON(debugInfo)),
folderUid: folderUid || null,
itemUid: !folderUid ? itemUid : null
})
@@ -1304,7 +1305,7 @@ export const refreshOauth2Credentials = (payload) => async (dispatch, getState)
url,
collectionUid,
credentialsId,
debugInfo,
debugInfo: safeParseJSON(safeStringifyJSON(debugInfo)),
folderUid: folderUid || null,
itemUid: !folderUid ? itemUid : null
})

10
packages/bruno-electron/src/ipc/collection.js
View File

@@ -902,16 +902,6 @@ const registerRendererEventHandlers = (mainWindow, watcher, lastOpenedCollection
}
});
ipcMain.handle('renderer:get-stored-oauth2-credentials', async (event, collectionUid, url, credentialsId) => {
try {
const oauth2Store = new Oauth2Store();
const credentials = oauth2Store.getCredentialsForCollection({ collectionUid, url, credentialsId });
return { credentials, collectionUid, url };
} catch (error) {
return Promise.reject(error);
}
});
ipcMain.handle('renderer:fetch-oauth2-credentials', async (event, { itemUid, request, collection }) => {
try {
if (request.oauth2) {

1
packages/bruno-electron/src/store/oauth2.js
View File

@@ -118,6 +118,7 @@ class Oauth2Store {
try {
let oauth2DataForCollection = this.getOauth2DataOfCollection({ collectionUid, url });
let credentials = oauth2DataForCollection?.credentials?.find(c => (c?.url == url) && (c?.credentialsId == credentialsId));
if (!credentials?.data) return null;
let decryptedCredentialsData = safeParseJSON(decryptString(credentials?.data));
return decryptedCredentialsData;
} catch (err) {