Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
658fc1a6
Commit
658fc1a6
authored
Oct 28, 2016
by
Eric Uldall
Committed by
Torkel Ödegaard
Oct 28, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added hosted domain suppport to google oauth login (#6372)
parent
7acdbde8
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
0 deletions
+9
-0
conf/defaults.ini
+1
-0
pkg/api/login_oauth.go
+4
-0
pkg/setting/setting_oauth.go
+1
-0
pkg/social/google_oauth.go
+1
-0
pkg/social/social.go
+2
-0
No files found.
conf/defaults.ini
View file @
658fc1a6
...
...
@@ -229,6 +229,7 @@ auth_url = https://accounts.google.com/o/oauth2/auth
token_url
=
https://accounts.google.com/o/oauth2/token
api_url
=
https://www.googleapis.com/oauth2/v1/userinfo
allowed_domains
=
hosted_domain
=
#################################### Grafana.net Auth ####################
[auth.grafananet]
...
...
pkg/api/login_oauth.go
View file @
658fc1a6
...
...
@@ -53,7 +53,11 @@ func OAuthLogin(ctx *middleware.Context) {
if
code
==
""
{
state
:=
GenStateString
()
ctx
.
Session
.
Set
(
middleware
.
SESS_KEY_OAUTH_STATE
,
state
)
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
}
...
...
pkg/setting/setting_oauth.go
View file @
658fc1a6
...
...
@@ -6,6 +6,7 @@ type OAuthInfo struct {
AuthUrl
,
TokenUrl
string
Enabled
bool
AllowedDomains
[]
string
HostedDomain
string
ApiUrl
string
AllowSignup
bool
Name
string
...
...
pkg/social/google_oauth.go
View file @
658fc1a6
...
...
@@ -12,6 +12,7 @@ import (
type
SocialGoogle
struct
{
*
oauth2
.
Config
allowedDomains
[]
string
hostedDomain
string
apiUrl
string
allowSignup
bool
}
...
...
pkg/social/social.go
View file @
658fc1a6
...
...
@@ -51,6 +51,7 @@ func NewOAuthService() {
ApiUrl
:
sec
.
Key
(
"api_url"
)
.
String
(),
Enabled
:
sec
.
Key
(
"enabled"
)
.
MustBool
(),
AllowedDomains
:
sec
.
Key
(
"allowed_domains"
)
.
Strings
(
" "
),
HostedDomain
:
sec
.
Key
(
"hosted_domain"
)
.
String
(),
AllowSignup
:
sec
.
Key
(
"allow_sign_up"
)
.
MustBool
(),
Name
:
sec
.
Key
(
"name"
)
.
MustString
(
name
),
TlsClientCert
:
sec
.
Key
(
"tls_client_cert"
)
.
String
(),
...
...
@@ -92,6 +93,7 @@ func NewOAuthService() {
SocialMap
[
"google"
]
=
&
SocialGoogle
{
Config
:
&
config
,
allowedDomains
:
info
.
AllowedDomains
,
hostedDomain
:
info
.
HostedDomain
,
apiUrl
:
info
.
ApiUrl
,
allowSignup
:
info
.
AllowSignup
,
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment