TokenStore migration to return plain errors (#14875)
* TokenStore migration to return plain errors * Fix translations * Fix: returned error is ignored and http.StatusBadRequest is always returned * Fix * Fix translations * Suggestions * Changed from BadRequest to NotFound * Setting the correct http status * Changed test to expect 404 status * Fix error
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
4df6019f61
Коммит
8b6a5fc5d7
@@ -678,8 +678,8 @@ func TestCreateUserWithToken(t *testing.T) {
|
||||
assert.False(t, newUser.IsGuest())
|
||||
require.Equal(t, invitationEmail, newUser.Email, "The user email must be the invitation one")
|
||||
|
||||
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, err, "The token must be deleted after be used")
|
||||
_, nErr := th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, nErr, "The token must be deleted after be used")
|
||||
|
||||
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newUser.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -699,8 +699,8 @@ func TestCreateUserWithToken(t *testing.T) {
|
||||
|
||||
assert.True(t, newGuest.IsGuest())
|
||||
require.Equal(t, invitationEmail, newGuest.Email, "The user email must be the invitation one")
|
||||
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, err, "The token must be deleted after be used")
|
||||
_, nErr := th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, nErr, "The token must be deleted after be used")
|
||||
|
||||
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -744,8 +744,8 @@ func TestCreateUserWithToken(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
assert.True(t, newGuest.IsGuest())
|
||||
require.Equal(t, grantedInvitationEmail, newGuest.Email)
|
||||
_, err = th.App.Srv().Store.Token().GetByToken(grantedDomainToken.Token)
|
||||
require.NotNil(t, err)
|
||||
_, nErr := th.App.Srv().Store.Token().GetByToken(grantedDomainToken.Token)
|
||||
require.NotNil(t, nErr)
|
||||
|
||||
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)
|
||||
require.Nil(t, err)
|
||||
@@ -781,8 +781,8 @@ func TestCreateUserWithToken(t *testing.T) {
|
||||
require.Nil(t, err)
|
||||
assert.True(t, newGuest.IsGuest())
|
||||
assert.Equal(t, invitationEmail, newGuest.Email, "The user email must be the invitation one")
|
||||
_, err = th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, err)
|
||||
_, nErr := th.App.Srv().Store.Token().GetByToken(token.Token)
|
||||
require.NotNil(t, nErr)
|
||||
|
||||
members, err := th.App.GetChannelMembersForUser(th.BasicTeam.Id, newGuest.Id)
|
||||
require.Nil(t, err)
|
||||
|
||||
Ссылка в новой задаче
Block a user