[Microsoft] Move Application disabled error to oauth (#7734)

Description
---
This kind of error should be handled in oauth.

Risks
---
na

Deploy
---
- core
- connectors

connectors/src/lib/error.ts

@@ -1,10 +1,6 @@
 // JS cannot give you any guarantee about the shape of an error you `catch`
 
-import type {
-  APIError,
-  ConnectorProvider,
-  OAuthAPIError,
-} from "@dust-tt/types";
+import type { APIError, ConnectorProvider } from "@dust-tt/types";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function errorFromAny(e: any): Error {
@@ -76,17 +72,6 @@ export function isNotFoundError(err: unknown): err is NotFoundError {
   return err instanceof HTTPError && err.statusCode === 404;
 }
 
-export function isMicrosoftApplicationDisabledError(
-  error: OAuthAPIError,
-  provider: string
-): boolean {
-  return (
-    error.code === "provider_access_token_refresh_error" &&
-    provider === "microsoft" &&
-    /Application.*is disabled/.test(error.message)
-  );
-}
-
 // Error for invalid rows when upserting table
 export class InvalidRowsRequestError extends Error {
   constructor(message: string) {

connectors/src/lib/oauth.ts

@@ -3,10 +3,7 @@ import { getOAuthConnectionAccessToken } from "@dust-tt/types";
 import type { LoggerInterface } from "@dust-tt/types/dist/shared/logger";
 
 import { apiConfig } from "@connectors/lib/api/config";
-import {
-  ExternalOAuthTokenError,
-  isMicrosoftApplicationDisabledError,
-} from "@connectors/lib/error";
+import { ExternalOAuthTokenError } from "@connectors/lib/error";
 
 // Most connectors are built on the assumption that errors are thrown with special handling of
 // selected errors such as ExternalOauthTokenError. This function is used to retrieve an OAuth
@@ -40,8 +37,7 @@ export async function getOAuthConnectionAccessTokenWithThrow({
 
     if (
       tokRes.error.code === "token_revoked_error" ||
-      tokRes.error.code === "connection_not_found" ||
-      isMicrosoftApplicationDisabledError(tokRes.error, provider)
+      tokRes.error.code === "connection_not_found"
     ) {
       throw new ExternalOAuthTokenError(new Error(tokRes.error.message));
     } else {

core/src/oauth/providers/microsoft.rs

@@ -11,6 +11,7 @@ use crate::{
 use anyhow::{anyhow, Result};
 use async_trait::async_trait;
 use lazy_static::lazy_static;
+use regex::Regex;
 use serde_json::json;
 use std::env;
 
@@ -143,6 +144,8 @@ impl Provider for MicrosoftConnectionProvider {
     }
 
     fn handle_provider_request_error(&self, error: ProviderHttpRequestError) -> ProviderError {
+        let app_disabled_regex = Regex::new(r"Application.*is disabled").unwrap();
+
         match &error {
             ProviderHttpRequestError::RequestFailed {
                 status, message, ..
@@ -158,6 +161,15 @@ impl Provider for MicrosoftConnectionProvider {
                     self.default_handle_provider_request_error(error)
                 }
             }
+            ProviderHttpRequestError::RequestFailed {
+                status, message, ..
+            } if *status == 403 => {
+                if app_disabled_regex.is_match(message) {
+                    ProviderError::TokenRevokedError
+                } else {
+                    self.default_handle_provider_request_error(error)
+                }
+            }
             _ => {
                 // Call the default implementation for other cases.
                 self.default_handle_provider_request_error(error)