chore(bitbucket): keep integration changes scoped

Author: Bill Leoutsakos

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

@@ -63,22 +63,11 @@ function mockSelectChain(limitResult: unknown[]) {
  * Creates a chainable mock for db.update() calls.
  * Returns a nested chain: update() -> set() -> where()
  */
-function mockUpdateChain(returningResult: unknown[] = [{ id: 'updated-account' }]) {
-  const mockReturning = vi.fn().mockResolvedValue(returningResult)
-  const mockWhere = vi.fn().mockReturnValue({ returning: mockReturning })
+function mockUpdateChain() {
+  const mockWhere = vi.fn().mockResolvedValue({})
   const mockSet = vi.fn().mockReturnValue({ where: mockWhere })
   mockDb.update.mockReturnValueOnce({ set: mockSet })
-  return { mockSet, mockWhere, mockReturning }
-}
-
-function refreshChain(overrides: Record<string, unknown> = {}) {
-  return {
-    accessToken: 'expired-token',
-    refreshToken: 'refresh-token',
-    accessTokenExpiresAt: new Date(Date.now() - 3600 * 1000),
-    chainVersion: new Date('2026-08-19T20:00:00.000Z'),
-    ...overrides,
-  }
+  return { mockSet, mockWhere }
 }
 
 describe('OAuth Utils', () => {
@@ -144,14 +133,14 @@ describe('OAuth Utils', () => {
         accessTokenExpiresAt: new Date(Date.now() - 3600 * 1000),
         providerId: 'google',
       }
+
       mockRefreshOAuthToken.mockResolvedValueOnce({
         ok: true,
         accessToken: 'new-token',
         expiresIn: 3600,
         refreshToken: 'new-refresh-token',
       })
 
-      mockSelectChain([refreshChain()])
       mockUpdateChain()
 
       const result = await refreshTokenIfNeeded('request-id', mockCredential, 'credential-id')
@@ -169,9 +158,6 @@ describe('OAuth Utils', () => {
         accessTokenExpiresAt: new Date(Date.now() - 3600 * 1000),
         providerId: 'google',
       }
-      const chainVersion = new Date('2026-08-19T20:00:00.000Z')
-      mockSelectChain([refreshChain({ chainVersion })])
-      mockSelectChain([{ refreshToken: 'refresh-token', updatedAt: chainVersion }])
 
       mockRefreshOAuthToken.mockResolvedValueOnce({
         ok: false,
@@ -242,7 +228,6 @@ describe('OAuth Utils', () => {
       }
       mockSelectChain([mockResolvedCredential])
       mockSelectChain([mockAccountRow])
-      mockSelectChain([refreshChain()])
       mockUpdateChain()
 
       mockRefreshOAuthToken.mockResolvedValueOnce({
@@ -285,9 +270,6 @@ describe('OAuth Utils', () => {
       }
       mockSelectChain([mockResolvedCredential])
       mockSelectChain([mockAccountRow])
-      const chainVersion = new Date('2026-08-19T20:00:00.000Z')
-      mockSelectChain([refreshChain({ chainVersion })])
-      mockSelectChain([{ refreshToken: 'refresh-token', updatedAt: chainVersion }])
 
       mockRefreshOAuthToken.mockResolvedValueOnce({
         ok: false,
@@ -301,111 +283,6 @@ describe('OAuth Utils', () => {
     })
   })
 
-  describe('rotating per-account refresh', () => {
-    const past = new Date(Date.now() - 3600 * 1000)
-    const chainVersion = new Date('2026-08-19T20:00:00.000Z')
-
-    function bitbucketCredential(overrides: Record<string, unknown> = {}) {
-      return {
-        id: 'account-1',
-        resolvedCredentialId: 'account-1',
-        accountId: '{bitbucket-user}',
-        accessToken: 'stale-access',
-        refreshToken: 'captured-stale-refresh',
-        accessTokenExpiresAt: past,
-        providerId: 'bitbucket',
-        userId: 'user-1',
-        ...overrides,
-      }
-    }
-
-    it('serializes through PostgreSQL and refreshes from the latest persisted chain', async () => {
-      mockSelectChain([
-        refreshChain({
-          accessToken: 'expired-current-access',
-          refreshToken: 'latest-refresh',
-          chainVersion,
-        }),
-      ])
-      mockRefreshOAuthToken.mockResolvedValueOnce({
-        ok: true,
-        accessToken: 'new-access',
-        expiresIn: 3600,
-        refreshToken: 'rotated-refresh',
-      })
-      const { mockSet, mockReturning } = mockUpdateChain()
-
-      const result = await refreshTokenIfNeeded('request-id', bitbucketCredential(), 'account-1')
-
-      expect(result).toEqual({ accessToken: 'new-access', refreshed: true })
-      expect(mockDb.transaction).toHaveBeenCalledTimes(1)
-      expect(mockDb.execute).toHaveBeenCalledTimes(1)
-      expect(redisConfigMockFns.mockAcquireLock).toHaveBeenCalledWith(
-        'oauth:refresh:account-1',
-        expect.any(String),
-        30
-      )
-      expect(mockRefreshOAuthToken).toHaveBeenCalledWith('bitbucket', 'latest-refresh')
-      expect(mockSet).toHaveBeenCalledWith(
-        expect.objectContaining({
-          accessToken: 'new-access',
-          refreshToken: 'rotated-refresh',
-        })
-      )
-      expect(mockReturning).toHaveBeenCalledWith({ id: expect.anything() })
-    })
-
-    it('falls back to the database lock when Redis lock acquisition fails', async () => {
-      redisConfigMockFns.mockAcquireLock.mockRejectedValueOnce(new Error('redis unavailable'))
-      mockSelectChain([refreshChain({ chainVersion })])
-      mockRefreshOAuthToken.mockResolvedValueOnce({
-        ok: true,
-        accessToken: 'new-access',
-        expiresIn: 3600,
-        refreshToken: 'rotated-refresh',
-      })
-      mockUpdateChain()
-
-      const result = await refreshTokenIfNeeded(
-        'request-id',
-        bitbucketCredential({ refreshToken: 'refresh-token' }),
-        'account-1'
-      )
-
-      expect(result).toEqual({ accessToken: 'new-access', refreshed: true })
-      expect(mockDb.transaction).toHaveBeenCalledTimes(1)
-      expect(mockDb.execute).toHaveBeenCalledTimes(1)
-      expect(mockRefreshOAuthToken).toHaveBeenCalledTimes(1)
-    })
-
-    it('discards a CAS loser and returns the newer persisted access token', async () => {
-      mockSelectChain([refreshChain({ chainVersion })])
-      mockRefreshOAuthToken.mockResolvedValueOnce({
-        ok: true,
-        accessToken: 'losing-access',
-        expiresIn: 3600,
-        refreshToken: 'losing-refresh',
-      })
-      mockUpdateChain([])
-      mockSelectChain([
-        refreshChain({
-          accessToken: 'winning-access',
-          refreshToken: 'winning-refresh',
-          accessTokenExpiresAt: new Date(Date.now() + 3600 * 1000),
-          chainVersion: new Date('2026-08-19T20:00:01.000Z'),
-        }),
-      ])
-
-      const result = await refreshTokenIfNeeded(
-        'request-id',
-        bitbucketCredential({ refreshToken: 'refresh-token' }),
-        'account-1'
-      )
-
-      expect(result).toEqual({ accessToken: 'winning-access', refreshed: true })
-    })
-  })
-
   describe('Slack installation-scoped refresh', () => {
     const SLACK_ACCOUNT_ID = 'T08CM6ZNYBE-usr_U08USBQ9B1T-cbf46a7e-ca75-4a2e-bef5-fd467299eaae'
     const past = new Date(Date.now() - 3600 * 1000)
@@ -475,13 +352,6 @@ describe('OAuth Utils', () => {
     })
 
     it('keeps per-row behavior for pasted custom-bot account ids', async () => {
-      mockSelectChain([
-        refreshChain({
-          accessToken: 'stale-at',
-          refreshToken: 'stale-rt',
-          chainVersion: new Date('2026-08-19T20:00:00.000Z'),
-        }),
-      ])
       mockRefreshOAuthToken.mockResolvedValueOnce({
         ok: true,
         accessToken: 'new-at',

apps/sim/lib/concurrency/__tests__/leader-lock.test.ts

@@ -36,15 +36,14 @@ describe('withLeaderLock', () => {
       onFollower: async () => null,
     })
 
-    const [acquireKey, acquireValue, acquireTtl] = redisConfigMockFns.mockAcquireLock.mock.calls[0]!
+    const [acquireKey, acquireValue] = redisConfigMockFns.mockAcquireLock.mock.calls[0]!
     const [releaseKey, releaseValue] = redisConfigMockFns.mockReleaseLock.mock.calls[0]!
 
     expect(acquireKey).toBe('k')
     expect(releaseKey).toBe('k')
     expect(acquireValue).toBe(releaseValue)
     expect(typeof acquireValue).toBe('string')
     expect((acquireValue as string).length).toBeGreaterThan(0)
-    expect(acquireTtl).toBe(30)
   })
 
   it('falls back to uncoordinated leader when acquireLock throws', async () => {

apps/sim/lib/concurrency/leader-lock.ts

@@ -6,9 +6,9 @@ import { acquireLock, releaseLock } from '@/lib/core/config/redis'
 
 const logger = createLogger('LeaderLock')
 
-const DEFAULT_TTL_SEC = 30
+const DEFAULT_TTL_SEC = 10
 const DEFAULT_POLL_INTERVAL_MS = 100
-const DEFAULT_MAX_WAIT_MS = DEFAULT_TTL_SEC * 1000
+const DEFAULT_MAX_WAIT_MS = 3_000
 
 export interface LeaderLockOptions<T> {
   key: string