IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

added hosted domain suppport to google oauth login (#6372)

Browse Source
This commit is contained in:
Eric Uldall
2016-10-28 03:00:47 -07:00
committed by Torkel Ödegaard
parent 7acdbde8f0
commit 658fc1a67a
5 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/api/login_oauth.go
View File

@@ -53,7 +53,11 @@ func OAuthLogin(ctx *middleware.Context) {
if code == "" {
state := GenStateString()
ctx.Session.Set(middleware.SESS_KEY_OAUTH_STATE, state)
ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline))
if setting.OAuthService.OAuthInfos[name].HostedDomain == "" {
ctx.Redirect(connect.AuthCodeURL(state, oauth2.AccessTypeOnline))
}else{
ctx.Redirect(connect.AuthCodeURL(state, oauth2.SetParam("hd", setting.OAuthService.OAuthInfos[name].HostedDomain), oauth2.AccessTypeOnline));
}
return
}