Some small adjustments and creating the SetSecret endpoint.

Author: Skarlso

frontend/client/views/vault/index.vue

@@ -286,16 +286,15 @@ export default {
         return
       }
 
+      this.selectSecret.value = null
       this.$http
-        .post('/api/v1/secret/update', this.selectSecret)
+        .put('/api/v1/secret/update', this.selectSecret)
         .then(response => {
           openNotification({
             title: 'Secret changed!',
             message: 'Secret has been successful changed.',
             type: 'success'
           })
-          this.selectSecret.newvalue = ''
-          this.selectSecret.newvalueconf = ''
         })
         .catch(error => {
           this.$onError(error)
@@ -346,7 +345,6 @@ export default {
             message: 'Secret has been successfully added.',
             type: 'success'
           })
-          this.selectSecret.value = null
           this.fetchData()
         })
         .catch(error => {

handlers/handler.go

@@ -94,8 +94,8 @@ func InitHandlers(e *echo.Echo, store *store.Store, scheduler *scheduler.Schedul
 	// Secrets
 	e.GET(p+"secrets", ListSecrets)
 	e.DELETE(p+"secret/:key", RemoveSecret)
-	e.POST(p+"secret", AddSecret)
-	e.POST(p+"secret/update", UpdateSecret)
+	e.POST(p+"secret", SetSecret)
+	e.PUT(p+"secret/update", SetSecret)
 
 	// Middleware
 	e.Use(middleware.Recover())

handlers/vault.go

@@ -8,7 +8,7 @@ import (
 	"github.com/labstack/echo"
 )
 
-type secret struct {
+type addSecret struct {
 	Key   string `json:"key"`
 	Value string `json:"value"`
 }
@@ -18,39 +18,25 @@ type updateSecret struct {
 	Value string `json:"newvalue"`
 }
 
-// UpdateSecret updates a secret using the vault.
-func UpdateSecret(c echo.Context) error {
-	s := new(updateSecret)
-	err := c.Bind(s)
-	if err != nil {
-		return c.String(http.StatusBadRequest, err.Error())
-	}
-	cert, err := security.InitCA()
-	if err != nil {
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	v, err := security.NewVault(cert)
-	if err != nil {
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	err = v.LoadSecrets()
-	if err != nil {
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	v.Add(s.Key, []byte(s.Value))
-	err = v.SaveSecrets()
-	if err != nil {
-		return c.String(http.StatusInternalServerError, err.Error())
-	}
-	return c.String(http.StatusOK, "secret successfully updated")
-}
-
-// AddSecret creates a secret using the vault.
-func AddSecret(c echo.Context) error {
-	s := new(secret)
-	err := c.Bind(s)
-	if err != nil {
-		return c.String(http.StatusBadRequest, err.Error())
+// SetSecret creates or updates a given secret
+func SetSecret(c echo.Context) error {
+	var key, value string
+	if c.Request().Method == "POST" {
+		s := new(addSecret)
+		err := c.Bind(s)
+		if err != nil {
+			return c.String(http.StatusBadRequest, err.Error())
+		}
+		key = s.Key
+		value = s.Value
+	} else if c.Request().Method == "PUT" {
+		s := new(updateSecret)
+		err := c.Bind(s)
+		if err != nil {
+			return c.String(http.StatusBadRequest, err.Error())
+		}
+		key = s.Key
+		value = s.Value
 	}
 	cert, err := security.InitCA()
 	if err != nil {
@@ -64,17 +50,17 @@ func AddSecret(c echo.Context) error {
 	if err != nil {
 		return c.String(http.StatusInternalServerError, err.Error())
 	}
-	v.Add(s.Key, []byte(s.Value))
+	v.Add(key, []byte(value))
 	err = v.SaveSecrets()
 	if err != nil {
 		return c.String(http.StatusInternalServerError, err.Error())
 	}
-	return c.String(http.StatusCreated, "secret successfully added")
+	return c.String(http.StatusOK, "secret successfully set")
 }
 
 // ListSecrets retrieves all secrets from the vault.
 func ListSecrets(c echo.Context) error {
-	secrets := make([]secret, 0)
+	secrets := make([]addSecret, 0)
 	cert, err := security.InitCA()
 	if err != nil {
 		return c.String(http.StatusInternalServerError, err.Error())
@@ -89,7 +75,7 @@ func ListSecrets(c echo.Context) error {
 	}
 	kvs := v.GetAll()
 	for _, k := range kvs {
-		s := secret{Key: k, Value: "**********"}
+		s := addSecret{Key: k, Value: "**********"}
 		secrets = append(secrets, s)
 	}
 	return c.JSON(http.StatusOK, secrets)