Auth: Use camelCase in SSO Settings API (#78480)

Return/accept camelCase fields in sso setting api
pull/78496/head^2
Misi 2 years ago committed by GitHub
parent 4275f2dc8c
commit 3607a00692
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 42
      pkg/services/ssosettings/models/models.go

@ -4,6 +4,8 @@ import (
"encoding/json"
"fmt"
"time"
"github.com/grafana/grafana/pkg/services/featuremgmt/strcase"
)
type SettingsSource int
@ -39,6 +41,46 @@ func (s SSOSetting) TableName() string {
return "sso_setting"
}
// MarshalJSON implements the json.Marshaler interface and converts the s.Settings from map[string]any to map[string]any in camelCase
func (s SSOSetting) MarshalJSON() ([]byte, error) {
type Alias SSOSetting
aux := &struct {
*Alias
}{
Alias: (*Alias)(&s),
}
settings := make(map[string]any)
for k, v := range aux.Settings {
settings[strcase.ToLowerCamel(k)] = v
}
aux.Settings = settings
return json.Marshal(aux)
}
// UnmarshalJSON implements the json.Unmarshaler interface and converts the settings from map[string]any camelCase to map[string]interface{} snake_case
func (s *SSOSetting) UnmarshalJSON(data []byte) error {
type Alias SSOSetting
aux := &struct {
*Alias
}{
Alias: (*Alias)(s),
}
if err := json.Unmarshal(data, &aux); err != nil {
return err
}
settings := make(map[string]any)
for k, v := range aux.Settings {
settings[strcase.ToSnake(k)] = v
}
s.Settings = settings
return nil
}
type SSOSettingsResponse struct {
Settings map[string]interface{} `json:"settings"`
Provider string `json:"type"`

Loading…
Cancel
Save