diff options
author | Joram Wilander <jwawilander@gmail.com> | 2017-01-19 09:00:13 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 09:00:13 -0500 |
commit | d3a285e64d051aa8d5c4c9854597dfbcce107675 (patch) | |
tree | e16ca3d52b6347a754e506aa8cac7457c62d3639 /api/oauth.go | |
parent | 61b7226533568f3261fc233538ce998bb71a5345 (diff) | |
download | chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.gz chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.tar.bz2 chat-d3a285e64d051aa8d5c4c9854597dfbcce107675.zip |
Migrate functions to app package (#5106)
* Refactor and move session logic into app package
* Refactor email functions into the app package
* Refactor password update into app package
* Migrate user functions to app package
* Move team functions into app package
* Migrate channel functions into app package
* Pass SiteURL through to app functions
* Update based on feedback
Diffstat (limited to 'api/oauth.go')
-rw-r--r-- | api/oauth.go | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/api/oauth.go b/api/oauth.go index b378eb2a3..538831ee0 100644 --- a/api/oauth.go +++ b/api/oauth.go @@ -830,17 +830,22 @@ func CompleteSwitchWithOAuth(c *Context, w http.ResponseWriter, r *http.Request, user = result.Data.(*model.User) } - RevokeAllSession(c, user.Id) - if c.Err != nil { + if err := app.RevokeAllSessions(user.Id); err != nil { + c.Err = err return } + c.LogAuditWithUserId(user.Id, "Revoked all sessions for user") if result := <-app.Srv.Store.User().UpdateAuthData(user.Id, service, &authData, ssoEmail, true); result.Err != nil { c.Err = result.Err return } - go sendSignInChangeEmail(c, user.Email, c.GetSiteURL(), strings.Title(service)+" SSO") + go func() { + if err := app.SendSignInChangeEmail(user.Email, strings.Title(service)+" SSO", user.Locale, c.GetSiteURL()); err != nil { + l4g.Error(err.Error()) + } + }() } func deleteOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) { |