From b5e53ec25c57155d603c51ba6ee2c6ed8178c6f3 Mon Sep 17 00:00:00 2001
From: lohxt1 <lohit.jiddimani@gmail.com>
Date: Mon, 10 Feb 2025 20:20:40 +0530
Subject: [PATCH] include oauth2 request data along with headers in the access
 token url call

---
 packages/bruno-electron/src/utils/oauth2.js | 62 ++++++++++-----------
 1 file changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/bruno-electron/src/utils/oauth2.js b/packages/bruno-electron/src/utils/oauth2.js
index bf5fdaf92..29991cf60 100644
--- a/packages/bruno-electron/src/utils/oauth2.js
+++ b/packages/bruno-electron/src/utils/oauth2.js
@@ -46,19 +46,17 @@ const getOAuth2TokenUsingAuthorizationCode = async ({ request, collectionUid, fo
   if (credentialsPlacement == "basic_auth_header") {
     requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
-  else {
-    const data = {
-      grant_type: 'authorization_code',
-      code: authorizationCode,
-      redirect_uri: callbackUrl,
-      client_id: clientId,
-      client_secret: clientSecret
-    };
-    if (pkce) {
-      data['code_verifier'] = codeVerifier;
-    }
-    requestCopy.data = data;
+  const data = {
+    grant_type: 'authorization_code',
+    code: authorizationCode,
+    redirect_uri: callbackUrl,
+    client_id: clientId,
+    client_secret: clientSecret
+  };
+  if (pkce) {
+    data['code_verifier'] = codeVerifier;
   }
+  requestCopy.data = data;
   requestCopy.url = url;
   try {
     const axiosInstance = makeAxiosInstance();
@@ -128,17 +126,15 @@ const getOAuth2TokenUsingClientCredentials = async ({ request, collectionUid, fo
   if (credentialsPlacement == "basic_auth_header") {
     requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
-  else {
-    const data = {
-      grant_type: 'client_credentials',
-      client_id: clientId,
-      client_secret: clientSecret
-    };
-    if (scope) {
-      data.scope = scope;
-    }
-    requestCopy.data = data;
+  const data = {
+    grant_type: 'client_credentials',
+    client_id: clientId,
+    client_secret: clientSecret
+  };
+  if (scope) {
+    data.scope = scope;
   }
+  requestCopy.data = data;
   requestCopy.url = url;
 
   const axiosInstance = makeAxiosInstance();
@@ -174,19 +170,17 @@ const getOAuth2TokenUsingPasswordCredentials = async ({ request, collectionUid,
   if (credentialsPlacement == "basic_auth_header") {
     requestCopy.headers['Authorization'] = `Basic ${Buffer.from(`${clientId}:${clientSecret}`).toString('base64')}`;
   }
-  else {
-    const data = {
-      grant_type: 'password',
-      username,
-      password,
-      client_id: clientId,
-      client_secret: clientSecret
-    };
-    if (scope) {
-      data.scope = scope;
-    }
-    requestCopy.data = data;
+  const data = {
+    grant_type: 'password',
+    username,
+    password,
+    client_id: clientId,
+    client_secret: clientSecret
+  };
+  if (scope) {
+    data.scope = scope;
   }
+  requestCopy.data = data;
   requestCopy.url = url;
 
   try {