Auth: Replace literal http status codes with constants from http pkg (#78116)

replace literal http status codes with constants from http pkg
pull/78081/head
Mihai Doarna 2 years ago committed by GitHub
parent 656808a41b
commit 6d74746997
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 24
      pkg/services/ssosettings/api/api.go

@ -1,6 +1,8 @@
package api package api
import ( import (
"net/http"
"github.com/grafana/grafana/pkg/api/response" "github.com/grafana/grafana/pkg/api/response"
"github.com/grafana/grafana/pkg/api/routing" "github.com/grafana/grafana/pkg/api/routing"
"github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/infra/log"
@ -60,32 +62,32 @@ func (api *Api) listAllProvidersSettings(c *contextmodel.ReqContext) response.Re
return response.Error(500, "Failed to get providers", err) return response.Error(500, "Failed to get providers", err)
} }
return response.JSON(200, providers) return response.JSON(http.StatusOK, providers)
} }
func (api *Api) getProviderSettings(c *contextmodel.ReqContext) response.Response { func (api *Api) getProviderSettings(c *contextmodel.ReqContext) response.Response {
key, ok := web.Params(c.Req)[":key"] key, ok := web.Params(c.Req)[":key"]
if !ok { if !ok {
return response.Error(400, "Missing key", nil) return response.Error(http.StatusBadRequest, "Missing key", nil)
} }
settings, err := api.SSOSettingsService.GetForProvider(c.Req.Context(), key) settings, err := api.SSOSettingsService.GetForProvider(c.Req.Context(), key)
if err != nil { if err != nil {
return response.Error(404, "The provider was not found", err) return response.Error(http.StatusNotFound, "The provider was not found", err)
} }
return response.JSON(200, settings) return response.JSON(http.StatusOK, settings)
} }
func (api *Api) updateProviderSettings(c *contextmodel.ReqContext) response.Response { func (api *Api) updateProviderSettings(c *contextmodel.ReqContext) response.Response {
key, ok := web.Params(c.Req)[":key"] key, ok := web.Params(c.Req)[":key"]
if !ok { if !ok {
return response.Error(400, "Missing key", nil) return response.Error(http.StatusBadRequest, "Missing key", nil)
} }
var newSettings models.SSOSetting var newSettings models.SSOSetting
if err := web.Bind(c.Req, &newSettings); err != nil { if err := web.Bind(c.Req, &newSettings); err != nil {
return response.Error(400, "Failed to parse request body", err) return response.Error(http.StatusBadRequest, "Failed to parse request body", err)
} }
err := api.SSOSettingsService.Upsert(c.Req.Context(), key, newSettings.Settings) err := api.SSOSettingsService.Upsert(c.Req.Context(), key, newSettings.Settings)
@ -93,22 +95,22 @@ func (api *Api) updateProviderSettings(c *contextmodel.ReqContext) response.Resp
// other error // other error
if err != nil { if err != nil {
return response.Error(500, "Failed to update provider settings", err) return response.Error(http.StatusInternalServerError, "Failed to update provider settings", err)
} }
return response.JSON(204, nil) return response.JSON(http.StatusNoContent, nil)
} }
func (api *Api) removeProviderSettings(c *contextmodel.ReqContext) response.Response { func (api *Api) removeProviderSettings(c *contextmodel.ReqContext) response.Response {
key, ok := web.Params(c.Req)[":key"] key, ok := web.Params(c.Req)[":key"]
if !ok { if !ok {
return response.Error(400, "Missing key", nil) return response.Error(http.StatusBadRequest, "Missing key", nil)
} }
err := api.SSOSettingsService.Delete(c.Req.Context(), key) err := api.SSOSettingsService.Delete(c.Req.Context(), key)
if err != nil { if err != nil {
return response.Error(500, "Failed to delete provider settings", err) return response.Error(http.StatusInternalServerError, "Failed to delete provider settings", err)
} }
return response.JSON(204, nil) return response.JSON(http.StatusNoContent, nil)
} }

Loading…
Cancel
Save