zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2026-04-23 00:17:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

began oauth implementation

Browse Source
This commit is contained in:
0xdcarns
2021-10-21 15:28:58 -04:00
parent 8a54f50676
commit 4e4e8b3ab5
11 changed files with 330 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files
servercfg/serverconf.go
+13 -1
View File
@@ -72,8 +72,20 @@ func GetServerConfig() config.ServerConfig {
cfg.AuthProvider = authInfo[0]
cfg.ClientID = authInfo[1]
cfg.ClientSecret = authInfo[2]
cfg.FrontendURL = GetFrontendURL()
return cfg
}
func GetFrontendURL() string {
var frontend = ""
if os.Getenv("FRONTEND_URL") != "" {
frontend = os.Getenv("FRONTEND_URL")
} else if config.Config.Server.FrontendURL != "" {
frontend = config.Config.Server.FrontendURL
}
return frontend
}
func GetAPIConnString() string {
conn := ""
if os.Getenv("SERVER_API_CONN_STRING") != "" {
@@ -84,7 +96,7 @@ func GetAPIConnString() string {
return conn
}
func GetVersion() string {
version := "0.8.4"
version := "0.8.5"
if config.Config.Server.Version != "" {
version = config.Config.Server.Version
}