mirror of
https://github.com/quexten/goldwarden.git
synced 2025-02-09 08:38:41 +01:00
Clean up cli
This commit is contained in:
parent
38915c25be
commit
c255ce18a7
@ -20,8 +20,7 @@ var setApiUrlCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -54,8 +53,7 @@ var setIdentityURLCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -88,8 +86,7 @@ var setNotificationsURLCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -16,14 +16,18 @@ var loginCmd = &cobra.Command{
|
|||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
request := ipc.DoLoginRequest{}
|
request := ipc.DoLoginRequest{}
|
||||||
email, _ := cmd.Flags().GetString("email")
|
email, _ := cmd.Flags().GetString("email")
|
||||||
|
if email == "" {
|
||||||
|
println("Error: No email specified")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
request.Email = email
|
request.Email = email
|
||||||
passwordless, _ := cmd.Flags().GetBool("passwordless")
|
passwordless, _ := cmd.Flags().GetBool("passwordless")
|
||||||
request.Passwordless = passwordless
|
request.Passwordless = passwordless
|
||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
/*
|
|
||||||
Copyright © 2023 NAME HERE <EMAIL ADDRESS>
|
|
||||||
*/
|
|
||||||
package cmd
|
package cmd
|
||||||
|
|
||||||
import (
|
import (
|
||||||
@ -37,8 +34,7 @@ var getLoginCmd = &cobra.Command{
|
|||||||
UUID: uuid,
|
UUID: uuid,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,8 +18,7 @@ var setPinCmd = &cobra.Command{
|
|||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
result, err := commandClient.SendToAgent(ipc.UpdateVaultPINRequest{})
|
result, err := commandClient.SendToAgent(ipc.UpdateVaultPINRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -43,8 +42,7 @@ var pinStatusCmd = &cobra.Command{
|
|||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
result, err := commandClient.SendToAgent(ipc.GetVaultPINRequest{})
|
result, err := commandClient.SendToAgent(ipc.GetVaultPINRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -59,3 +59,11 @@ func loginIfRequired() error {
|
|||||||
|
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func handleSendToAgentError(err error) {
|
||||||
|
if err != nil {
|
||||||
|
println("Error: " + err.Error())
|
||||||
|
println("Is the daemon running?")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
@ -32,8 +32,7 @@ var runCmd = &cobra.Command{
|
|||||||
ApplicationName: executable,
|
ApplicationName: executable,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,8 +36,7 @@ var sshAddCmd = &cobra.Command{
|
|||||||
Name: name,
|
Name: name,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -66,8 +65,7 @@ var listSSHCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(ipc.GetSSHKeysRequest{})
|
result, err := commandClient.SendToAgent(ipc.GetSSHKeysRequest{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,8 +20,7 @@ var unlockCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -47,8 +46,7 @@ var lockCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -74,8 +72,7 @@ var purgeCmd = &cobra.Command{
|
|||||||
|
|
||||||
result, err := commandClient.SendToAgent(request)
|
result, err := commandClient.SendToAgent(request)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
println("Error: " + err.Error())
|
handleSendToAgentError(err)
|
||||||
println("Is the daemon running?")
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user