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
eb517a37
Commit
eb517a37
authored
Dec 19, 2018
by
Tomas Dabasinskas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update field name
parent
e8823f71
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
33 additions
and
33 deletions
+33
-33
pkg/setting/setting_oauth.go
+15
-15
pkg/social/social.go
+18
-18
No files found.
pkg/setting/setting_oauth.go
View file @
eb517a37
package
setting
type
OAuthInfo
struct
{
ClientId
,
ClientSecret
string
Scopes
[]
string
AuthUrl
,
TokenUrl
string
Enabled
bool
EmailAttributeName
string
AllowedDomains
[]
string
HostedDomain
string
ApiUrl
string
AllowSignup
bool
Name
string
TlsClientCert
string
TlsClientKey
string
TlsClientCa
string
TlsSkipVerify
bool
BrokenAuthHeaderProvider
bool
ClientId
,
ClientSecret
string
Scopes
[]
string
AuthUrl
,
TokenUrl
string
Enabled
bool
EmailAttributeName
string
AllowedDomains
[]
string
HostedDomain
string
ApiUrl
string
AllowSignup
bool
Name
string
TlsClientCert
string
TlsClientKey
string
TlsClientCa
string
TlsSkipVerify
bool
SendClientCredentialsViaPost
bool
}
type
OAuther
struct
{
...
...
pkg/social/social.go
View file @
eb517a37
...
...
@@ -63,23 +63,23 @@ func NewOAuthService() {
for
_
,
name
:=
range
allOauthes
{
sec
:=
setting
.
Raw
.
Section
(
"auth."
+
name
)
info
:=
&
setting
.
OAuthInfo
{
ClientId
:
sec
.
Key
(
"client_id"
)
.
String
(),
ClientSecret
:
sec
.
Key
(
"client_secret"
)
.
String
(),
Scopes
:
util
.
SplitString
(
sec
.
Key
(
"scopes"
)
.
String
()),
AuthUrl
:
sec
.
Key
(
"auth_url"
)
.
String
(),
TokenUrl
:
sec
.
Key
(
"token_url"
)
.
String
(),
ApiUrl
:
sec
.
Key
(
"api_url"
)
.
String
(),
Enabled
:
sec
.
Key
(
"enabled"
)
.
MustBool
(),
EmailAttributeName
:
sec
.
Key
(
"email_attribute_name"
)
.
String
(),
AllowedDomains
:
util
.
SplitString
(
sec
.
Key
(
"allowed_domains"
)
.
String
()),
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
(),
TlsClientKey
:
sec
.
Key
(
"tls_client_key"
)
.
String
(),
TlsClientCa
:
sec
.
Key
(
"tls_client_ca"
)
.
String
(),
TlsSkipVerify
:
sec
.
Key
(
"tls_skip_verify_insecure"
)
.
MustBool
(),
BrokenAuthHeaderProvider
:
sec
.
Key
(
"send_client_credentials_via_post"
)
.
MustBool
(),
ClientId
:
sec
.
Key
(
"client_id"
)
.
String
(),
ClientSecret
:
sec
.
Key
(
"client_secret"
)
.
String
(),
Scopes
:
util
.
SplitString
(
sec
.
Key
(
"scopes"
)
.
String
()),
AuthUrl
:
sec
.
Key
(
"auth_url"
)
.
String
(),
TokenUrl
:
sec
.
Key
(
"token_url"
)
.
String
(),
ApiUrl
:
sec
.
Key
(
"api_url"
)
.
String
(),
Enabled
:
sec
.
Key
(
"enabled"
)
.
MustBool
(),
EmailAttributeName
:
sec
.
Key
(
"email_attribute_name"
)
.
String
(),
AllowedDomains
:
util
.
SplitString
(
sec
.
Key
(
"allowed_domains"
)
.
String
()),
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
(),
TlsClientKey
:
sec
.
Key
(
"tls_client_key"
)
.
String
(),
TlsClientCa
:
sec
.
Key
(
"tls_client_ca"
)
.
String
(),
TlsSkipVerify
:
sec
.
Key
(
"tls_skip_verify_insecure"
)
.
MustBool
(),
SendClientCredentialsViaPost
:
sec
.
Key
(
"send_client_credentials_via_post"
)
.
MustBool
(),
}
if
!
info
.
Enabled
{
...
...
@@ -87,7 +87,7 @@ func NewOAuthService() {
}
// handle the clients that do not properly support Basic auth headers and require passing client_id/client_secret via POST payload
if
info
.
BrokenAuthHeaderProvider
{
if
info
.
SendClientCredentialsViaPost
{
oauth2
.
RegisterBrokenAuthHeaderProvider
(
info
.
TokenUrl
)
}
...
...
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