diff --git a/pkg/api/handle_database_manage.go b/pkg/api/handle_database_manage.go index 232e00d..de256d1 100644 --- a/pkg/api/handle_database_manage.go +++ b/pkg/api/handle_database_manage.go @@ -25,6 +25,7 @@ func (api *API) HandleReset(w http.ResponseWriter, r *http.Request) { // check token err = api.CheckAdmin(w, r) if err != nil { + api.HandleError(w, r, err) return } @@ -54,6 +55,7 @@ func (api *API) HandleWalk(w http.ResponseWriter, r *http.Request) { // check token match err = api.CheckAdmin(w, r) if err != nil { + api.HandleError(w, r, err) return } diff --git a/pkg/api/handle_tag.go b/pkg/api/handle_tag.go index 39550ec..8ce9534 100644 --- a/pkg/api/handle_tag.go +++ b/pkg/api/handle_tag.go @@ -42,6 +42,7 @@ func (api *API) HandleInsertTag(w http.ResponseWriter, r *http.Request) { // check if user is admin err := api.CheckAdmin(w, r) if err != nil { + api.HandleError(w, r, err) return } @@ -102,6 +103,7 @@ func (api *API) HandleUpdateTag(w http.ResponseWriter, r *http.Request) { // check if user is admin err := api.CheckAdmin(w, r) if err != nil { + api.HandleError(w, r, err) return } diff --git a/pkg/api/handle_user.go b/pkg/api/handle_user.go index 7fe1bc6..a120f99 100644 --- a/pkg/api/handle_user.go +++ b/pkg/api/handle_user.go @@ -148,18 +148,15 @@ func (api *API) CheckAdmin(w http.ResponseWriter, r *http.Request) error { session, _ := api.store.Get(r, api.defaultSessionName) userId, ok := session.Values["userId"] if !ok { - api.HandleError(w, r, ErrNotLoggedIn) return ErrNotLoggedIn } user, err := api.Db.GetUserById(userId.(int64)) if err != nil { - api.HandleError(w, r, err) return err } if user.Role != database.RoleAdmin { - api.HandleError(w, r, ErrNotAdmin) return ErrNotAdmin }