Run full test suite and fix any failures\n\nTask ID: task-5.1-final-validation

Author: vikrantpuppala

rust/src/auth/oauth/callback.rs

@@ -212,9 +212,10 @@ impl CallbackServer {
     /// Returns the redirect URI for this callback server.
     ///
     /// This URI should be used when constructing the OAuth authorization URL.
-    /// The format is `http://localhost:{port}/callback`.
+    /// The format is `http://localhost:{port}` (matching the redirect URI
+    /// registered for the `databricks-cli` OAuth application).
     pub fn redirect_uri(&self) -> String {
-        format!("http://localhost:{}/callback", self.port)
+        format!("http://localhost:{}", self.port)
     }
 
     /// Waits for the OAuth callback with the authorization code.
@@ -336,7 +337,7 @@ impl CallbackServer {
 
         let request = String::from_utf8_lossy(&buffer[..n]);
 
-        // Parse the request line (e.g., "GET /callback?code=...&state=... HTTP/1.1")
+        // Parse the request line (e.g., "GET /?code=...&state=... HTTP/1.1")
         let first_line = request.lines().next().unwrap_or("");
         let parts: Vec<&str> = first_line.split_whitespace().collect();
 
@@ -484,7 +485,7 @@ mod tests {
                 .expect("Failed to connect to callback server");
 
             let request = format!(
-                "GET /callback?code=test-auth-code-123&state={} HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
+                "GET /?code=test-auth-code-123&state={} HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
                 expected_state, port
             );
 
@@ -525,7 +526,7 @@ mod tests {
                 .expect("Failed to connect");
 
             let request = format!(
-                "GET /callback?code=auth-code&state={} HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
+                "GET /?code=auth-code&state={} HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
                 wrong_state, port
             );
 
@@ -589,7 +590,7 @@ mod tests {
 
             // Send callback without 'code' parameter
             let request = format!(
-                "GET /callback?state=test-state HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
+                "GET /?state=test-state HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
                 port
             );
 
@@ -620,7 +621,7 @@ mod tests {
 
             // Simulate authorization server error response
             let request = format!(
-                "GET /callback?error=access_denied&error_description=User%20denied%20consent HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
+                "GET /?error=access_denied&error_description=User%20denied%20consent HTTP/1.1\r\nHost: localhost:{}\r\n\r\n",
                 port
             );
 
@@ -671,6 +672,6 @@ mod tests {
         let server = CallbackServer::new(8020)
             .await
             .expect("Failed to create server");
-        assert_eq!(server.redirect_uri(), "http://localhost:8020/callback");
+        assert_eq!(server.redirect_uri(), "http://localhost:8020");
     }
 }

rust/src/auth/oauth/m2m.rs

@@ -188,7 +188,8 @@ impl ClientCredentialsProvider {
         token_endpoint_override: Option<String>,
     ) -> Result<Self> {
         // Discover OIDC endpoints or use override
-        let (token_endpoint, auth_endpoint) = if let Some(token_endpoint) = token_endpoint_override {
+        let (token_endpoint, auth_endpoint) = if let Some(token_endpoint) = token_endpoint_override
+        {
             // Use override for token endpoint, still discover auth endpoint
             // (auth endpoint is not typically overridden for M2M since it's not used)
             let endpoints = OidcEndpoints::discover(host, &http_client).await?;

rust/src/database.rs

@@ -662,25 +662,32 @@ impl adbc_core::Database for Database {
                     }
                     AuthFlow::ClientCredentials => {
                         // Client credentials flow (M2M) - create ClientCredentialsProvider
-                        let client_id = self.auth_client_id.as_ref()
+                        let client_id = self
+                            .auth_client_id
+                            .as_ref()
                             .expect("client_id should be validated above");
-                        let client_secret = self.auth_client_secret.as_ref()
+                        let client_secret = self
+                            .auth_client_secret
+                            .as_ref()
                             .expect("client_secret should be validated above");
 
                         // Default scope for M2M is "all-apis" (no offline_access since M2M has no refresh token)
                         let scopes_str = self.auth_scopes.as_deref().unwrap_or("all-apis");
-                        let scopes: Vec<String> = scopes_str.split_whitespace().map(String::from).collect();
+                        let scopes: Vec<String> =
+                            scopes_str.split_whitespace().map(String::from).collect();
 
                         // Create the provider (async operation - needs runtime)
                         let provider = runtime
-                            .block_on(crate::auth::ClientCredentialsProvider::new_with_full_config(
-                                host,
-                                client_id,
-                                client_secret,
-                                http_client.clone(),
-                                scopes,
-                                self.auth_token_endpoint.clone(),
-                            ))
+                            .block_on(
+                                crate::auth::ClientCredentialsProvider::new_with_full_config(
+                                    host,
+                                    client_id,
+                                    client_secret,
+                                    http_client.clone(),
+                                    scopes,
+                                    self.auth_token_endpoint.clone(),
+                                ),
+                            )
                             .map_err(|e| e.to_adbc())?;
 
                         Arc::new(provider)

rust/tests/oauth_e2e.rs

@@ -129,9 +129,7 @@ fn test_m2m_end_to_end() {
 
     // Create driver and database
     let mut driver = Driver::new();
-    let mut database = driver
-        .new_database()
-        .expect("Failed to create database");
+    let mut database = driver.new_database().expect("Failed to create database");
 
     // Configure database with M2M OAuth
     database
@@ -286,9 +284,7 @@ fn test_u2m_end_to_end() {
 
     // Create driver and database
     let mut driver = Driver::new();
-    let mut database = driver
-        .new_database()
-        .expect("Failed to create database");
+    let mut database = driver.new_database().expect("Failed to create database");
 
     // Configure database with U2M OAuth
     database