public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Auth: Introduce configurable_providers config option for SSO settings (#80911)

Browse Source 
* Add SSOSettingsConfigurableProviders config option

* Add check to Delete and ListWithRedactedSecrets

* Add check to GET, small improvements
This commit is contained in:
Misi
2024-01-23 15:48:06 +01:00
committed by GitHub
parent 4148362d63
commit 8246d97587
8 changed files with 75 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/services/ssosettings/api/api.go
+2 -10
View File
@@ -3,7 +3,6 @@ package api
import (
"context"
"encoding/json"
"errors"
"fmt"
"hash/fnv"
"net/http"
@@ -140,12 +139,8 @@ func (api *Api) getProviderSettings(c *contextmodel.ReqContext) response.Respons
}
provider, err := api.SSOSettingsService.GetForProviderWithRedactedSecrets(c.Req.Context(), key)
if err != nil {
if errors.Is(err, ssosettings.ErrNotFound) {
return response.Error(http.StatusNotFound, "The provider was not found", err)
}
return response.Error(http.StatusInternalServerError, "Failed to get provider settings", err)
return response.ErrOrFallback(http.StatusInternalServerError, "Failed to get provider settings", err)
}
etag, err := generateFNVETag(provider)
@@ -214,10 +209,7 @@ func (api *Api) removeProviderSettings(c *contextmodel.ReqContext) response.Resp
err := api.SSOSettingsService.Delete(c.Req.Context(), key)
if err != nil {
if errors.Is(err, ssosettings.ErrNotFound) {
return response.Error(http.StatusNotFound, "The provider was not found", err)
}
return response.Error(http.StatusInternalServerError, "Failed to delete provider settings", err)
return response.ErrOrFallback(http.StatusInternalServerError, "Failed to delete provider settings", err)
}
return response.Empty(http.StatusNoContent)