Skip to content

Commit c23130a

Browse files
authored
Revert "fix(salesforce): updated to more flexible oauth that allows production, developer, and custom domain salesforce orgs (#2441) (#2444)" (#2453)
This reverts commit 9da19e8.
1 parent 7575cd6 commit c23130a

File tree

12 files changed

+205
-769
lines changed

12 files changed

+205
-769
lines changed

apps/sim/app/api/auth/oauth/utils.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ describe('OAuth Utils', () => {
153153

154154
const result = await refreshTokenIfNeeded('request-id', mockCredential, 'credential-id')
155155

156-
expect(mockRefreshOAuthToken).toHaveBeenCalledWith('google', 'refresh-token', undefined)
156+
expect(mockRefreshOAuthToken).toHaveBeenCalledWith('google', 'refresh-token')
157157
expect(mockDb.update).toHaveBeenCalled()
158158
expect(mockDb.set).toHaveBeenCalled()
159159
expect(result).toEqual({ accessToken: 'new-token', refreshed: true })
@@ -228,7 +228,7 @@ describe('OAuth Utils', () => {
228228

229229
const token = await refreshAccessTokenIfNeeded('credential-id', 'test-user-id', 'request-id')
230230

231-
expect(mockRefreshOAuthToken).toHaveBeenCalledWith('google', 'refresh-token', undefined)
231+
expect(mockRefreshOAuthToken).toHaveBeenCalledWith('google', 'refresh-token')
232232
expect(mockDb.update).toHaveBeenCalled()
233233
expect(mockDb.set).toHaveBeenCalled()
234234
expect(token).toBe('new-token')

apps/sim/app/api/auth/oauth/utils.ts

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,8 @@ export async function getOAuthToken(userId: string, providerId: string): Promise
131131
)
132132

133133
try {
134-
const refreshResult = await refreshOAuthToken(
135-
providerId,
136-
credential.refreshToken!,
137-
credential.idToken || undefined
138-
)
134+
// Use the existing refreshOAuthToken function
135+
const refreshResult = await refreshOAuthToken(providerId, credential.refreshToken!)
139136

140137
if (!refreshResult) {
141138
logger.error(`Failed to refresh token for user ${userId}, provider ${providerId}`, {
@@ -220,8 +217,7 @@ export async function refreshAccessTokenIfNeeded(
220217
try {
221218
const refreshedToken = await refreshOAuthToken(
222219
credential.providerId,
223-
credential.refreshToken!,
224-
credential.idToken || undefined
220+
credential.refreshToken!
225221
)
226222

227223
if (!refreshedToken) {
@@ -293,11 +289,7 @@ export async function refreshTokenIfNeeded(
293289
}
294290

295291
try {
296-
const refreshResult = await refreshOAuthToken(
297-
credential.providerId,
298-
credential.refreshToken!,
299-
credential.idToken || undefined
300-
)
292+
const refreshResult = await refreshOAuthToken(credential.providerId, credential.refreshToken!)
301293

302294
if (!refreshResult) {
303295
logger.error(`[${requestId}] Failed to refresh token for credential`)

apps/sim/app/api/auth/oauth2/callback/salesforce/route.ts

Lines changed: 0 additions & 221 deletions
This file was deleted.

0 commit comments

Comments
 (0)