Skip to content

fix(airtable): fixed airtable oauth token refresh, added tests #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
waleedlatif1 merged 2 commits into from
Jun 15, 2025
Merged

fix(airtable): fixed airtable oauth token refresh, added tests #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1319971
fixed airtable token refresh, added tests
waleedlatif1 Jun 15, 2025
2b6d6bc
added helpers for refreshOAuthToken function
waleedlatif1 Jun 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/sim/app/api/auth/oauth/credentials/route.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import { jwtDecode } from 'jwt-decode'
import { type NextRequest, NextResponse } from 'next/server'
import { getSession } from '@/lib/auth'
import { createLogger } from '@/lib/logs/console-logger'
import type { OAuthService } from '@/lib/oauth'
import { parseProvider } from '@/lib/oauth'
import type { OAuthService } from '@/lib/oauth/oauth'
import { parseProvider } from '@/lib/oauth/oauth'
import { db } from '@/db'
import { account, user } from '@/db/schema'

Expand Down
6 changes: 3 additions & 3 deletions apps/sim/app/api/auth/oauth/utils.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe('OAuth Utils', () => {
db: mockDb,
}))

vi.doMock('@/lib/oauth', () => ({
vi.doMock('@/lib/oauth/oauth', () => ({
refreshOAuthToken: mockRefreshOAuthToken,
}))

Expand Down Expand Up @@ -181,13 +181,13 @@ describe('OAuth Utils', () => {
providerId: 'google',
}

mockRefreshOAuthToken.mockRejectedValueOnce(new Error('Refresh failed'))
mockRefreshOAuthToken.mockResolvedValueOnce(null)

const { refreshTokenIfNeeded } = await import('./utils')

await expect(
refreshTokenIfNeeded('request-id', mockCredential, 'credential-id')
).rejects.toThrow()
).rejects.toThrow('Failed to refresh token')

expect(mockLogger.error).toHaveBeenCalled()
})
Expand Down
2 changes: 1 addition & 1 deletion apps/sim/app/api/auth/oauth/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { and, eq } from 'drizzle-orm'
import { getSession } from '@/lib/auth'
import { createLogger } from '@/lib/logs/console-logger'
import { refreshOAuthToken } from '@/lib/oauth'
import { refreshOAuthToken } from '@/lib/oauth/oauth'
import { db } from '@/db'
import { account, workflow } from '@/db/schema'

Expand Down
2 changes: 1 addition & 1 deletion ...k/components/sub-block/components/credential-selector/components/oauth-required-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
OAUTH_PROVIDERS,
type OAuthProvider,
parseProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'

const logger = createLogger('OAuthRequiredModal')
Expand Down
2 changes: 1 addition & 1 deletion ...orkflow-block/components/sub-block/components/credential-selector/credential-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
OAUTH_PROVIDERS,
type OAuthProvider,
parseProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from './components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion ...ock/components/sub-block/components/file-selector/components/confluence-file-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
getProviderIdFromServiceId,
getServiceIdFromScopes,
type OAuthProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion ...ow-block/components/sub-block/components/file-selector/components/google-drive-picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
OAUTH_PROVIDERS,
type OAuthProvider,
parseProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion ...ow-block/components/sub-block/components/file-selector/components/jira-issue-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
getProviderIdFromServiceId,
getServiceIdFromScopes,
type OAuthProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion ...lock/components/sub-block/components/file-selector/components/microsoft-file-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
OAUTH_PROVIDERS,
type OAuthProvider,
parseProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion ...block/components/sub-block/components/file-selector/components/teams-message-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
getProviderIdFromServiceId,
getServiceIdFromScopes,
type OAuthProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
6 changes: 5 additions & 1 deletion ...onents/workflow-block/components/sub-block/components/folder-selector/folder-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ import {
} from '@/components/ui/command'
import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
import { createLogger } from '@/lib/logs/console-logger'
import { type Credential, getProviderIdFromServiceId, getServiceIdFromScopes } from '@/lib/oauth'
import {
type Credential,
getProviderIdFromServiceId,
getServiceIdFromScopes,
} from '@/lib/oauth/oauth'
import { OAuthRequiredModal } from '@/app/w/[id]/components/workflow-block/components/sub-block/components/credential-selector/components/oauth-required-modal'
import { saveToStorage } from '@/stores/workflows/persistence'

Expand Down
2 changes: 1 addition & 1 deletion ...ock/components/sub-block/components/project-selector/components/jira-project-selector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import {
getProviderIdFromServiceId,
getServiceIdFromScopes,
type OAuthProvider,
} from '@/lib/oauth'
} from '@/lib/oauth/oauth'
import { saveToStorage } from '@/stores/workflows/persistence'
import { OAuthRequiredModal } from '../../credential-selector/components/oauth-required-modal'

Expand Down
2 changes: 1 addition & 1 deletion .../[id]/components/workflow-block/components/sub-block/components/tool-input/tool-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
} from '@/components/ui/select'
import { Toggle } from '@/components/ui/toggle'
import { Tooltip, TooltipContent, TooltipTrigger } from '@/components/ui/tooltip'
import type { OAuthProvider } from '@/lib/oauth'
import type { OAuthProvider } from '@/lib/oauth/oauth'
import { cn } from '@/lib/utils'
import { getAllBlocks } from '@/blocks'
import { supportsToolUsageControl } from '@/providers/model-capabilities'
Expand Down
2 changes: 1 addition & 1 deletion ...app/w/components/sidebar/components/settings-modal/components/credentials/credentials.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { Input } from '@/components/ui/input'
import { Skeleton } from '@/components/ui/skeleton'
import { client, useSession } from '@/lib/auth-client'
import { createLogger } from '@/lib/logs/console-logger'
import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth'
import { OAUTH_PROVIDERS, type OAuthServiceConfig } from '@/lib/oauth/oauth'
import { cn } from '@/lib/utils'
import { loadFromStorage, removeFromStorage, saveToStorage } from '@/stores/workflows/persistence'

Expand Down
Loading