Adding Listsecret capability

[aaf/sms.git] / sms-service / src / sms / handler / handler.go

diff --git a/sms-service/src/sms/handler/handler.go b/sms-service/src/sms/handler/handler.go
index f287263..5fdbf3b 100644 (file)
--- a/sms-service/src/sms/handler/handler.go
+++ b/sms-service/src/sms/handler/handler.go
@@ -18,6 +18,7 @@ package handler
 
 import (
        "encoding/json"
+       "fmt"
        "github.com/gorilla/mux"
        "net/http"
 
@@ -43,7 +44,7 @@ func (h handler) createSecretDomainHandler(w http.ResponseWriter, r *http.Reques
 
        dom, err := h.secretBackend.CreateSecretDomain(d.Name)
        if err != nil {
-               http.Error(w, err.Error(), 400)
+               http.Error(w, err.Error(), 500)
                return
        }
 
@@ -59,7 +60,8 @@ func (h handler) getSecretDomainHandler(w http.ResponseWriter, r *http.Request)
        vars := mux.Vars(r)
        domName := vars["domName"]
 
-       h.secretBackend.GetSecretDomain(domName)
+       fmt.Fprintf(w, "Got req %s", domName)
+       //h.secretBackend.GetSecretDomain(domName)
        //encode data into json and return
 }
 
@@ -85,7 +87,13 @@ func (h handler) createSecretHandler(w http.ResponseWriter, r *http.Request) {
                return
        }
 
-       h.secretBackend.CreateSecret(domName, b)
+       err = h.secretBackend.CreateSecret(domName, b)
+       if err != nil {
+               http.Error(w, err.Error(), 500)
+               return
+       }
+
+       w.WriteHeader(http.StatusCreated)
 }
 
 // getSecretHandler handles reading a secret by given domain name and secret name
@@ -94,8 +102,35 @@ func (h handler) getSecretHandler(w http.ResponseWriter, r *http.Request) {
        domName := vars["domName"]
        secName := vars["secretName"]
 
-       h.secretBackend.GetSecret(domName, secName)
-       //encode and return response
+       sec, err := h.secretBackend.GetSecret(domName, secName)
+       if err != nil {
+               http.Error(w, err.Error(), 500)
+               return
+       }
+
+       err = json.NewEncoder(w).Encode(sec)
+       if err != nil {
+               http.Error(w, err.Error(), 400)
+               return
+       }
+}
+
+// listSecretHandler handles listing all secrets under a particular domain name
+func (h handler) listSecretHandler(w http.ResponseWriter, r *http.Request) {
+       vars := mux.Vars(r)
+       domName := vars["domName"]
+
+       sec, err := h.secretBackend.ListSecret(domName)
+       if err != nil {
+               http.Error(w, err.Error(), http.StatusInternalServerError)
+               return
+       }
+
+       err = json.NewEncoder(w).Encode(sec)
+       if err != nil {
+               http.Error(w, err.Error(), http.StatusInternalServerError)
+               return
+       }
 }
 
 // deleteSecretHandler handles deleting a secret by given domain name and secret name
@@ -163,9 +198,10 @@ func CreateRouter(b smsbackend.SecretBackend) http.Handler {
        router.HandleFunc("/v1/sms/domain/{domName}", h.getSecretDomainHandler).Methods("GET")
        router.HandleFunc("/v1/sms/domain/{domName}", h.deleteSecretDomainHandler).Methods("DELETE")
 
-       router.HandleFunc("v1/sms/domain/{domainName}/secret", h.createSecretHandler).Methods("POST")
-       router.HandleFunc("v1/sms/domain/{domainName}/secret/{secretName}", h.getSecretHandler).Methods("GET")
-       router.HandleFunc("v1/sms/domain/{domainName}/secret/{secretName}", h.deleteSecretHandler).Methods("DELETE")
+       router.HandleFunc("/v1/sms/domain/{domName}/secret", h.createSecretHandler).Methods("POST")
+       router.HandleFunc("/v1/sms/domain/{domName}/secret", h.listSecretHandler).Methods("GET")
+       router.HandleFunc("/v1/sms/domain/{domName}/secret/{secretName}", h.getSecretHandler).Methods("GET")
+       router.HandleFunc("/v1/sms/domain/{domName}/secret/{secretName}", h.deleteSecretHandler).Methods("DELETE")
 
        return router
 }