diff options
| author | JoramWilander <jwawilander@gmail.com> | 2017-07-06 17:28:38 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2017-07-06 17:28:38 -0400 |
| commit | 15ad24d160cb4604d0605ebbfa53d11a57820706 (patch) | |
| tree | d33ee5e1d756586ac171b07d6ce31febee565485 /api | |
| parent | 3d382cfa0e01938a24578602777325fe7fccd0c1 (diff) | |
| download | chat-15ad24d160cb4604d0605ebbfa53d11a57820706.tar.gz chat-15ad24d160cb4604d0605ebbfa53d11a57820706.tar.bz2 chat-15ad24d160cb4604d0605ebbfa53d11a57820706.zip | |
Minor fix
Diffstat (limited to 'api')
| -rw-r--r-- | api/oauth.go | 4 | ||||
| -rw-r--r-- | api/user.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/api/oauth.go b/api/oauth.go index 84d30ee61..a239e889b 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -157,7 +157,7 @@ func loginWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) { return } - if authUrl, err := app.GetOAuthLoginEndpoint(service, teamId, model.OAUTH_ACTION_LOGIN, redirectTo, loginHint); err != nil { + if authUrl, err := app.GetOAuthLoginEndpoint(w, r, service, teamId, model.OAUTH_ACTION_LOGIN, redirectTo, loginHint); err != nil { c.Err = err return } else { @@ -180,7 +180,7 @@ func signupWithOAuth(c *Context, w http.ResponseWriter, r *http.Request) { return } - if authUrl, err := app.GetOAuthSignupEndpoint(service, teamId); err != nil { + if authUrl, err := app.GetOAuthSignupEndpoint(w, r, service, teamId); err != nil { c.Err = err return } else { diff --git a/api/user.go b/api/user.go index eb249cb39..0b2fbfba8 100644 --- a/api/user.go +++ b/api/user.go @@ -866,7 +866,7 @@ func emailToOAuth(c *Context, w http.ResponseWriter, r *http.Request) { return } - link, err := app.SwitchEmailToOAuth(email, password, mfaToken, service) + link, err := app.SwitchEmailToOAuth(w, r, email, password, mfaToken, service) if err != nil { c.Err = err return |