From fc5df5c4356c56287de19f36f59495cb20851c79 Mon Sep 17 00:00:00 2001 From: Corey Hulen Date: Wed, 21 Sep 2016 04:17:58 -0700 Subject: Fix issue when saving session has an error (#4053) * Fix issue is saving session has an error * Fixing break break --- api/user.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/api/user.go b/api/user.go index a82fc5561..c0fe403b3 100644 --- a/api/user.go +++ b/api/user.go @@ -487,6 +487,9 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { c.LogAuditWithUserId(user.Id, "success") doLogin(c, w, r, user, deviceId) + if c.Err != nil { + return + } user.Sanitize(map[string]bool{}) @@ -554,6 +557,9 @@ func LoginByOAuth(c *Context, w http.ResponseWriter, r *http.Request, service st } else { user = result.Data.(*model.User) doLogin(c, w, r, user, "") + if c.Err != nil { + return nil + } return user } } @@ -2544,6 +2550,9 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) { break } doLogin(c, w, r, user, "") + if c.Err != nil { + return + } if val, ok := relayProps["redirect_to"]; ok { http.Redirect(w, r, c.GetSiteURL()+val, http.StatusFound) -- cgit v1.2.3-1-g7c22