diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-03-10 05:18:18 -0500 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2017-03-10 10:18:18 +0000 |
| commit | a8e68bd8905972ae59de90fa33d5b3e3c274dc47 (patch) | |
| tree | c809d33800262830f2497813fcea2c5bb482ac1b /api/oauth.go | |
| parent | 43e5bbea372cb2c4a98d00fae19cdabd165a8f48 (diff) | |
| download | chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.gz chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.tar.bz2 chat-a8e68bd8905972ae59de90fa33d5b3e3c274dc47.zip | |
PLT-5765 Passed SiteURL to SendNotifications (#5705)
Diffstat (limited to 'api/oauth.go')
| -rw-r--r-- | api/oauth.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/oauth.go b/api/oauth.go index 659d5c129..25d4a89f9 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -285,7 +285,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { action := props["action"] switch action { case model.OAUTH_ACTION_SIGNUP: - if user, err := app.CreateOAuthUser(service, body, teamId); err != nil { + if user, err := app.CreateOAuthUser(service, body, teamId, c.GetSiteURL()); err != nil { c.Err = err } else { doLogin(c, w, r, user, "") @@ -297,7 +297,7 @@ func completeOAuth(c *Context, w http.ResponseWriter, r *http.Request) { case model.OAUTH_ACTION_LOGIN: user := LoginByOAuth(c, w, r, service, body) if len(teamId) > 0 { - c.Err = app.AddUserToTeamByTeamId(teamId, user) + c.Err = app.AddUserToTeamByTeamId(teamId, user, c.GetSiteURL()) } if c.Err == nil { if val, ok := props["redirect_to"]; ok { |