mirror of
https://github.com/Luzifer/ots.git
synced 2024-09-28 19:55:36 +00:00
Switch to structs instead of maps in api (#40)
This commit is contained in:
parent
37d79e1478
commit
5d4cf17aba
60
api.go
60
api.go
@ -12,6 +12,17 @@ type apiServer struct {
|
|||||||
store storage
|
store storage
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type apiResponse struct {
|
||||||
|
Success bool `json:"success"`
|
||||||
|
Error string `json:"error,omitempty"`
|
||||||
|
Secret string `json:"secret,omitempty"`
|
||||||
|
SecretId string `json:"secret_id,omitempty"`
|
||||||
|
}
|
||||||
|
|
||||||
|
type apiRequest struct {
|
||||||
|
Secret string `json:"secret"`
|
||||||
|
}
|
||||||
|
|
||||||
func newAPI(s storage) *apiServer {
|
func newAPI(s storage) *apiServer {
|
||||||
return &apiServer{
|
return &apiServer{
|
||||||
store: s,
|
store: s,
|
||||||
@ -27,39 +38,30 @@ func (a apiServer) handleCreate(res http.ResponseWriter, r *http.Request) {
|
|||||||
var secret string
|
var secret string
|
||||||
|
|
||||||
if strings.HasPrefix(r.Header.Get("Content-Type"), "application/json") {
|
if strings.HasPrefix(r.Header.Get("Content-Type"), "application/json") {
|
||||||
tmp := map[string]string{}
|
tmp := apiRequest{}
|
||||||
if err := json.NewDecoder(r.Body).Decode(&tmp); err != nil {
|
if err := json.NewDecoder(r.Body).Decode(&tmp); err != nil {
|
||||||
a.jsonResponse(res, http.StatusBadRequest, map[string]interface{}{
|
a.errorResponse(res, http.StatusBadRequest, err.Error())
|
||||||
"success": false,
|
|
||||||
"error": err.Error(),
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
secret = tmp["secret"]
|
secret = tmp.Secret
|
||||||
} else {
|
} else {
|
||||||
secret = r.FormValue("secret")
|
secret = r.FormValue("secret")
|
||||||
}
|
}
|
||||||
|
|
||||||
if secret == "" {
|
if secret == "" {
|
||||||
a.jsonResponse(res, http.StatusBadRequest, map[string]interface{}{
|
a.errorResponse(res, http.StatusBadRequest, "Secret missing")
|
||||||
"success": false,
|
|
||||||
"error": "Secret missing",
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
id, err := a.store.Create(secret)
|
id, err := a.store.Create(secret)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
a.jsonResponse(res, http.StatusInternalServerError, map[string]interface{}{
|
a.errorResponse(res, http.StatusInternalServerError, err.Error())
|
||||||
"success": false,
|
|
||||||
"error": err.Error(),
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jsonResponse(res, http.StatusCreated, map[string]interface{}{
|
a.jsonResponse(res, http.StatusCreated, apiResponse{
|
||||||
"success": true,
|
Success: true,
|
||||||
"secret_id": id,
|
SecretId: id,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -67,10 +69,7 @@ func (a apiServer) handleRead(res http.ResponseWriter, r *http.Request) {
|
|||||||
vars := mux.Vars(r)
|
vars := mux.Vars(r)
|
||||||
id := vars["id"]
|
id := vars["id"]
|
||||||
if id == "" {
|
if id == "" {
|
||||||
a.jsonResponse(res, http.StatusBadRequest, map[string]interface{}{
|
a.errorResponse(res, http.StatusBadRequest, "ID missing")
|
||||||
"success": false,
|
|
||||||
"error": "ID missing",
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,20 +79,23 @@ func (a apiServer) handleRead(res http.ResponseWriter, r *http.Request) {
|
|||||||
if err == errSecretNotFound {
|
if err == errSecretNotFound {
|
||||||
status = http.StatusNotFound
|
status = http.StatusNotFound
|
||||||
}
|
}
|
||||||
a.jsonResponse(res, status, map[string]interface{}{
|
a.errorResponse(res, status, err.Error())
|
||||||
"success": false,
|
|
||||||
"error": err.Error(),
|
|
||||||
})
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
a.jsonResponse(res, http.StatusOK, map[string]interface{}{
|
a.jsonResponse(res, http.StatusOK, apiResponse{
|
||||||
"success": true,
|
Success: true,
|
||||||
"secret": secret,
|
Secret: secret,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func (a apiServer) jsonResponse(res http.ResponseWriter, status int, response map[string]interface{}) {
|
func (a apiServer) errorResponse(res http.ResponseWriter, status int, msg string) {
|
||||||
|
a.jsonResponse(res, status, apiResponse{
|
||||||
|
Error: msg,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
func (a apiServer) jsonResponse(res http.ResponseWriter, status int, response apiResponse) {
|
||||||
res.Header().Set("Content-Type", "application/json")
|
res.Header().Set("Content-Type", "application/json")
|
||||||
res.Header().Set("Cache-Control", "no-store, max-age=0")
|
res.Header().Set("Cache-Control", "no-store, max-age=0")
|
||||||
res.WriteHeader(status)
|
res.WriteHeader(status)
|
||||||
|
Loading…
Reference in New Issue
Block a user