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

Chore: Remove public vars in setting package (#81018)

Browse Source 
Removes the public variable setting.SecretKey plus some other ones. 
Introduces some new functions for creating setting.Cfg.
This commit is contained in:
Marcus Efraimsson
2024-01-23 12:36:22 +01:00
committed by GitHub
parent 147bf01745
commit 6768c6c059
131 changed files with 759 additions and 699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/api/dtos/models.go
+7 -7
View File
@@ -108,9 +108,9 @@ func (mr *MetricRequest) CloneWithQueries(queries []*simplejson.Json) MetricRequ
}
}
func GetGravatarUrl(text string) string {
if setting.DisableGravatar {
return setting.AppSubUrl + "/public/img/user_profile.png"
func GetGravatarUrl(cfg *setting.Cfg, text string) string {
if cfg.DisableGravatar {
return cfg.AppSubURL + "/public/img/user_profile.png"
}
if text == "" {
@@ -118,7 +118,7 @@ func GetGravatarUrl(text string) string {
}
hash, _ := GetGravatarHash(text)
return fmt.Sprintf(setting.AppSubUrl+"/avatar/%x", hash)
return fmt.Sprintf(cfg.AppSubURL+"/avatar/%x", hash)
}
func GetGravatarHash(text string) ([]byte, bool) {
@@ -133,14 +133,14 @@ func GetGravatarHash(text string) ([]byte, bool) {
return hasher.Sum(nil), true
}
func GetGravatarUrlWithDefault(text string, defaultText string) string {
func GetGravatarUrlWithDefault(cfg *setting.Cfg, text string, defaultText string) string {
if text != "" {
return GetGravatarUrl(text)
return GetGravatarUrl(cfg, text)
}
text = regNonAlphaNumeric.ReplaceAllString(defaultText, "") + "@localhost"
return GetGravatarUrl(text)
return GetGravatarUrl(cfg, text)
}
func IsHiddenUser(userLogin string, signedInUser identity.Requester, cfg *setting.Cfg) bool {