From c255ce18a738cfdf073e5788af2647258a503337 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Mon, 11 Sep 2023 22:45:01 +0200
Subject: [PATCH] Clean up cli

---
 cmd/config.go | 9 +++------
 cmd/login.go  | 8 ++++++--
 cmd/logins.go | 6 +-----
 cmd/pin.go    | 6 ++----
 cmd/root.go   | 8 ++++++++
 cmd/run.go    | 3 +--
 cmd/ssh.go    | 6 ++----
 cmd/vault.go  | 9 +++------
 8 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/cmd/config.go b/cmd/config.go
index a0a4306..521e111 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -20,8 +20,7 @@ var setApiUrlCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -54,8 +53,7 @@ var setIdentityURLCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -88,8 +86,7 @@ var setNotificationsURLCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/login.go b/cmd/login.go
index 28f299c..1eb2c3a 100644
--- a/cmd/login.go
+++ b/cmd/login.go
@@ -16,14 +16,18 @@ var loginCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		request := ipc.DoLoginRequest{}
 		email, _ := cmd.Flags().GetString("email")
+		if email == "" {
+			println("Error: No email specified")
+			return
+		}
+
 		request.Email = email
 		passwordless, _ := cmd.Flags().GetBool("passwordless")
 		request.Passwordless = passwordless
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/logins.go b/cmd/logins.go
index ce6089d..1c4ddd7 100644
--- a/cmd/logins.go
+++ b/cmd/logins.go
@@ -1,6 +1,3 @@
-/*
-Copyright © 2023 NAME HERE <EMAIL ADDRESS>
-*/
 package cmd
 
 import (
@@ -37,8 +34,7 @@ var getLoginCmd = &cobra.Command{
 			UUID:     uuid,
 		})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/pin.go b/cmd/pin.go
index 562cc55..9c8e5d6 100644
--- a/cmd/pin.go
+++ b/cmd/pin.go
@@ -18,8 +18,7 @@ var setPinCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		result, err := commandClient.SendToAgent(ipc.UpdateVaultPINRequest{})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -43,8 +42,7 @@ var pinStatusCmd = &cobra.Command{
 	Run: func(cmd *cobra.Command, args []string) {
 		result, err := commandClient.SendToAgent(ipc.GetVaultPINRequest{})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/root.go b/cmd/root.go
index 7c43d13..f3afcc7 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -59,3 +59,11 @@ func loginIfRequired() error {
 
 	return err
 }
+
+func handleSendToAgentError(err error) {
+	if err != nil {
+		println("Error: " + err.Error())
+		println("Is the daemon running?")
+		return
+	}
+}
diff --git a/cmd/run.go b/cmd/run.go
index cf2ee2a..0146c15 100644
--- a/cmd/run.go
+++ b/cmd/run.go
@@ -32,8 +32,7 @@ var runCmd = &cobra.Command{
 			ApplicationName: executable,
 		})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/ssh.go b/cmd/ssh.go
index 25e043e..bafafc0 100644
--- a/cmd/ssh.go
+++ b/cmd/ssh.go
@@ -36,8 +36,7 @@ var sshAddCmd = &cobra.Command{
 			Name: name,
 		})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -66,8 +65,7 @@ var listSSHCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(ipc.GetSSHKeysRequest{})
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
diff --git a/cmd/vault.go b/cmd/vault.go
index 4936f31..9cae450 100644
--- a/cmd/vault.go
+++ b/cmd/vault.go
@@ -20,8 +20,7 @@ var unlockCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -47,8 +46,7 @@ var lockCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}
 
@@ -74,8 +72,7 @@ var purgeCmd = &cobra.Command{
 
 		result, err := commandClient.SendToAgent(request)
 		if err != nil {
-			println("Error: " + err.Error())
-			println("Is the daemon running?")
+			handleSendToAgentError(err)
 			return
 		}