feat: use session_token by default.

databendlabs · Aug 28, 2024 · 324ee56 · 324ee56
1 parent 3c04378
commit 324ee56
Show file tree

Hide file tree

Showing 11 changed files with 536 additions and 213 deletions.
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -372,13 +372,9 @@ pub async fn main() -> Result<()> {
             // Exit client if user login failed.
             if let Some(error) = err.downcast_ref::<databend_driver::Error>() {
                 match error {
-                    databend_driver::Error::Api(
-                        databend_client::error::Error::InvalidResponse(resp_err),
-                    ) => {
-                        if resp_err.code == 401 {
-                            println!("Authenticate failed wrong password user {}", user);
-                            return Ok(());
-                        }
+                    databend_driver::Error::Api(databend_client::error::Error::AuthFailure(_)) => {
+                        println!("Authenticate failed wrong password user {}", user);
+                        return Ok(());
                     }
                     databend_driver::Error::Arrow(arrow::error::ArrowError::IpcError(ipc_err)) => {
                         if ipc_err.contains("Unauthenticated") {

diff --git a/cli/src/session.rs b/cli/src/session.rs
@@ -102,11 +102,9 @@ impl Session {
                 Err(err) => {
                     match err {
                         databend_driver::Error::Api(
-                            databend_client::error::Error::InvalidResponse(ref resp_err),
+                            databend_client::error::Error::AuthFailure(_),
                         ) => {
-                            if resp_err.code == 401 {
-                                return Err(err.into());
-                            }
+                            return Err(err.into());
                         }
                         databend_driver::Error::Arrow(arrow::error::ArrowError::IpcError(
                             ref ipc_err,

diff --git a/core/Cargo.toml b/core/Cargo.toml
@@ -25,6 +25,7 @@ async-trait = "0.1"
 log = "0.4"
 once_cell = "1.18"
 percent-encoding = "2.3"
+parking_lot = "0.12.3"
 reqwest = { version = "0.12", default-features = false, features = ["json", "multipart", "stream"] }
 serde = { version = "1.0", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }

diff --git a/core/src/auth.rs b/core/src/auth.rs
@@ -19,6 +19,9 @@ use crate::error::{Error, Result};
 #[async_trait::async_trait]
 pub trait Auth: Sync + Send {
     async fn wrap(&self, builder: RequestBuilder) -> Result<RequestBuilder>;
+    fn can_reload(&self) -> bool {
+        false
+    }
     fn username(&self) -> String;
 }
 
@@ -98,6 +101,10 @@ impl Auth for AccessTokenFileAuth {
         Ok(builder.bearer_auth(token.trim()))
     }
 
+    fn can_reload(&self) -> bool {
+        true
+    }
+
     fn username(&self) -> String {
         "token".to_string()
     }