diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-07-12 23:36:52 -0800 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-07-12 23:36:52 -0800 |
| commit | 252d0f3924dd19aa4dd1900c6c00c41c84755d1e (patch) | |
| tree | 3d761e220c5e32aafedb7c17b198ec8215aec6d4 /api | |
| parent | 27cab0f507d253bba5658335f42a4c7675fcdac7 (diff) | |
| download | chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.tar.gz chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.tar.bz2 chat-252d0f3924dd19aa4dd1900c6c00c41c84755d1e.zip | |
Fixes mm-1415 adding email bypass flag
Diffstat (limited to 'api')
| -rw-r--r-- | api/team.go | 2 | ||||
| -rw-r--r-- | api/user.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/api/team.go b/api/team.go index c4a0ca181..f9aeecd7e 100644 --- a/api/team.go +++ b/api/team.go @@ -68,7 +68,7 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) { return } - if utils.Cfg.ServiceSettings.Mode == utils.MODE_DEV { + if utils.Cfg.ServiceSettings.Mode == utils.MODE_DEV || utils.Cfg.EmailSettings.ByPassEmail { m["follow_link"] = bodyPage.Props["Link"] } diff --git a/api/user.go b/api/user.go index 483ae67b5..3d1a2d3ae 100644 --- a/api/user.go +++ b/api/user.go @@ -293,7 +293,7 @@ func login(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !user.EmailVerified { + if !user.EmailVerified && !utils.Cfg.EmailSettings.ByPassEmail { c.Err = model.NewAppError("login", "Login failed because email address has not been verified", extraInfo) c.Err.StatusCode = http.StatusForbidden return |