diff --git a/documize/section/github.go b/documize/section/github.go index 00c7fe4d..a52d578c 100644 --- a/documize/section/github.go +++ b/documize/section/github.go @@ -33,9 +33,4 @@ func (*github) Meta() TypeMeta { func init() { sectionsMap["github"] = &github{} - - // TODO make both soft and alterable at runtime - gh.ClientID = "8574d0c34142dcdc53f6" - gh.ClientSecret = "628e04d1575e234fbf477ff7b5f7dbfc95074c9e" - } diff --git a/documize/section/github/github.go b/documize/section/github/github.go index 106f5d74..f85a3bcb 100644 --- a/documize/section/github/github.go +++ b/documize/section/github/github.go @@ -23,13 +23,23 @@ import ( "strings" "github.com/documize/community/wordsmith/log" + "github.com/documize/community/documize/api/request" - // vendored locally gogithub "github.com/google/go-github/github" "golang.org/x/oauth2" ) -var ClientID, ClientSecret string +const configKey = "SECTION-GITHUB" + +func clientID() string{ + return request.ConfigString(configKey,"clientID") +} +func clientSecret() string{ + return request.ConfigString(configKey,"clientSecret") +} +func authorizationCallbackURL() string{ + return request.ConfigString(configKey,"authorizationCallbackURL") +} type GithubT struct { @@ -458,8 +468,8 @@ func Callback(res http.ResponseWriter, req *http.Request) error { state := req.URL.Query().Get("state") ghurl := "https://github.com/login/oauth/access_token" - vals := "client_id=" + ClientID - vals += "&client_secret=" + ClientSecret + vals := "client_id=" + clientID() + vals += "&client_secret=" + clientSecret() vals += "&code=" + code vals += "&state=" + state