diff options
| author | Corey Hulen <corey@hulen.com> | 2015-07-15 10:27:24 -0800 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-07-15 10:27:24 -0800 |
| commit | d16a1d6d758c28ae2558232ba6da92798d7dfca3 (patch) | |
| tree | 0da7ee5d9f4039eeb20f70940483c40943c9aa23 /api | |
| parent | 38f9e140e98123eb256968fb31f7fbb2aef978e0 (diff) | |
| parent | e017babc5ddd66e65469326bf723d5359875c2d1 (diff) | |
| download | chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.tar.gz chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.tar.bz2 chat-d16a1d6d758c28ae2558232ba6da92798d7dfca3.zip | |
Merge pull request #171 from mattermost/mm-1415
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 5b052e826..0c63868b3 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 |