Clean up cli

This commit is contained in:
Bernd Schoolmann 2023-09-11 22:45:01 +02:00
parent 38915c25be
commit c255ce18a7
No known key found for this signature in database
8 changed files with 26 additions and 29 deletions

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}
}

View File

@ -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
}

View File

@ -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
}

View File

@ -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
}