[MM-16514] Migrate Token.GetByName to Sync by Default (#11355)
* [MM-16514] Migrate Token.GetByToken to Sync by default * test: use testify * fix: shadowing
Этот коммит содержится в:
14
app/team.go
14
app/team.go
@@ -398,12 +398,11 @@ func (a *App) AddUserToTeamByTeamId(teamId string, user *model.User) *model.AppE
|
||||
}
|
||||
|
||||
func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team, *model.AppError) {
|
||||
result := <-a.Srv.Store.Token().GetByToken(tokenId)
|
||||
if result.Err != nil {
|
||||
return nil, model.NewAppError("AddUserToTeamByToken", "api.user.create_user.signup_link_invalid.app_error", nil, result.Err.Error(), http.StatusBadRequest)
|
||||
token, err := a.Srv.Store.Token().GetByToken(tokenId)
|
||||
if err != nil {
|
||||
return nil, model.NewAppError("AddUserToTeamByToken", "api.user.create_user.signup_link_invalid.app_error", nil, err.Error(), http.StatusBadRequest)
|
||||
}
|
||||
|
||||
token := result.Data.(*model.Token)
|
||||
if token.Type != TOKEN_TYPE_TEAM_INVITATION {
|
||||
return nil, model.NewAppError("AddUserToTeamByToken", "api.user.create_user.signup_link_invalid.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
@@ -429,7 +428,7 @@ func (a *App) AddUserToTeamByToken(userId string, tokenId string) (*model.Team,
|
||||
close(uchan)
|
||||
}()
|
||||
|
||||
result = <-tchan
|
||||
result := <-tchan
|
||||
if result.Err != nil {
|
||||
return nil, result.Err
|
||||
}
|
||||
@@ -1154,12 +1153,11 @@ func (a *App) GetTeamIdFromQuery(query url.Values) (string, *model.AppError) {
|
||||
inviteId := query.Get("id")
|
||||
|
||||
if len(tokenId) > 0 {
|
||||
result := <-a.Srv.Store.Token().GetByToken(tokenId)
|
||||
if result.Err != nil {
|
||||
token, err := a.Srv.Store.Token().GetByToken(tokenId)
|
||||
if err != nil {
|
||||
return "", model.NewAppError("GetTeamIdFromQuery", "api.oauth.singup_with_oauth.invalid_link.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
token := result.Data.(*model.Token)
|
||||
if token.Type != TOKEN_TYPE_TEAM_INVITATION {
|
||||
return "", model.NewAppError("GetTeamIdFromQuery", "api.oauth.singup_with_oauth.invalid_link.app_error", nil, "", http.StatusBadRequest)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user