Merge pull request #120 from Bit-Apps-Pro/rishad-dev-tmp

Version updated to v2.6.11

Author: RishadAlam

bitwpfi.php

@@ -4,7 +4,7 @@
  * Plugin Name: Bit Integrations
  * Plugin URI:  https://bitapps.pro/bit-integrations
  * Description: Bit Integrations is a platform that integrates with over 300+ different platforms to help with various tasks on your WordPress site, like WooCommerce, Form builder, Page builder, LMS, Sales funnels, Bookings, CRM, Webhooks, Email marketing, Social media and Spreadsheets, etc
- * Version:     2.6.10
+ * Version:     2.6.11
  * Author:      Automation & Integration Plugin - Bit Apps
  * Author URI:  https://bitapps.pro
  * Text Domain: bit-integrations
@@ -24,7 +24,7 @@
 $btcbi_db_version = '1.1';
 
 // Define most essential constants.
-define('BTCBI_VERSION', '2.6.10');
+define('BTCBI_VERSION', '2.6.11');
 define('BTCBI_PLUGIN_MAIN_FILE', __FILE__);
 
 require_once plugin_dir_path(__FILE__) . 'includes/loader.php';

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 }

frontend-dev/src/pages/ChangelogToggle.jsx

@@ -11,7 +11,7 @@ import { __, sprintf } from '../Utils/i18nwrap'
 
 // const source = !btcbi.isPro ? 'bit-integrations' : 'bit-integrations-pro'
 // const dealURL = `https://bitapps.pro/new-year-deal/#bit-integrations-pricing`
-const releaseDate = '20th September 2025'
+const releaseDate = '22th September 2025'
 
 // Changelog items format [{ 'label': '', 'desc': '', 'isPro': true }]
 const changeLog = [
@@ -52,17 +52,7 @@ const changeLog = [
     items: [
       {
         label: 'Salesforce',
-        desc: 'Fixed refresh token expiration issue.',
-        isPro: false
-      },
-      {
-        label: 'Salesforce',
-        desc: 'Resolved issue with task creation execution.',
-        isPro: false
-      },
-      {
-        label: 'Freshdesk',
-        desc: 'Fixed contact creation issue & Addressed problems with custom fields not working properly.',
+        desc: 'Fixed oAUth redirect url issue.',
         isPro: false
       }
     ]

includes/Config.php

@@ -21,7 +21,7 @@ class Config
 
     public const VAR_PREFIX = 'btcbi_';
 
-    public const VERSION = '2.6.10';
+    public const VERSION = '2.6.11';
 
     public const DB_VERSION = '1.0';
 

includes/Core/Util/AllTriggersName.php

@@ -22,7 +22,7 @@ public static function allTriggersName()
             'AvadaForms'                 => ['name' => 'Avada Forms',  'isPro' => true, 'is_active' => false],
             'Beaver'                     => ['name' => 'Beaver',  'isPro' => true, 'is_active' => false],
             'BetterMessages'             => ['name' => 'Better Messages',  'isPro' => true, 'is_active' => false],
-            'BitAssist'                  => ['name' => 'Bit  Assist',  'isPro' => true, 'is_active' => false],
+            'BitAssist'                  => ['name' => 'Bit Assist',  'isPro' => true, 'is_active' => false],
             'Breakdance'                 => ['name' => 'Breakdance',  'isPro' => true, 'is_active' => false],
             'Bricks'                     => ['name' => 'Bricks',  'isPro' => true, 'is_active' => false],
             'Bricksforge'                => ['name' => 'Bricksforge',  'isPro' => true, 'is_active' => false],

readme.txt

@@ -4,7 +4,7 @@ Tags: automation, automator, Google Sheets, webhooks, zapier, marketing automati
 Requires at least: 5.1
 Tested up to: 6.8
 Requires PHP: 7.4
-Stable tag: 2.6.10
+Stable tag: 2.6.11
 License: GPLv2 or later
 
 Perfect Automation and integration plugin: Connect 300+ platforms and automate CRM, Email marketing tools, Google Sheets, Contact forms, LMS and more
@@ -700,6 +700,10 @@ Bit Integrations follows WordPress coding standards and best practices to ensure
 
 == Changelog ==
 
+= 2.6.11 =
+- **Bug Fixes**
+ - Salesforce: Fixed oAuth redirect url issue.
+
 = 2.6.10 =
 - **Bug Fixes**
  - Salesforce: Fixed refresh token expiration issue.