diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-04-27 10:55:03 -0400 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-04-27 10:55:03 -0400 |
| commit | 9a87bb3af68216b53ee8f89d6604c715c7b85b2d (patch) | |
| tree | 8c06aed890f388b228f3aefb8e398309bc73c0b9 /app/team.go | |
| parent | 0e007e344bf10993529711f14c4168365c3504c3 (diff) | |
| download | chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.gz chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.tar.bz2 chat-9a87bb3af68216b53ee8f89d6604c715c7b85b2d.zip | |
Creating common token store and moving email invites and verification to it (#6213)
Diffstat (limited to 'app/team.go')
| -rw-r--r-- | app/team.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/team.go b/app/team.go index d4e6d6308..47f4f5c15 100644 --- a/app/team.go +++ b/app/team.go @@ -198,7 +198,7 @@ func AddUserToTeamByTeamId(teamId string, user *model.User) *model.AppError { func AddUserToTeamByHash(userId string, hash string, data string) (*model.Team, *model.AppError) { props := model.MapFromJson(strings.NewReader(data)) - if !model.ComparePassword(hash, fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) { + if hash != utils.HashSha256(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) { return nil, model.NewLocAppError("JoinUserToTeamByHash", "api.user.create_user.signup_link_invalid.app_error", nil, "") } @@ -757,7 +757,7 @@ func GetTeamIdFromQuery(query url.Values) (string, *model.AppError) { data := query.Get("d") props := model.MapFromJson(strings.NewReader(data)) - if !model.ComparePassword(hash, fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) { + if hash != utils.HashSha256(fmt.Sprintf("%v:%v", data, utils.Cfg.EmailSettings.InviteSalt)) { return "", model.NewAppError("GetTeamIdFromQuery", "api.oauth.singup_with_oauth.invalid_link.app_error", nil, "", http.StatusBadRequest) } |