Fixing bug in oauth callback URL registration.
Fixing a bug in the oauth callback URL registration where the lack of provider context was overwriting the previous oauth callback route registration call.
This commit is contained in:
parent
a2a9f60976
commit
a77d403dfb
10
oauth.go
10
oauth.go
|
@ -116,13 +116,13 @@ func (h oauthHandler) viewOauthInit(app *App, w http.ResponseWriter, r *http.Req
|
||||||
|
|
||||||
func configureSlackOauth(parentHandler *Handler, r *mux.Router, app *App) {
|
func configureSlackOauth(parentHandler *Handler, r *mux.Router, app *App) {
|
||||||
if app.Config().SlackOauth.ClientID != "" {
|
if app.Config().SlackOauth.ClientID != "" {
|
||||||
callbackLocation := app.Config().App.Host + "/oauth/callback"
|
callbackLocation := app.Config().App.Host + "/oauth/callback/slack"
|
||||||
|
|
||||||
var stateRegisterClient *callbackProxyClient = nil
|
var stateRegisterClient *callbackProxyClient = nil
|
||||||
if app.Config().SlackOauth.CallbackProxyAPI != "" {
|
if app.Config().SlackOauth.CallbackProxyAPI != "" {
|
||||||
stateRegisterClient = &callbackProxyClient{
|
stateRegisterClient = &callbackProxyClient{
|
||||||
server: app.Config().SlackOauth.CallbackProxyAPI,
|
server: app.Config().SlackOauth.CallbackProxyAPI,
|
||||||
callbackLocation: app.Config().App.Host + "/oauth/callback",
|
callbackLocation: app.Config().App.Host + "/oauth/callback/slack",
|
||||||
httpClient: config.DefaultHTTPClient(),
|
httpClient: config.DefaultHTTPClient(),
|
||||||
}
|
}
|
||||||
callbackLocation = app.Config().SlackOauth.CallbackProxy
|
callbackLocation = app.Config().SlackOauth.CallbackProxy
|
||||||
|
@ -140,13 +140,13 @@ func configureSlackOauth(parentHandler *Handler, r *mux.Router, app *App) {
|
||||||
|
|
||||||
func configureWriteAsOauth(parentHandler *Handler, r *mux.Router, app *App) {
|
func configureWriteAsOauth(parentHandler *Handler, r *mux.Router, app *App) {
|
||||||
if app.Config().WriteAsOauth.ClientID != "" {
|
if app.Config().WriteAsOauth.ClientID != "" {
|
||||||
callbackLocation := app.Config().App.Host + "/oauth/callback"
|
callbackLocation := app.Config().App.Host + "/oauth/callback/write.as"
|
||||||
|
|
||||||
var callbackProxy *callbackProxyClient = nil
|
var callbackProxy *callbackProxyClient = nil
|
||||||
if app.Config().WriteAsOauth.CallbackProxy != "" {
|
if app.Config().WriteAsOauth.CallbackProxy != "" {
|
||||||
callbackProxy = &callbackProxyClient{
|
callbackProxy = &callbackProxyClient{
|
||||||
server: app.Config().WriteAsOauth.CallbackProxyAPI,
|
server: app.Config().WriteAsOauth.CallbackProxyAPI,
|
||||||
callbackLocation: app.Config().App.Host + "/oauth/callback",
|
callbackLocation: app.Config().App.Host + "/oauth/callback/write.as",
|
||||||
httpClient: config.DefaultHTTPClient(),
|
httpClient: config.DefaultHTTPClient(),
|
||||||
}
|
}
|
||||||
callbackLocation = app.Config().SlackOauth.CallbackProxy
|
callbackLocation = app.Config().SlackOauth.CallbackProxy
|
||||||
|
@ -175,7 +175,7 @@ func configureOauthRoutes(parentHandler *Handler, r *mux.Router, app *App, oauth
|
||||||
callbackProxy: callbackProxy,
|
callbackProxy: callbackProxy,
|
||||||
}
|
}
|
||||||
r.HandleFunc("/oauth/"+oauthClient.GetProvider(), parentHandler.OAuth(handler.viewOauthInit)).Methods("GET")
|
r.HandleFunc("/oauth/"+oauthClient.GetProvider(), parentHandler.OAuth(handler.viewOauthInit)).Methods("GET")
|
||||||
r.HandleFunc("/oauth/callback", parentHandler.OAuth(handler.viewOauthCallback)).Methods("GET")
|
r.HandleFunc("/oauth/callback/"+oauthClient.GetProvider(), parentHandler.OAuth(handler.viewOauthCallback)).Methods("GET")
|
||||||
r.HandleFunc("/oauth/signup", parentHandler.OAuth(handler.viewOauthSignup)).Methods("POST")
|
r.HandleFunc("/oauth/signup", parentHandler.OAuth(handler.viewOauthSignup)).Methods("POST")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue