Fixes order of login messages

jmgilman · Sep 14, 2021 · 1112d82 · 1112d82
1 parent e36068e
commit 1112d82
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/src/main.rs b/src/main.rs
@@ -246,8 +246,11 @@ async fn gen_cert(config: &Config, console: &impl Console) -> Result<()> {
     // Attempt to load token from file if needed
     let token = match config.token.is_none() {
         true => {
-            console.neutral("Using token from ~/.vault-token...");
-            VaultClient::token_from_file().unwrap_or_else(|_| "".to_string())
+            let token = VaultClient::token_from_file().unwrap_or_else(|_| "".to_string());
+            if !token.is_empty() {
+                console.neutral("Using token from ~/.vault-token...");
+            }
+            token
         }
         false => config.token.as_ref().unwrap().clone(),
     };
@@ -274,10 +277,10 @@ async fn gen_cert(config: &Config, console: &impl Console) -> Result<()> {
         }
 
         console.success("Login success!");
+    } else {
+        console.success("Valid token found.");
     }
 
-    console.success("Valid token found.");
-
     // Create certificate
     console.neutral("Generating new certificate...");
     let contents = load_pub(identity)?;