refactor: login with user password

Author: thesimplekid

crates/cashu/src/lib.rs

@@ -1,5 +1,4 @@
 //! CDK common types and traits
-//!
 pub mod amount;
 pub mod dhke;
 #[cfg(feature = "mint")]

crates/cdk-cli/src/sub_commands/cat_login.rs

@@ -52,13 +52,13 @@ pub async fn cat_login(
     let openid_discovery = mint_info
         .nuts
         .nutxx
-        .expect("Nutxx definded")
+        .expect("Nutxx defined")
         .openid_discovery;
 
     let oidc_client = OidcClient::new(openid_discovery);
 
     let access_token = oidc_client
-        .get_access_token(
+        .get_access_token_with_user_password(
             sub_command_args.username.clone(),
             sub_command_args.password.clone(),
         )

crates/cdk/src/oidc_client.rs

@@ -31,6 +31,9 @@ pub enum Error {
     /// Unsupported Algo
     #[error("Unsupported signing algo")]
     UnsupportedSigningAlgo,
+    /// Access token not returned
+    #[error("Error getting access token")]
+    AccessTokenMissing,
 }
 
 impl From<Error> for cdk_common::error::Error {
@@ -183,7 +186,7 @@ impl OidcClient {
 
     /// Get Access token (CAT)
     #[cfg(feature = "wallet")]
-    pub async fn get_access_token(
+    pub async fn get_access_token_with_user_password(
         &self,
         username: String,
         password: String,
@@ -206,7 +209,9 @@ impl OidcClient {
             .json()
             .await?;
 
-        let token = response.get("access_token").expect("access token");
+        let token = response
+            .get("access_token")
+            .ok_or(Error::AccessTokenMissing)?;
 
         Ok(token.to_string())
     }

crates/cdk/src/wallet/mint.rs

@@ -162,8 +162,8 @@ impl Wallet {
     /// use anyhow::Result;
     /// use cdk::amount::{Amount, SplitTarget};
     /// use cdk::cdk_database::WalletMemoryDatabase;
-    /// use cdk::nuts::CurrencyUnit;
     /// use cdk::nuts::nut00::ProofsMethods;
+    /// use cdk::nuts::CurrencyUnit;
     /// use cdk::wallet::Wallet;
     /// use rand::Rng;
     ///