@@ -34,19 +34,12 @@ pub fn create_oauth_auth_resolver<C: Connection + 'static>(
3434
3535 // Only handle Anthropic OAuth for now
3636 if adapter_kind == AdapterKind :: Anthropic {
37- tracing:: debug!( "Checking OAuth token for Anthropic, user: {}" , user_id) ;
3837 // Use OAuthModelProvider to handle token refresh automatically
3938 let provider =
4039 crate :: oauth:: integration:: OAuthModelProvider :: new ( db. clone ( ) , user_id. clone ( ) ) ;
4140
4241 match provider. get_token ( "anthropic" ) . await {
4342 Ok ( Some ( token) ) => {
44- // Token is automatically refreshed if needed by get_token()
45- tracing:: debug!(
46- "Using OAuth token for Anthropic (expires: {})" ,
47- token. expires_at
48- ) ;
49-
5043 // Return bearer token with "Bearer " prefix so genai detects OAuth
5144 return Ok ( Some ( AuthData :: Key ( format ! (
5245 "Bearer {}" ,
@@ -57,9 +50,6 @@ pub fn create_oauth_auth_resolver<C: Connection + 'static>(
5750 // No OAuth token found
5851 // Check if API key is available as fallback
5952 if std:: env:: var ( "ANTHROPIC_API_KEY" ) . is_ok ( ) {
60- tracing:: debug!(
61- "No OAuth token found for Anthropic, falling back to API key"
62- ) ;
6353 // Return None to use default auth (API key)
6454 return Ok ( None ) ;
6555 } else {
@@ -102,67 +92,6 @@ pub fn create_service_target_resolver() -> ServiceTargetResolver {
10292 ServiceTargetResolver :: from_resolver_async_fn ( resolver_fn)
10393}
10494
105- /// Load OAuth token for a provider from the database
106- #[ allow( dead_code) ]
107- async fn get_oauth_token < C : Connection > (
108- db : & Surreal < C > ,
109- user_id : & UserId ,
110- provider : & str ,
111- ) -> Result < Option < OAuthToken > , CoreError > {
112- // Query for OAuth token belonging to this user and provider
113- let query = r#"
114- SELECT * FROM oauth_token
115- WHERE owner_id = $user_id
116- AND provider = $provider
117- ORDER BY last_used_at DESC
118- LIMIT 1
119- "# ;
120-
121- // Clone to avoid borrow issues
122- let user_id = user_id. clone ( ) ;
123- let provider = provider. to_string ( ) ;
124-
125- let mut result = db
126- . query ( query)
127- . bind ( ( "user_id" , RecordId :: from ( user_id. clone ( ) ) ) )
128- . bind ( ( "provider" , provider. clone ( ) ) )
129- . await
130- . map_err ( |e| CoreError :: DatabaseQueryFailed {
131- query : query. to_string ( ) ,
132- table : "oauth_token" . to_string ( ) ,
133- cause : e,
134- } ) ?;
135-
136- let tokens: Vec < <OAuthToken as DbEntity >:: DbModel > =
137- result. take ( 0 ) . map_err ( |e| CoreError :: DatabaseQueryFailed {
138- query : query. to_string ( ) ,
139- table : "oauth_token" . to_string ( ) ,
140- cause : e,
141- } ) ?;
142-
143- let mut tokens = tokens
144- . into_iter ( )
145- . map ( |tok| OAuthToken :: from_db_model ( tok) . expect ( "should be the db model" ) ) ;
146-
147- let token = tokens. next ( ) ;
148-
149- if token. is_none ( ) {
150- tracing:: info!(
151- "No OAuth token found for user {} provider {}" ,
152- user_id,
153- provider
154- ) ;
155- } else {
156- tracing:: info!(
157- "Found OAuth token for user {} provider {}" ,
158- user_id,
159- provider
160- ) ;
161- }
162-
163- Ok ( token)
164- }
165-
16695/// Builder for creating a genai client with OAuth support
16796pub struct OAuthClientBuilder < C : Connection > {
16897 db : Arc < Surreal < C > > ,
0 commit comments