restore error thorwing

Author: aadamgough

apps/sim/app/api/auth/oauth/token/route.ts

@@ -129,12 +129,8 @@ export async function POST(request: NextRequest) {
         { status: 200 }
       )
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : 'Failed to refresh access token'
-      logger.error(`[${requestId}] Failed to refresh access token:`, {
-        error: errorMessage,
-        stack: error instanceof Error ? error.stack : undefined,
-      })
-      return NextResponse.json({ error: errorMessage }, { status: 401 })
+      logger.error(`[${requestId}] Failed to refresh access token:`, error)
+      return NextResponse.json({ error: 'Failed to refresh access token' }, { status: 401 })
     }
   } catch (error) {
     logger.error(`[${requestId}] Error getting access token`, error)
@@ -211,13 +207,8 @@ export async function GET(request: NextRequest) {
         },
         { status: 200 }
       )
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : 'Failed to refresh access token'
-      logger.error(`[${requestId}] Failed to refresh access token:`, {
-        error: errorMessage,
-        stack: error instanceof Error ? error.stack : undefined,
-      })
-      return NextResponse.json({ error: errorMessage }, { status: 401 })
+    } catch (_error) {
+      return NextResponse.json({ error: 'Failed to refresh access token' }, { status: 401 })
     }
   } catch (error) {
     logger.error(`[${requestId}] Error fetching access token`, error)

apps/sim/lib/oauth/oauth.ts

@@ -1171,7 +1171,7 @@ export async function refreshOAuthToken(
 
     if (!response.ok) {
       const errorText = await response.text()
-      let errorData: any = errorText
+      let errorData = errorText
 
       try {
         errorData = JSON.parse(errorText)
@@ -1191,29 +1191,6 @@ export async function refreshOAuthToken(
         hasRefreshToken: !!refreshToken,
         refreshTokenPrefix: refreshToken ? `${refreshToken.substring(0, 10)}...` : 'none',
       })
-
-      // Check for Google Workspace session control errors (RAPT - Reauthentication Policy Token)
-      // This occurs when the organization enforces periodic re-authentication
-      if (
-        typeof errorData === 'object' &&
-        (errorData.error_subtype === 'invalid_rapt' ||
-          errorData.error_description?.includes('reauth related error'))
-      ) {
-        throw new Error(
-          `Session expired due to organization security policy. Please reconnect your ${providerId} account to continue. Alternatively, ask your Google Workspace admin to exempt this app from session control: Admin Console → Security → Google Cloud session control → "Exempt trusted apps".`
-        )
-      }
-
-      if (
-        typeof errorData === 'object' &&
-        errorData.error === 'invalid_grant' &&
-        !errorData.error_subtype
-      ) {
-        throw new Error(
-          `Access has been revoked or the refresh token is no longer valid. Please reconnect your ${providerId} account.`
-        )
-      }
-
       throw new Error(`Failed to refresh token: ${response.status} ${errorText}`)
     }
 
@@ -1247,6 +1224,6 @@ export async function refreshOAuthToken(
     }
   } catch (error) {
     logger.error('Error refreshing token:', { error })
-    throw error
+    return null
   }
 }

apps/sim/tools/google_vault/types.ts

@@ -36,13 +36,11 @@ export type GoogleVaultCorpus = 'MAIL' | 'DRIVE' | 'GROUPS' | 'HANGOUTS_CHAT' |
 export interface GoogleVaultCreateMattersHoldsParams extends GoogleVaultCommonParams {
   holdName: string
   corpus: GoogleVaultCorpus
-  accountEmails?: string // Comma-separated list or array handled in the tool
+  accountEmails?: string
   orgUnitId?: string
-  // Query parameters for MAIL and GROUPS corpus (date filtering)
   terms?: string
   startTime?: string
   endTime?: string
-  // Drive-specific option
   includeSharedDrives?: boolean
 }