oauth required modal

Author: Adam Gough

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel-new/components/editor/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx

@@ -189,6 +189,48 @@ const SCOPE_DESCRIPTIONS: Record<string, string> = {
   'sites:write': 'Manage webhooks and site settings',
   'cms:read': 'View your CMS content',
   'cms:write': 'Manage your CMS content',
+  'crm.objects.contacts.read': 'Read your HubSpot contacts',
+  'crm.objects.contacts.write': 'Create and update HubSpot contacts',
+  'crm.objects.companies.read': 'Read your HubSpot companies',
+  'crm.objects.companies.write': 'Create and update HubSpot companies',
+  'crm.objects.deals.read': 'Read your HubSpot deals',
+  'crm.objects.deals.write': 'Create and update HubSpot deals',
+  'crm.objects.owners.read': 'Read HubSpot object owners',
+  'crm.objects.users.read': 'Read HubSpot users',
+  'crm.objects.users.write': 'Create and update HubSpot users',
+  'crm.objects.marketing_events.read': 'Read HubSpot marketing events',
+  'crm.objects.marketing_events.write': 'Create and update HubSpot marketing events',
+  'crm.objects.line_items.read': 'Read HubSpot line items',
+  'crm.objects.line_items.write': 'Create and update HubSpot line items',
+  'crm.objects.quotes.read': 'Read HubSpot quotes',
+  'crm.objects.quotes.write': 'Create and update HubSpot quotes',
+  'crm.objects.appointments.read': 'Read HubSpot appointments',
+  'crm.objects.appointments.write': 'Create and update HubSpot appointments',
+  'crm.objects.carts.read': 'Read HubSpot shopping carts',
+  'crm.objects.carts.write': 'Create and update HubSpot shopping carts',
+  'crm.import': 'Import data into HubSpot',
+  'crm.lists.read': 'Read HubSpot lists',
+  'crm.lists.write': 'Create and update HubSpot lists',
+  tickets: 'Manage HubSpot tickets',
+  api: 'Access Salesforce API',
+  full: 'Full access to your Salesforce data',
+  refresh_token: 'Maintain long-term access to your Salesforce account',
+  default: 'Access your Asana workspace',
+  base: 'Basic access to your Pipedrive account',
+  'deals:read': 'Read your Pipedrive deals',
+  'deals:full': 'Full access to manage your Pipedrive deals',
+  'contacts:read': 'Read your Pipedrive contacts',
+  'contacts:full': 'Full access to manage your Pipedrive contacts',
+  'leads:read': 'Read your Pipedrive leads',
+  'leads:full': 'Full access to manage your Pipedrive leads',
+  'activities:read': 'Read your Pipedrive activities',
+  'activities:full': 'Full access to manage your Pipedrive activities',
+  'mail:read': 'Read your Pipedrive emails',
+  'mail:full': 'Full access to manage your Pipedrive emails',
+  'projects:read': 'Read your Pipedrive projects',
+  'projects:full': 'Full access to manage your Pipedrive projects',
+  'webhooks:read': 'Read your Pipedrive webhooks',
+  'webhooks:full': 'Full access to manage your Pipedrive webhooks',
 }
 
 function getScopeDescription(scope: string): string {

apps/sim/lib/auth.ts

@@ -671,6 +671,7 @@ export const auth = betterAuth({
           authorizationUrl: 'https://oauth.pipedrive.com/oauth/authorize',
           tokenUrl: 'https://oauth.pipedrive.com/oauth/token',
           userInfoUrl: 'https://api.pipedrive.com/v1/users/me',
+          prompt: 'consent',
           scopes: [
             'base',
             'deals:read',
@@ -734,6 +735,9 @@ export const auth = betterAuth({
           authorizationUrl: 'https://app.hubspot.com/oauth/authorize',
           tokenUrl: 'https://api.hubapi.com/oauth/v1/token',
           userInfoUrl: 'https://api.hubapi.com/oauth/v1/access-tokens',
+          prompt: 'consent',
+          responseType: 'code',
+          overrideUserInfo: true,
           scopes: [
             'crm.objects.contacts.read',
             'crm.objects.contacts.write',
@@ -777,6 +781,14 @@ export const auth = betterAuth({
 
               const data = await response.json()
 
+              logger.info('HubSpot token metadata response:', {
+                hasScopes: !!data.scopes,
+                scopesType: typeof data.scopes,
+                scopesIsArray: Array.isArray(data.scopes),
+                scopesValue: data.scopes,
+                fullResponse: data,
+              })
+
               return {
                 id: data.user_id || data.hub_id.toString(),
                 name: data.user || 'HubSpot User',
@@ -785,6 +797,11 @@ export const auth = betterAuth({
                 image: undefined,
                 createdAt: new Date(),
                 updatedAt: new Date(),
+                // Extract scopes from HubSpot's response and convert array to space-delimited string
+                // Use 'scope' (singular) as that's what better-auth expects for the account table
+                ...(data.scopes && Array.isArray(data.scopes)
+                  ? { scope: data.scopes.join(' ') }
+                  : {}),
               }
             } catch (error) {
               logger.error('Error creating HubSpot user profile:', { error })
@@ -803,6 +820,7 @@ export const auth = betterAuth({
           userInfoUrl: 'https://login.salesforce.com/services/oauth2/userinfo',
           scopes: ['api', 'full', 'openid', 'refresh_token', 'offline_access'],
           pkce: true,
+          prompt: 'consent',
           redirectURI: `${getBaseUrl()}/api/auth/oauth2/callback/salesforce`,
           getUserInfo: async (tokens) => {
             try {