improvement(salesforce): fixed refresh and added endpoints (#2177)

* added salesforce other tools

* modified scope and change salesforce refresh

* fixed refresh

* remove dup code

Author: aadamgough

apps/sim/blocks/blocks/salesforce.ts

@@ -44,6 +44,17 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
         { label: 'Create Task', id: 'create_task' },
         { label: 'Update Task', id: 'update_task' },
         { label: 'Delete Task', id: 'delete_task' },
+        { label: 'List Reports', id: 'list_reports' },
+        { label: 'Get Report', id: 'get_report' },
+        { label: 'Run Report', id: 'run_report' },
+        { label: 'List Report Types', id: 'list_report_types' },
+        { label: 'List Dashboards', id: 'list_dashboards' },
+        { label: 'Get Dashboard', id: 'get_dashboard' },
+        { label: 'Refresh Dashboard', id: 'refresh_dashboard' },
+        { label: 'Run SOQL Query', id: 'query' },
+        { label: 'Get More Query Results', id: 'query_more' },
+        { label: 'Describe Object', id: 'describe_object' },
+        { label: 'List Objects', id: 'list_objects' },
       ],
       value: () => 'get_accounts',
     },
@@ -52,7 +63,7 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
       title: 'Salesforce Account',
       type: 'oauth-input',
       serviceId: 'salesforce',
-      requiredScopes: ['api', 'refresh_token', 'openid'],
+      requiredScopes: ['api', 'refresh_token', 'openid', 'offline_access'],
       placeholder: 'Select Salesforce account',
       required: true,
     },
@@ -367,6 +378,77 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
       placeholder: 'Account or Opportunity ID',
       condition: { field: 'operation', value: ['create_task'] },
     },
+    // Report fields
+    {
+      id: 'reportId',
+      title: 'Report ID',
+      type: 'short-input',
+      placeholder: 'Report ID',
+      condition: { field: 'operation', value: ['get_report', 'run_report'] },
+      required: true,
+    },
+    {
+      id: 'folderName',
+      title: 'Folder Name',
+      type: 'short-input',
+      placeholder: 'Filter by folder name',
+      condition: { field: 'operation', value: ['list_reports', 'list_dashboards'] },
+    },
+    {
+      id: 'searchTerm',
+      title: 'Search Term',
+      type: 'short-input',
+      placeholder: 'Search reports by name',
+      condition: { field: 'operation', value: ['list_reports'] },
+    },
+    {
+      id: 'includeDetails',
+      title: 'Include Details',
+      type: 'short-input',
+      placeholder: 'Include detail rows (true/false)',
+      condition: { field: 'operation', value: ['run_report'] },
+    },
+    {
+      id: 'filters',
+      title: 'Report Filters',
+      type: 'long-input',
+      placeholder: 'JSON array of report filters',
+      condition: { field: 'operation', value: ['run_report'] },
+    },
+    // Dashboard fields
+    {
+      id: 'dashboardId',
+      title: 'Dashboard ID',
+      type: 'short-input',
+      placeholder: 'Dashboard ID',
+      condition: { field: 'operation', value: ['get_dashboard', 'refresh_dashboard'] },
+      required: true,
+    },
+    // Query fields
+    {
+      id: 'query',
+      title: 'SOQL Query',
+      type: 'long-input',
+      placeholder: 'SELECT Id, Name FROM Account LIMIT 10',
+      condition: { field: 'operation', value: ['query'] },
+      required: true,
+    },
+    {
+      id: 'nextRecordsUrl',
+      title: 'Next Records URL',
+      type: 'short-input',
+      placeholder: 'URL from previous query response',
+      condition: { field: 'operation', value: ['query_more'] },
+      required: true,
+    },
+    {
+      id: 'objectName',
+      title: 'Object Name',
+      type: 'short-input',
+      placeholder: 'API name (e.g., Account, Lead, Custom_Object__c)',
+      condition: { field: 'operation', value: ['describe_object'] },
+      required: true,
+    },
     // Long-input fields at the bottom
     {
       id: 'description',
@@ -418,6 +500,17 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
       'salesforce_create_task',
       'salesforce_update_task',
       'salesforce_delete_task',
+      'salesforce_list_reports',
+      'salesforce_get_report',
+      'salesforce_run_report',
+      'salesforce_list_report_types',
+      'salesforce_list_dashboards',
+      'salesforce_get_dashboard',
+      'salesforce_refresh_dashboard',
+      'salesforce_query',
+      'salesforce_query_more',
+      'salesforce_describe_object',
+      'salesforce_list_objects',
     ],
     config: {
       tool: (params) => {
@@ -470,6 +563,28 @@ export const SalesforceBlock: BlockConfig<SalesforceResponse> = {
             return 'salesforce_update_task'
           case 'delete_task':
             return 'salesforce_delete_task'
+          case 'list_reports':
+            return 'salesforce_list_reports'
+          case 'get_report':
+            return 'salesforce_get_report'
+          case 'run_report':
+            return 'salesforce_run_report'
+          case 'list_report_types':
+            return 'salesforce_list_report_types'
+          case 'list_dashboards':
+            return 'salesforce_list_dashboards'
+          case 'get_dashboard':
+            return 'salesforce_get_dashboard'
+          case 'refresh_dashboard':
+            return 'salesforce_refresh_dashboard'
+          case 'query':
+            return 'salesforce_query'
+          case 'query_more':
+            return 'salesforce_query_more'
+          case 'describe_object':
+            return 'salesforce_describe_object'
+          case 'list_objects':
+            return 'salesforce_list_objects'
           default:
             throw new Error(`Unknown operation: ${params.operation}`)
         }

apps/sim/lib/auth/auth.ts

@@ -98,6 +98,32 @@ export const auth = betterAuth({
         },
       },
     },
+    account: {
+      create: {
+        after: async (account) => {
+          // Salesforce doesn't return expires_in in its token response (unlike other OAuth providers).
+          // We set a default 2-hour expiration so token refresh logic works correctly.
+          if (account.providerId === 'salesforce' && !account.accessTokenExpiresAt) {
+            const twoHoursFromNow = new Date(Date.now() + 2 * 60 * 60 * 1000)
+            try {
+              await db
+                .update(schema.account)
+                .set({ accessTokenExpiresAt: twoHoursFromNow })
+                .where(eq(schema.account.id, account.id))
+              logger.info(
+                '[databaseHooks.account.create.after] Set default expiration for Salesforce token',
+                { accountId: account.id, expiresAt: twoHoursFromNow }
+              )
+            } catch (error) {
+              logger.error(
+                '[databaseHooks.account.create.after] Failed to set Salesforce token expiration',
+                { accountId: account.id, error }
+              )
+            }
+          }
+        },
+      },
+    },
     session: {
       create: {
         before: async (session) => {
@@ -841,9 +867,10 @@ export const auth = betterAuth({
           authorizationUrl: 'https://login.salesforce.com/services/oauth2/authorize',
           tokenUrl: 'https://login.salesforce.com/services/oauth2/token',
           userInfoUrl: 'https://login.salesforce.com/services/oauth2/userinfo',
-          scopes: ['api', 'refresh_token', 'openid'],
+          scopes: ['api', 'refresh_token', 'openid', 'offline_access'],
           pkce: true,
           prompt: 'consent',
+          accessType: 'offline',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/salesforce`,
           getUserInfo: async (tokens) => {
             try {

apps/sim/lib/oauth/oauth.ts

@@ -840,7 +840,7 @@ export const OAUTH_PROVIDERS: Record<string, OAuthProviderConfig> = {
         providerId: 'salesforce',
         icon: (props) => SalesforceIcon(props),
         baseProviderIcon: (props) => SalesforceIcon(props),
-        scopes: ['api', 'refresh_token', 'openid'],
+        scopes: ['api', 'refresh_token', 'openid', 'offline_access'],
       },
     },
     defaultService: 'salesforce',
@@ -1427,7 +1427,7 @@ function getProviderAuthConfig(provider: string): ProviderAuthConfig {
         clientId,
         clientSecret,
         useBasicAuth: false,
-        supportsRefreshTokenRotation: false,
+        supportsRefreshTokenRotation: true,
       }
     }
     case 'shopify': {
@@ -1546,9 +1546,15 @@ export async function refreshOAuthToken(
 
       logger.error('Token refresh failed:', {
         status: response.status,
+        statusText: response.statusText,
         error: errorText,
         parsedError: errorData,
         providerId,
+        tokenEndpoint: config.tokenEndpoint,
+        hasClientId: !!config.clientId,
+        hasClientSecret: !!config.clientSecret,
+        hasRefreshToken: !!refreshToken,
+        refreshTokenPrefix: refreshToken ? `${refreshToken.substring(0, 10)}...` : 'none',
       })
       throw new Error(`Failed to refresh token: ${response.status} ${errorText}`)
     }

apps/sim/tools/registry.ts

@@ -928,12 +928,23 @@ import {
   salesforceDeleteLeadTool,
   salesforceDeleteOpportunityTool,
   salesforceDeleteTaskTool,
+  salesforceDescribeObjectTool,
   salesforceGetAccountsTool,
   salesforceGetCasesTool,
   salesforceGetContactsTool,
+  salesforceGetDashboardTool,
   salesforceGetLeadsTool,
   salesforceGetOpportunitiesTool,
+  salesforceGetReportTool,
   salesforceGetTasksTool,
+  salesforceListDashboardsTool,
+  salesforceListObjectsTool,
+  salesforceListReportsTool,
+  salesforceListReportTypesTool,
+  salesforceQueryMoreTool,
+  salesforceQueryTool,
+  salesforceRefreshDashboardTool,
+  salesforceRunReportTool,
   salesforceUpdateAccountTool,
   salesforceUpdateCaseTool,
   salesforceUpdateContactTool,
@@ -2275,6 +2286,17 @@ export const tools: Record<string, ToolConfig> = {
   salesforce_create_task: salesforceCreateTaskTool,
   salesforce_update_task: salesforceUpdateTaskTool,
   salesforce_delete_task: salesforceDeleteTaskTool,
+  salesforce_list_reports: salesforceListReportsTool,
+  salesforce_get_report: salesforceGetReportTool,
+  salesforce_run_report: salesforceRunReportTool,
+  salesforce_list_report_types: salesforceListReportTypesTool,
+  salesforce_list_dashboards: salesforceListDashboardsTool,
+  salesforce_get_dashboard: salesforceGetDashboardTool,
+  salesforce_refresh_dashboard: salesforceRefreshDashboardTool,
+  salesforce_query: salesforceQueryTool,
+  salesforce_query_more: salesforceQueryMoreTool,
+  salesforce_describe_object: salesforceDescribeObjectTool,
+  salesforce_list_objects: salesforceListObjectsTool,
   pylon_list_issues: pylonListIssuesTool,
   pylon_create_issue: pylonCreateIssueTool,
   pylon_get_issue: pylonGetIssueTool,