local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rearrange setting frontend url in config

Browse source
This commit is contained in:
kolaente 2021-05-28 08:46:31 +02:00
parent afd6bde74d
commit df45675df3
No known key found for this signature in database
GPG key ID: F40E70337AB24C9B
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkg/config/config.go
View file

@ -361,6 +361,10 @@ func InitConfig() {
RateLimitStore.Set(KeyvalueType.GetString()) RateLimitStore.Set(KeyvalueType.GetString())
} }
if ServiceFrontendurl.GetString() != "" && !strings.HasSuffix(ServiceFrontendurl.GetString(), "/") {
ServiceFrontendurl.Set(ServiceFrontendurl.GetString() + "/")
}
if AuthOpenIDRedirectURL.GetString() == "" { if AuthOpenIDRedirectURL.GetString() == "" {
AuthOpenIDRedirectURL.Set(ServiceFrontendurl.GetString() + "auth/openid/") AuthOpenIDRedirectURL.Set(ServiceFrontendurl.GetString() + "auth/openid/")
} }
@ -378,10 +382,6 @@ func InitConfig() {
MetricsEnabled.Set(true) MetricsEnabled.Set(true)
} }
if ServiceFrontendurl.GetString() != "" && !strings.HasSuffix(ServiceFrontendurl.GetString(), "/") {
ServiceFrontendurl.Set(ServiceFrontendurl.GetString() + "/")
}
log.Printf("Using config file: %s", viper.ConfigFileUsed()) log.Printf("Using config file: %s", viper.ConfigFileUsed())
} }