Merge pull request #24 from keypair34/feature/fix-error-message

fix: add `is_login` check on `me` command

Author: keypair34

crates/cli/src/account/me/mod.rs

@@ -1,3 +1,4 @@
+use crate::account::lib::is_logged_in;
 use crate::{
     cli::CommandResult,
     ui::{fail_message, fail_symbol, succeed_message, succeed_symbol},
@@ -35,6 +36,16 @@ fn show_user(user: &User) {
 }
 
 pub async fn process_me(env: Environment) -> Result<CommandResult> {
+    if !is_logged_in(env) {
+        return Ok(CommandResult {
+            spinner: Spinner::new(
+                spinners::Spinners::SimpleDotsScrolling,
+                succeed_message("Loading"),
+            ),
+            symbol: fail_symbol(),
+            msg: fail_message("You are not logged in. Please login first."),
+        });
+    }
     let mut spinner = Spinner::new(
         spinners::Spinners::SimpleDotsScrolling,
         succeed_message("Loading"),
@@ -53,10 +64,7 @@ pub async fn process_me(env: Environment) -> Result<CommandResult> {
             })
         }
         Err(e) => {
-            spinner.stop_and_persist(
-                &fail_symbol(),
-                fail_message("Error while requesting your information."),
-            );
+            spinner.stop_and_persist(&fail_symbol(), fail_message(&e.to_string()));
             Err(e)
         }
     }

crates/smbcloud-networking/src/lib.rs

@@ -16,7 +16,7 @@ pub async fn get_smb_token(env: Environment) -> Result<String> {
             anyhow!("Error while reading token. Are you logged in?")
         })
     } else {
-        Err(anyhow!("Failed to get home directory."))
+        Err(anyhow!("Failed to get home directory. Are you logged in?"))
     }
 }