summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2015-07-22 15:05:20 -0400
committerJoramWilander <jwawilander@gmail.com>2015-07-22 15:05:20 -0400
commit41bbbbf4462205348c978a2cce5162f73e35f6b7 (patch)
treefe49bc9d99b34a8e99787af29606b8c5af23c42c /web
parent44cfa364fd3c328523054d8ee2221d6019ad6de1 (diff)
downloadchat-41bbbbf4462205348c978a2cce5162f73e35f6b7.tar.gz
chat-41bbbbf4462205348c978a2cce5162f73e35f6b7.tar.bz2
chat-41bbbbf4462205348c978a2cce5162f73e35f6b7.zip
add changes from team review
Diffstat (limited to 'web')
-rw-r--r--web/web.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/web/web.go b/web/web.go
index 975b65002..6bd4d09a0 100644
--- a/web/web.go
+++ b/web/web.go
@@ -476,18 +476,18 @@ func signupWithOAuth(c *api.Context, w http.ResponseWriter, r *http.Request) {
props := model.MapFromJson(strings.NewReader(data))
if !model.ComparePassword(hash, fmt.Sprintf("%v:%v", data, utils.Cfg.ServiceSettings.InviteSalt)) {
- c.Err = model.NewAppError("createUser", "The signup link does not appear to be valid", "")
+ c.Err = model.NewAppError("signupWithOAuth", "The signup link does not appear to be valid", "")
return
}
t, err := strconv.ParseInt(props["time"], 10, 64)
if err != nil || model.GetMillis()-t > 1000*60*60*48 { // 48 hours
- c.Err = model.NewAppError("createUser", "The signup link has expired", "")
+ c.Err = model.NewAppError("signupWithOAuth", "The signup link has expired", "")
return
}
if team.Id != props["id"] {
- c.Err = model.NewAppError("createUser", "Invalid team name", data)
+ c.Err = model.NewAppError("signupWithOAuth", "Invalid team name", data)
return
}
}