#129: clear saved credentials when login fails

xou816 · Sep 22, 2021 · dad8116 · dad8116
1 parent 2a591fe
commit dad8116
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 11 deletions.
diff --git a/src/app/components/login/login.rs b/src/app/components/login/login.rs
@@ -194,6 +194,7 @@ impl EventListener for Login {
                 self.hide_and_save_creds(creds.clone());
             }
             AppEvent::LoginEvent(LoginEvent::LoginFailed) => {
+                self.model.clear_saved_credentials();
                 self.reveal_error();
             }
             AppEvent::Started => {

diff --git a/src/app/components/login/login_model.rs b/src/app/components/login/login_model.rs
@@ -36,6 +36,10 @@ impl LoginModel {
         }
     }
 
+    pub fn clear_saved_credentials(&self) {
+        let _ = Credentials::logout();
+    }
+
     pub fn save_token(&self, token: String, token_expiry_time: SystemTime) {
         if let Ok(mut credentials) = Credentials::retrieve() {
             credentials.token = token;

diff --git a/src/app/components/user_menu/user_menu_model.rs b/src/app/components/user_menu/user_menu_model.rs
@@ -1,5 +1,5 @@
 use crate::api::clear_user_cache;
-use crate::app::credentials;
+use crate::app::credentials::Credentials;
 use crate::app::models::{PlaylistDescription, PlaylistSummary};
 use crate::app::state::{LoginAction, PlaybackAction};
 use crate::app::{ActionDispatcher, AppModel};
@@ -27,7 +27,7 @@ impl UserMenuModel {
     pub fn logout(&self) {
         self.dispatcher.dispatch(PlaybackAction::Stop.into());
         self.dispatcher.dispatch_async(Box::pin(async {
-            let _ = credentials::logout();
+            let _ = Credentials::logout();
             let _ = clear_user_cache().await;
             Some(LoginAction::Logout.into())
         }));

diff --git a/src/app/credentials.rs b/src/app/credentials.rs
@@ -35,6 +35,14 @@ impl Credentials {
         serde_json::from_slice(&item).map_err(|_| Error::Parse)
     }
 
+    pub fn logout() -> Result<(), Error> {
+        let service = SecretService::new(EncryptionType::Dh)?;
+        let collection = service.get_default_collection()?;
+        let result = collection.search_items(make_attributes())?;
+        let item = result.get(0).ok_or(Error::NoResult)?;
+        item.delete()
+    }
+
     pub fn save(&self) -> Result<(), Error> {
         let service = SecretService::new(EncryptionType::Dh)?;
         let collection = service.get_default_collection()?;
@@ -49,12 +57,3 @@ impl Credentials {
         Ok(())
     }
 }
-
-pub fn logout() -> Result<(), Error> {
-    let service = SecretService::new(EncryptionType::Dh)?;
-    let collection = service.get_default_collection()?;
-    let result = collection.search_items(make_attributes())?;
-
-    let item = result.get(0).ok_or(Error::NoResult)?;
-    item.delete()
-}