Parameterize GitHub OAuth2 scopes.

If no scope provided, default will be used:
scope=repo,repo:status,user:email.
This commit is contained in:
alex
2016-03-10 19:30:14 +00:00
parent 671461dc00
commit c2f3cf06ad
3 changed files with 39 additions and 1 deletions

View File

@@ -30,6 +30,7 @@ type Github struct {
API string
Client string
Secret string
Scope string
MergeRef string
Orgs []string
Open bool
@@ -56,6 +57,7 @@ func Load(env envconfig.Env) *Github {
github.URL = url_.String()
github.Client = params.Get("client_id")
github.Secret = params.Get("client_secret")
github.Scope = params.Get("scope")
github.Orgs = params["orgs"]
github.PrivateMode, _ = strconv.ParseBool(params.Get("private_mode"))
github.SkipVerify, _ = strconv.ParseBool(params.Get("skip_verify"))
@@ -69,6 +71,10 @@ func Load(env envconfig.Env) *Github {
github.API = github.URL + "/api/v3/"
}
if github.Scope == "" {
github.Scope = DefaultScope
}
if github.MergeRef == "" {
github.MergeRef = DefaultMergeRef
}
@@ -83,7 +89,7 @@ func (g *Github) Login(res http.ResponseWriter, req *http.Request) (*model.User,
var config = &oauth2.Config{
ClientId: g.Client,
ClientSecret: g.Secret,
Scope: DefaultScope,
Scope: g.Scope,
AuthURL: fmt.Sprintf("%s/login/oauth/authorize", g.URL),
TokenURL: fmt.Sprintf("%s/login/oauth/access_token", g.URL),
RedirectURL: fmt.Sprintf("%s/authorize", httputil.GetURL(req)),