fix: salesforce oauth redirect url mismatch issue fixed

Author: RishadAlam

frontend-dev/src/components/AllIntegrations/Salesforce/SalesforceAuthorization.jsx

@@ -6,6 +6,8 @@ import CopyText from '../../Utilities/CopyText'
 import { handleAuthorize } from './SalesforceCommonFunc'
 import tutorialLinks from '../../../Utils/StaticData/tutorialLinks'
 import TutorialLink from '../../Utilities/TutorialLink'
+import { $btcbi } from '../../../GlobalStates'
+import { useRecoilValue } from 'recoil'
 
 export default function SalesforceAuthorization({
   formID,
@@ -19,6 +21,7 @@ export default function SalesforceAuthorization({
   redirectLocation,
   isInfo
 }) {
+  const btcbi = useRecoilValue($btcbi)
   const [isAuthorized, setisAuthorized] = useState(false)
   const [error, setError] = useState({
     dataCenter: '',
@@ -126,7 +129,8 @@ export default function SalesforceAuthorization({
                 setError,
                 setisAuthorized,
                 setIsLoading,
-                setSnackbar
+                setSnackbar,
+                btcbi
               )
             }
             className="btn btcd-btn-lg purple sh-sm flx"

frontend-dev/src/components/AllIntegrations/Salesforce/SalesforceCommonFunc.js

@@ -749,7 +749,8 @@ export const handleAuthorize = (
   setError,
   setisAuthorized,
   setIsLoading,
-  setSnackbar
+  setSnackbar,
+  btcbi
 ) => {
   if (!confTmp.clientId || !confTmp.clientSecret) {
     setError({
@@ -760,7 +761,8 @@ export const handleAuthorize = (
   }
 
   setIsLoading(true)
-  const apiEndpoint = `https://login.salesforce.com/services/oauth2/authorize?response_type=code&client_id=${confTmp.clientId}&prompt=login%20consent&redirect_uri=${encodeURIComponent(window.location.href)}/redirect`
+  const apiEndpoint = `https://login.salesforce.com/services/oauth2/authorize?response_type=code&client_id=${confTmp.clientId}&prompt=login%20consent&state=${encodeURIComponent(window.location.href)}/redirect&redirect_uri=${encodeURIComponent(btcbi.api.base)}/redirect`
+
   const authWindow = window.open(apiEndpoint, 'salesforce', 'width=400,height=609,toolbar=off')
   const popupURLCheckTimer = setInterval(() => {
     if (authWindow.closed) {
@@ -789,17 +791,34 @@ export const handleAuthorize = (
       } else {
         const newConf = { ...confTmp }
         newConf.accountServer = grantTokenResponse['accounts-server']
-        tokenHelper(grantTokenResponse, newConf, setConf, setisAuthorized, setIsLoading, setSnackbar)
+        tokenHelper(
+          grantTokenResponse,
+          newConf,
+          setConf,
+          setisAuthorized,
+          setIsLoading,
+          setSnackbar,
+          btcbi
+        )
       }
     }
   }, 500)
 }
 
-const tokenHelper = (grantToken, confTmp, setConf, setisAuthorized, setIsLoading, setSnackbar) => {
+const tokenHelper = (
+  grantToken,
+  confTmp,
+  setConf,
+  setisAuthorized,
+  setIsLoading,
+  setSnackbar,
+  btcbi
+) => {
   const tokenRequestParams = { ...grantToken }
   tokenRequestParams.clientId = confTmp.clientId
   tokenRequestParams.clientSecret = confTmp.clientSecret
-  tokenRequestParams.redirectURI = `${encodeURIComponent(window.location.href)}/redirect`
+  tokenRequestParams.redirectURI = `${btcbi.api.base}/redirect`
+
   bitsFetch(tokenRequestParams, 'selesforce_generate_token').then(result => {
     if (result && result.success) {
       const newConf = { ...confTmp }