mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

MM-54502 - Update regex to force first character to be alpha (#24675)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Scott Bishel
2024-07-31 08:27:52 -06:00
коммит произвёл GitHub
родитель 5bfb32c504
Коммит 08ed72f060
33 изменённых файлов: 286 добавлений и 280 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
server/channels/api4/ldap_test.go
Просмотреть файл

@@ -299,7 +299,7 @@ func TestAddUserToGroupSyncables(t *testing.T) {
id := model.NewId()
user := &model.User{
Email: "test@localhost",
Username: model.NewId(),
Username: model.NewUsername(),
AuthData: &id,
AuthService: model.UserAuthServiceLdap,
}

6
server/channels/api4/user_test.go
Просмотреть файл

@@ -1832,14 +1832,14 @@ func TestGetUsersByIdsWithOptions(t *testing.T) {
defer th.TearDown()
// Users before the timestamp shouldn't be returned
user1, appErr := th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user1, appErr := th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
require.Nil(t, appErr)
user2, appErr := th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user2, appErr := th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
require.Nil(t, appErr)
// Users not in the list of IDs shouldn't be returned
_, appErr = th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
_, appErr = th.App.CreateUser(th.Context, &model.User{Email: th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
require.Nil(t, appErr)
users, _, err := th.Client.GetUsersByIdsWithOptions(context.Background(), []string{user1.Id, user2.Id}, &model.UserGetByIdsOptions{

6
server/channels/api4/user_viewmembers_test.go
Просмотреть файл

@@ -161,13 +161,13 @@ func TestAPIRestrictedViewMembers(t *testing.T) {
{
"Get not existing user without restrictions",
"",
model.NewId(),
model.NewUsername(),
"app.user.get_by_username.app_error",
},
{
"Get not existing user with restrictions to teams",
"teams",
model.NewId(),
model.NewUsername(),
"api.context.permissions.app_error",
},
{
@@ -185,7 +185,7 @@ func TestAPIRestrictedViewMembers(t *testing.T) {
{
"Get not existing user with restrictions to channels",
"channels",
model.NewId(),
model.NewUsername(),
"api.context.permissions.app_error",
},
{

48
server/channels/app/import_functions_test.go
Просмотреть файл

@@ -736,7 +736,7 @@ func TestImportImportUser(t *testing.T) {
// Do an invalid user in dry-run mode.
data := imports.UserImportData{
Username: ptrStr(model.NewId()),
Username: ptrStr(model.NewUsername()),
}
err = th.App.importUser(th.Context, &data, true)
require.Error(t, err, "Should have failed to import invalid user.")
@@ -751,7 +751,7 @@ func TestImportImportUser(t *testing.T) {
// Do a valid user in dry-run mode.
data = imports.UserImportData{
Username: ptrStr(model.NewId()),
Username: ptrStr(model.NewUsername()),
Email: ptrStr(model.NewId() + "@example.com"),
}
appErr := th.App.importUser(th.Context, &data, true)
@@ -767,7 +767,7 @@ func TestImportImportUser(t *testing.T) {
// Do an invalid user in apply mode.
data = imports.UserImportData{
Username: ptrStr(model.NewId()),
Username: ptrStr(model.NewUsername()),
}
err = th.App.importUser(th.Context, &data, false)
require.Error(t, err, "Should have failed to import invalid user.")
@@ -781,7 +781,7 @@ func TestImportImportUser(t *testing.T) {
assert.Equal(t, userCount, userCount4, "Unexpected number of users")
// Do a valid user in apply mode.
username := model.NewId()
username := model.NewUsername()
testsDir, _ := fileutils.FindDir("tests")
data = imports.UserImportData{
ProfileImage: ptrStr(filepath.Join(testsDir, "test.png")),
@@ -906,7 +906,7 @@ func TestImportImportUser(t *testing.T) {
channel, appErr := th.App.GetChannelByName(th.Context, channelName, team.Id, false)
require.Nil(t, appErr, "Failed to get channel from database.")
username = model.NewId()
username = model.NewUsername()
data = imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -1163,7 +1163,7 @@ func TestImportImportUser(t *testing.T) {
require.Equal(t, channelMemberCount+1, cmc, "Number of channel members not as expected")
// Add a user with some preferences.
username = model.NewId()
username = model.NewUsername()
data = imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -1327,7 +1327,7 @@ func TestImportImportUser(t *testing.T) {
checkNotifyProp(t, user, model.MentionKeysNotifyProp, "misc")
// Check Notify Props get set on *create* user.
username = model.NewId()
username = model.NewUsername()
data = imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -1472,7 +1472,7 @@ func TestImportImportUser(t *testing.T) {
assert.Equal(t, "", channelMember.ExplicitRoles)
// Test importing deleted user with a valid team & valid channel name in apply mode.
username = model.NewId()
username = model.NewUsername()
deleteAt := model.GetMillis()
deletedUserData := &imports.UserImportData{
Username: &username,
@@ -1515,7 +1515,7 @@ func TestImportImportUser(t *testing.T) {
// see https://mattermost.atlassian.net/browse/MM-56986
// Test importing deleted guest with a valid team & valid channel name in apply mode.
// username = model.NewId()
// username = model.NewUsername()
// deleteAt = model.GetMillis()
// deletedGuestData := &imports.UserImportData{
// Username: &username,
@@ -1918,7 +1918,7 @@ func TestImportUserDefaultNotifyProps(t *testing.T) {
defer th.TearDown()
// Create a valid new user with some, but not all, notify props populated.
username := model.NewId()
username := model.NewUsername()
data := imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -1979,7 +1979,7 @@ func TestImportimportMultiplePostLines(t *testing.T) {
require.Nil(t, err, "Failed to get channel from database.")
// Create a user.
username := model.NewId()
username := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -2227,7 +2227,7 @@ func TestImportimportMultiplePostLines(t *testing.T) {
require.Equal(t, "#hashtagmashupcity", post.Hashtags, "Hashtags not as expected: %s", post.Hashtags)
// Post with flags.
username2 := model.NewId()
username2 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username2,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -2583,7 +2583,7 @@ func TestImportImportPost(t *testing.T) {
require.Nil(t, appErr, "Failed to get channel from database.")
// Create a user.
username := model.NewId()
username := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -2591,7 +2591,7 @@ func TestImportImportPost(t *testing.T) {
user, appErr := th.App.GetUserByUsername(username)
require.Nil(t, appErr, "Failed to get user from database.")
username2 := model.NewId()
username2 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username2,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4258,7 +4258,7 @@ func TestImportPostAndRepliesWithAttachments(t *testing.T) {
require.Nil(t, appErr, "Failed to get channel from database.")
// Create a user3.
username := model.NewId()
username := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4267,16 +4267,16 @@ func TestImportPostAndRepliesWithAttachments(t *testing.T) {
require.Nil(t, appErr, "Failed to get user3 from database.")
require.NotNil(t, user3)
username2 := model.NewId()
username2 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username2,
Email: ptrStr(model.NewId() + "@example.com"),
}, false)
user2, appErr := th.App.GetUserByUsername(username2)
require.Nil(t, appErr, "Failed to get user3 from database.")
require.Nil(t, appErr, "Failed to get user2 from database.")
// Create direct post users.
username3 := model.NewId()
username3 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username3,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4284,14 +4284,14 @@ func TestImportPostAndRepliesWithAttachments(t *testing.T) {
user3, appErr = th.App.GetUserByUsername(username3)
require.Nil(t, appErr, "Failed to get user3 from database.")
username4 := model.NewId()
username4 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username4,
Email: ptrStr(model.NewId() + "@example.com"),
}, false)
user4, appErr := th.App.GetUserByUsername(username4)
require.Nil(t, appErr, "Failed to get user3 from database.")
require.Nil(t, appErr, "Failed to get user4 from database.")
// Post with attachments
time := model.GetMillis()
@@ -4482,7 +4482,7 @@ func TestImportDirectPostWithAttachments(t *testing.T) {
defer os.RemoveAll(tmpFolder)
// Create a user.
username := model.NewId()
username := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4490,7 +4490,7 @@ func TestImportDirectPostWithAttachments(t *testing.T) {
user1, appErr := th.App.GetUserByUsername(username)
require.Nil(t, appErr, "Failed to get user1 from database.")
username2 := model.NewId()
username2 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username2,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4613,7 +4613,7 @@ func TestZippedImportPostAndRepliesWithAttachments(t *testing.T) {
require.Nil(t, appErr, "Failed to get channel from database.")
// Create users
username2 := model.NewId()
username2 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username2,
Email: ptrStr(model.NewId() + "@example.com"),
@@ -4622,7 +4622,7 @@ func TestZippedImportPostAndRepliesWithAttachments(t *testing.T) {
require.Nil(t, appErr, "Failed to get user3 from database.")
// Create direct post users.
username3 := model.NewId()
username3 := model.NewUsername()
th.App.importUser(th.Context, &imports.UserImportData{
Username: &username3,
Email: ptrStr(model.NewId() + "@example.com"),

6
server/channels/app/import_test.go
Просмотреть файл

@@ -166,9 +166,9 @@ func TestImportBulkImport(t *testing.T) {
teamName := model.NewRandomTeamName()
channelName := model.NewId()
username := model.NewId()
username2 := model.NewId()
username3 := model.NewId()
username := model.NewUsername()
username2 := model.NewUsername()
username3 := model.NewUsername()
emojiName := model.NewId()
testsDir, _ := fileutils.FindDir("tests")
testImage := filepath.Join(testsDir, "test.png")

4
server/channels/app/plugin_api_test.go
Просмотреть файл

@@ -1425,14 +1425,14 @@ func TestPluginCreateBot(t *testing.T) {
api := th.SetupPluginAPI()
bot, err := api.CreateBot(&model.Bot{
Username: model.NewRandomString(10),
Username: "a" + model.NewRandomString(10),
DisplayName: "bot",
Description: "bot",
})
require.Nil(t, err)
_, err = api.CreateBot(&model.Bot{
Username: model.NewRandomString(10),
Username: "a" + model.NewRandomString(10),
OwnerId: bot.UserId,
DisplayName: "bot2",
Description: "bot2",

4
server/channels/app/slashcommands/auto_users.go
Просмотреть файл

@@ -86,10 +86,10 @@ func (cfg *AutoUserCreator) createRandomUser(c request.CTX) (*model.User, error)
var userName string
if cfg.Fuzzy {
userEmail = "success+" + model.NewId() + "@simulator.amazonses.com"
userName = utils.FuzzName()
userName = "a" + utils.FuzzName()
} else {
userEmail = "success+" + model.NewId() + "@simulator.amazonses.com"
userName = utils.RandomName(cfg.NameLength, cfg.NameCharset)
userName = "a" + utils.RandomName(cfg.NameLength, cfg.NameCharset)
}
user := &model.User{

10
server/channels/app/user_test.go
Просмотреть файл

@@ -497,7 +497,7 @@ func TestCreateUserConflict(t *testing.T) {
user := &model.User{
Email: "test@localhost",
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err := th.App.Srv().Store().User().Save(th.Context, user)
require.NoError(t, err)
@@ -513,7 +513,7 @@ func TestCreateUserConflict(t *testing.T) {
// Same email
user = &model.User{
Email: "test@localhost",
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err = th.App.Srv().Store().User().Save(th.Context, user)
require.Error(t, err)
@@ -565,7 +565,7 @@ func TestUpdateUserEmail(t *testing.T) {
// Create bot user
botuser := model.User{
Email: "botuser@localhost",
Username: model.NewId(),
Username: model.NewUsername(),
IsBot: true,
}
_, nErr := th.App.Srv().Store().User().Save(th.Context, &botuser)
@@ -608,7 +608,7 @@ func TestUpdateUserEmail(t *testing.T) {
// Create bot user
botuser := model.User{
Email: "botuser@localhost",
Username: model.NewId(),
Username: model.NewUsername(),
IsBot: true,
}
_, nErr := th.App.Srv().Store().User().Save(th.Context, &botuser)
@@ -1921,7 +1921,7 @@ func TestPatchUser(t *testing.T) {
t.Run("Patch username with a new username", func(t *testing.T) {
u, err := th.App.PatchUser(th.Context, testUser.Id, &model.UserPatch{
Username: model.NewString(model.NewId()),
Username: model.NewString(model.NewUsername()),
}, true)
require.Nil(t, err)

10
server/channels/app/users/users_test.go
Просмотреть файл

@@ -37,7 +37,7 @@ func TestFirstUserPromoted(t *testing.T) {
defer th.TearDown()
user, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Password: model.NewId(),
Email: "user@example.com",
}, UserCreateOptions{})
@@ -47,7 +47,7 @@ func TestFirstUserPromoted(t *testing.T) {
require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user.Roles)
user2, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Password: model.NewId(),
Email: "user2@example.com",
}, UserCreateOptions{})
@@ -61,14 +61,14 @@ func TestFirstUserPromoted(t *testing.T) {
b := &model.Bot{
UserId: user2.Id,
OwnerId: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err = th.dbStore.Bot().Save(b)
require.NoError(t, err)
user3, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Password: model.NewId(),
Email: "user3@example.com",
}, UserCreateOptions{})
@@ -78,7 +78,7 @@ func TestFirstUserPromoted(t *testing.T) {
require.Equal(t, model.SystemAdminRoleId+" "+model.SystemUserRoleId, user3.Roles)
user4, err := th.service.CreateUser(th.Context, &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Password: model.NewId(),
Email: "user4@example.com",
}, UserCreateOptions{})

2
server/channels/store/sqlstore/integrity_test.go
Просмотреть файл

@@ -363,7 +363,7 @@ func createTeamWithSchemeId(ss store.Store, schemeId *string) *model.Team {
func createUser(rctx request.CTX, ss store.Store) *model.User {
m := model.User{}
m.Username = model.NewId()
m.Username = model.NewUsername()
m.Email = m.Username + "@example.com"
user, _ := ss.User().Save(rctx, &m)
return user

2
server/channels/store/storetest/bot_store.go
Просмотреть файл

@@ -193,7 +193,7 @@ func testBotStoreGetAll(t *testing.T, rctx request.CTX, ss store.Store, s SqlSto
deletedUser := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err1 := ss.User().Save(rctx, &deletedUser)
require.NoError(t, err1, "couldn't save user")

12
server/channels/store/storetest/channel_member_history_store.go
Просмотреть файл

@@ -41,7 +41,7 @@ func testLogJoinEvent(t *testing.T, rctx request.CTX, ss store.Store) {
user := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err)
@@ -67,7 +67,7 @@ func testLogLeaveEvent(t *testing.T, rctx request.CTX, ss store.Store) {
user := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err)
@@ -96,7 +96,7 @@ func testGetUsersInChannelAtChannelMemberHistory(t *testing.T, rctx request.CTX,
user := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err)
@@ -192,7 +192,7 @@ func testGetUsersInChannelAtChannelMembers(t *testing.T, rctx request.CTX, ss st
user := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err)
@@ -304,7 +304,7 @@ func testPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.Store) {
user := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userPtr, err := ss.User().Save(rctx, &user)
require.NoError(t, err)
@@ -313,7 +313,7 @@ func testPermanentDeleteBatch(t *testing.T, rctx request.CTX, ss store.Store) {
user2 := model.User{
Email: MakeEmail(),
Nickname: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2Ptr, err := ss.User().Save(rctx, &user2)
require.NoError(t, err)

36
server/channels/store/storetest/channel_store.go
Просмотреть файл

@@ -1137,7 +1137,7 @@ func testChannelMemberStore(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -1644,9 +1644,9 @@ func testChannelSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -2193,7 +2193,7 @@ func testChannelSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Sto
}
func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -2698,9 +2698,9 @@ func testChannelUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -3234,7 +3234,7 @@ func testChannelUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.S
}
func testChannelUpdateMemberNotifyProps(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -3301,9 +3301,9 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
}, -1)
require.NoError(t, err)
user1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
user1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
user2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
user2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
original1, err := ss.Channel().SaveMember(rctx, &model.ChannelMember{
ChannelId: channel1.Id,
@@ -3389,7 +3389,7 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
}, -1)
require.NoError(t, err)
user, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
user, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
_, err = ss.Channel().SaveMember(rctx, &model.ChannelMember{
ChannelId: channel.Id,
@@ -3416,13 +3416,13 @@ func testChannelPatchMultipleMembersNotifyProps(t *testing.T, rctx request.CTX,
}
func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
channelID := model.NewId()
defaultNotifyProps := model.GetDefaultChannelNotifyProps()
@@ -3463,13 +3463,13 @@ func testChannelRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testChannelRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
channelID := model.NewId()
defaultNotifyProps := model.GetDefaultChannelNotifyProps()

34
server/channels/store/storetest/compliance_store.go
Просмотреть файл

@@ -113,7 +113,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{}
u1.Email = MakeEmail()
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1, err = ss.User().Save(rctx, u1)
require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1)
@@ -121,7 +121,7 @@ func testComplianceExport(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := &model.User{}
u2.Email = MakeEmail()
u2.Username = model.NewId()
u2.Username = model.NewUsername()
u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1)
@@ -247,7 +247,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
u1 := &model.User{}
u1.Email = MakeEmail()
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1, err = ss.User().Save(rctx, u1)
require.NoError(t, err)
_, nErr := ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u1.Id}, -1)
@@ -255,7 +255,7 @@ func testComplianceExportDirectMessages(t *testing.T, rctx request.CTX, ss store
u2 := &model.User{}
u2.Email = MakeEmail()
u2.Username = model.NewId()
u2.Username = model.NewUsername()
u2, err = ss.User().Save(rctx, u2)
require.NoError(t, err)
_, nErr = ss.Team().SaveMember(rctx, &model.TeamMember{TeamId: t1.Id, UserId: u2.Id}, -1)
@@ -417,7 +417,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
// and two users that are a part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -429,7 +429,7 @@ func testMessageExportPublicChannel(t *testing.T, rctx request.CTX, ss store.Sto
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -521,7 +521,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
// and two users that are a part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -533,7 +533,7 @@ func testMessageExportPrivateChannel(t *testing.T, rctx request.CTX, ss store.St
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -627,7 +627,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
// and two users that are a part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -639,7 +639,7 @@ func testMessageExportDirectMessageChannel(t *testing.T, rctx request.CTX, ss st
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -708,7 +708,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
// and three users that are a part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -720,7 +720,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -732,7 +732,7 @@ func testMessageExportGroupMessageChannel(t *testing.T, rctx request.CTX, ss sto
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
@@ -806,7 +806,7 @@ func testEditExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
// need a user part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -898,7 +898,7 @@ func testEditAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store)
// need a user part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -1009,7 +1009,7 @@ func testDeleteExportMessage(t *testing.T, rctx request.CTX, ss store.Store) {
// need a user part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
@@ -1094,7 +1094,7 @@ func testDeleteAfterExportMessage(t *testing.T, rctx request.CTX, ss store.Store
// need a user part of that team
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)

152
server/channels/store/storetest/group_store.go
Просмотреть файл

@@ -203,7 +203,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
// Create user 1
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -211,7 +211,7 @@ func testGroupCreateWithUserIds(t *testing.T, rctx request.CTX, ss store.Store)
// Create user 2
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -556,7 +556,7 @@ func testGroupStoreGetByUser(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
u1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -568,7 +568,7 @@ func testGroupStoreGetByUser(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
u2, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -811,7 +811,7 @@ func testGroupGetMemberUsers(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -821,7 +821,7 @@ func testGroupGetMemberUsers(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -939,7 +939,7 @@ func testGroupGetMemberUsersSortedPage(t *testing.T, rctx request.CTX, ss store.
u1 := &model.User{
Email: MakeEmail(),
Username: "y" + model.NewId(),
Nickname: "a" + model.NewId(),
Nickname: model.NewUsername(),
FirstName: "z" + model.NewId(),
LastName: "z" + model.NewId(),
}
@@ -1030,7 +1030,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
@@ -1040,7 +1040,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
@@ -1050,7 +1050,7 @@ func testGroupGetMemberUsersInTeam(t *testing.T, rctx request.CTX, ss store.Stor
u3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
@@ -1116,7 +1116,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
@@ -1126,7 +1126,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
@@ -1136,7 +1136,7 @@ func testGroupGetMemberUsersNotInChannel(t *testing.T, rctx request.CTX, ss stor
u3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
@@ -1243,7 +1243,7 @@ func testUpsertMember(t *testing.T, rctx request.CTX, ss store.Store) {
// Create user
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -1304,7 +1304,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
// Create user
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -1312,7 +1312,7 @@ func testUpsertMembers(t *testing.T, rctx request.CTX, ss store.Store) {
// Create user
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -1370,7 +1370,7 @@ func testGroupDeleteMember(t *testing.T, rctx request.CTX, ss store.Store) {
// Create user
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -1405,7 +1405,7 @@ func testGroupDeleteMembers(t *testing.T, rctx request.CTX, ss store.Store) {
// Create user
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
@@ -1464,7 +1464,7 @@ func testGroupPermanentDeleteMembersByUser(t *testing.T, rctx request.CTX, ss st
// Create user
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
@@ -1760,7 +1760,7 @@ func testTeamMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
// Create User
user := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr)
@@ -1945,21 +1945,21 @@ func testTeamMembersToAddSingleTeam(t *testing.T, rctx request.CTX, ss store.Sto
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr)
@@ -2029,7 +2029,7 @@ func testChannelMembersToAdd(t *testing.T, rctx request.CTX, ss store.Store) {
// Create User
user := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, nErr := ss.User().Save(rctx, user)
require.NoError(t, nErr)
@@ -2212,21 +2212,21 @@ func testChannelMembersToAddSingleChannel(t *testing.T, rctx request.CTX, ss sto
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, user1)
require.NoError(t, nErr)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr = ss.User().Save(rctx, user2)
require.NoError(t, nErr)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, nErr = ss.User().Save(rctx, user3)
require.NoError(t, nErr)
@@ -2351,21 +2351,21 @@ func testTeamMembersToRemove(t *testing.T, rctx request.CTX, ss store.Store) {
func testTeamMembersToRemoveSingleTeam(t *testing.T, rctx request.CTX, ss store.Store) {
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
@@ -2503,21 +2503,21 @@ func testChannelMembersToRemove(t *testing.T, rctx request.CTX, ss store.Store)
func testChannelMembersToRemoveSingleChannel(t *testing.T, rctx request.CTX, ss store.Store) {
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
@@ -2594,7 +2594,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
// userA will get removed from the group
userA := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userA, nErr := ss.User().Save(rctx, userA)
require.NoError(t, nErr)
@@ -2602,7 +2602,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
// userB will not get removed from the group
userB := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userB, nErr = ss.User().Save(rctx, userB)
require.NoError(t, nErr)
@@ -2610,7 +2610,7 @@ func pendingMemberRemovalsDataSetup(t *testing.T, rctx request.CTX, ss store.Sto
// userC was never in the group
userC := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
userC, nErr = ss.User().Save(rctx, userC)
require.NoError(t, nErr)
@@ -2816,14 +2816,14 @@ func testGetGroupsByChannel(t *testing.T, rctx request.CTX, ss store.Store) {
// add members
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
@@ -3064,14 +3064,14 @@ func testGetGroupsAssociatedToChannelsByTeam(t *testing.T, rctx request.CTX, ss
// add members
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
@@ -3301,14 +3301,14 @@ func testGetGroupsByTeam(t *testing.T, rctx request.CTX, ss store.Store) {
// add members
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
@@ -3600,21 +3600,21 @@ func testGetGroups(t *testing.T, rctx request.CTX, ss store.Store) {
// add members
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, u1)
require.NoError(t, err)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err := ss.User().Save(rctx, u2)
require.NoError(t, err)
u3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err := ss.User().Save(rctx, u3)
require.NoError(t, err)
@@ -4018,7 +4018,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S
for i := 0; i < numberOfUsers; i++ {
user := &model.User{
Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()),
Username: fmt.Sprintf("a%d_%s", i, model.NewId()),
}
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
@@ -4032,7 +4032,7 @@ func testTeamMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss store.S
// Extra user outside of the group member users.
user := &model.User{
Email: MakeEmail(),
Username: "99_" + model.NewId(),
Username: "aa_" + model.NewId(),
}
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
@@ -4170,7 +4170,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss stor
for i := 0; i < numberOfUsers; i++ {
user := &model.User{
Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()),
Username: fmt.Sprintf("a%d_%s", i, model.NewId()),
}
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
@@ -4190,7 +4190,7 @@ func testChannelMembersMinusGroupMembers(t *testing.T, rctx request.CTX, ss stor
// Extra user outside of the group member users.
user, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: "99_" + model.NewId(),
Username: "a99_" + model.NewId(),
})
require.NoError(t, err)
users = append(users, user)
@@ -4329,7 +4329,7 @@ func groupTestGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
for i := 0; i < 2; i++ {
user = &model.User{
Email: MakeEmail(),
Username: fmt.Sprintf("%d_%s", i, model.NewId()),
Username: fmt.Sprintf("a%d_%s", i, model.NewId()),
}
user, nErr = ss.User().Save(rctx, user)
require.NoError(t, nErr)
@@ -4354,7 +4354,7 @@ func groupTestGetMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, rctx request.CTX, ss store.Store) {
user := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
@@ -4442,7 +4442,7 @@ func groupTestAdminRoleGroupsForSyncableMemberChannel(t *testing.T, rctx request
func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, rctx request.CTX, ss store.Store) {
user := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
@@ -4529,21 +4529,21 @@ func groupTestAdminRoleGroupsForSyncableMemberTeam(t *testing.T, rctx request.CT
func groupTestPermittedSyncableAdminsTeam(t *testing.T, rctx request.CTX, ss store.Store) {
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
@@ -4635,21 +4635,21 @@ func groupTestPermittedSyncableAdminsTeam(t *testing.T, rctx request.CTX, ss sto
func groupTestPermittedSyncableAdminsChannel(t *testing.T, rctx request.CTX, ss store.Store) {
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err := ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
@@ -4755,28 +4755,28 @@ func groupTestpUpdateMembersRoleTeam(t *testing.T, rctx request.CTX, ss store.St
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
user4 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err)
@@ -4855,28 +4855,28 @@ func groupTestpUpdateMembersRoleChannel(t *testing.T, rctx request.CTX, ss store
user1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, err = ss.User().Save(rctx, user1)
require.NoError(t, err)
user2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
user3 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user3, err = ss.User().Save(rctx, user3)
require.NoError(t, err)
user4 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user4, err = ss.User().Save(rctx, user4)
require.NoError(t, err)
@@ -5077,14 +5077,14 @@ func groupTestGroupChannelCount(t *testing.T, rctx request.CTX, ss store.Store)
func groupTestGroupMemberCount(t *testing.T, rctx request.CTX, ss store.Store) {
user := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err := ss.User().Save(rctx, user)
require.NoError(t, err)
user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -5136,14 +5136,14 @@ func groupTestDistinctGroupMemberCount(t *testing.T, rctx request.CTX, ss store.
user := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
Username: model.NewUsername(),
}
user, err = ss.User().Save(rctx, user)
require.NoError(t, err)
user2 := &model.User{
Email: fmt.Sprintf("test.%s@localhost", model.NewId()),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, err = ss.User().Save(rctx, user2)
require.NoError(t, err)
@@ -5218,14 +5218,14 @@ func groupTestGetMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -5255,14 +5255,14 @@ func groupTestGetNonMemberUsersPage(t *testing.T, rctx request.CTX, ss store.Sto
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, nErr = ss.User().Save(rctx, u2)
require.NoError(t, nErr)
@@ -5315,14 +5315,14 @@ func groupTestDistinctGroupMemberCountForSource(t *testing.T, rctx request.CTX,
// create a couple of users
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user1, nErr := ss.User().Save(rctx, u1)
require.NoError(t, nErr)
u2 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
user2, nErr := ss.User().Save(rctx, u2)
require.NoError(t, nErr)

4
server/channels/store/storetest/post_store.go
Просмотреть файл

@@ -4280,7 +4280,7 @@ func testPostStoreGetParentsForExportAfter(t *testing.T, rctx request.CTX, ss st
require.NoError(t, nErr)
u1 := model.User{}
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Email = MakeEmail()
u1.Nickname = model.NewId()
_, err = ss.User().Save(rctx, &u1)
@@ -4978,7 +4978,7 @@ func testGetPostReminderMetadata(t *testing.T, rctx request.CTX, ss store.Store,
u1 := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Locale: "es",
}

2
server/channels/store/storetest/retention_policy_store.go
Просмотреть файл

@@ -616,7 +616,7 @@ func testRetentionPolicyStoreGetPoliciesForUser(t *testing.T, rctx request.CTX,
user, userSaveErr := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
})
require.NoError(t, userSaveErr)

6
server/channels/store/storetest/shared_channel_store.go
Просмотреть файл

@@ -1021,7 +1021,7 @@ func testGetSharedChannelUsersForSync(t *testing.T, rctx request.CTX, ss store.S
var users []*model.User
for i := 0; i < 10; i++ { // need real users
u := &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis(),
}
@@ -1093,7 +1093,7 @@ func testGetSharedChannelUsersForSync(t *testing.T, rctx request.CTX, ss store.S
func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() - 300000, // 5 mins
}
@@ -1101,7 +1101,7 @@ func testUpdateSharedChannelUserLastSyncAt(t *testing.T, rctx request.CTX, ss st
require.NoError(t, err)
u2 := &model.User{
Username: model.NewId(),
Username: model.NewUsername(),
Email: model.NewId() + "@example.com",
LastPictureUpdate: model.GetMillis() + 300000,
}

40
server/channels/store/storetest/team_store.go
Просмотреть файл

@@ -1377,9 +1377,9 @@ func testTeamMembers(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
t.Run("not valid team member", func(t *testing.T) {
@@ -1713,13 +1713,13 @@ func testTeamSaveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
t.Run("any not valid team member", func(t *testing.T) {
@@ -2092,7 +2092,7 @@ func testTeamSaveMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store)
}
func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
t.Run("not valid team member", func(t *testing.T) {
@@ -2398,9 +2398,9 @@ func testTeamUpdateMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testTeamUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
t.Run("any not valid team member", func(t *testing.T) {
@@ -2721,13 +2721,13 @@ func testTeamUpdateMultipleMembers(t *testing.T, rctx request.CTX, ss store.Stor
}
func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
teamID := model.NewId()
m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id}
@@ -2767,13 +2767,13 @@ func testTeamRemoveMember(t *testing.T, rctx request.CTX, ss store.Store) {
}
func testTeamRemoveMembers(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u1, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u2, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u3, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewId(), Email: MakeEmail()})
u4, err := ss.User().Save(rctx, &model.User{Username: model.NewUsername(), Email: MakeEmail()})
require.NoError(t, err)
teamID := model.NewId()
m1 := &model.TeamMember{TeamId: teamID, UserId: u1.Id}
@@ -2888,7 +2888,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
for i := 0; i < maxUsersPerTeam; i++ {
user, err := ss.User().Save(rctx, &model.User{
Username: NewTestId(),
Username: "a" + NewTestId(),
Email: MakeEmail(),
})
require.NoError(t, err)
@@ -2914,7 +2914,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.Equal(t, int(totalMemberCount), maxUsersPerTeam, "should start with 5 team members, had %v instead", totalMemberCount)
user, nErr := ss.User().Save(rctx, &model.User{
Username: NewTestId(),
Username: "a" + NewTestId(),
Email: MakeEmail(),
})
require.NoError(t, nErr)
@@ -2962,7 +2962,7 @@ func testSaveTeamMemberMaxMembers(t *testing.T, rctx request.CTX, ss store.Store
require.NoError(t, nErr)
user, nErr = ss.User().Save(rctx, &model.User{
Username: NewTestId(),
Username: "a" + NewTestId(),
Email: MakeEmail(),
})
require.NoError(t, nErr)

6
server/channels/store/storetest/terms_of_service_store.go
Просмотреть файл

@@ -34,7 +34,7 @@ func testSaveTermsOfService(t *testing.T, rctx request.CTX, ss store.Store) {
t.Cleanup(func() { cleanUpTOS(ss) })
u1 := model.User{}
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Email = MakeEmail()
u1.Nickname = model.NewId()
_, err := ss.User().Save(rctx, &u1)
@@ -53,7 +53,7 @@ func testGetLatestTermsOfService(t *testing.T, rctx request.CTX, ss store.Store)
t.Cleanup(func() { cleanUpTOS(ss) })
u1 := model.User{}
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Email = MakeEmail()
u1.Nickname = model.NewId()
_, err := ss.User().Save(rctx, &u1)
@@ -73,7 +73,7 @@ func testGetTermsOfService(t *testing.T, rctx request.CTX, ss store.Store) {
t.Cleanup(func() { cleanUpTOS(ss) })
u1 := model.User{}
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Email = MakeEmail()
u1.Nickname = model.NewId()
_, err := ss.User().Save(rctx, &u1)

2
server/channels/store/storetest/thread_store.go
Просмотреть файл

@@ -36,7 +36,7 @@ func testThreadStorePopulation(t *testing.T, rctx request.CTX, ss store.Store) {
makeSomePosts := func(urgent bool) []*model.Post {
u1 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
u, err := ss.User().Save(rctx, &u1)

2
server/channels/store/storetest/user_access_token_store.go
Просмотреть файл

@@ -121,7 +121,7 @@ func testUserAccessTokenDisableEnable(t *testing.T, rctx request.CTX, ss store.S
func testUserAccessTokenSearch(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := model.User{}
u1.Email = MakeEmail()
u1.Username = model.NewId()
u1.Username = model.NewUsername()
_, err := ss.User().Save(rctx, &u1)
require.NoError(t, err)

50
server/channels/store/storetest/user_store.go
Просмотреть файл

@@ -109,7 +109,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err := ss.User().Save(rctx, &u1)
@@ -125,7 +125,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
u2 := model.User{
Email: u1.Email,
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err = ss.User().Save(rctx, &u2)
require.Error(t, err, "should be unique email")
@@ -141,7 +141,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
u3 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
NotifyProps: make(map[string]string, 1),
}
maxPostSize := ss.Post().GetMaxPostSize()
@@ -152,7 +152,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
for i := 0; i < 49; i++ {
u := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err = ss.User().Save(rctx, &u)
require.NoError(t, err, "couldn't save item")
@@ -165,7 +165,7 @@ func testUserStoreSave(t *testing.T, rctx request.CTX, ss store.Store) {
u2.Id = ""
u2.Email = MakeEmail()
u2.Username = model.NewId()
u2.Username = model.NewUsername()
_, err = ss.User().Save(rctx, &u2)
require.NoError(t, err, "couldn't save item")
@@ -254,7 +254,7 @@ func testUserStoreUpdate(t *testing.T, rctx request.CTX, ss store.Store) {
u4 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
NotifyProps: make(map[string]string, 1),
}
maxPostSize := ss.Post().GetMaxPostSize()
@@ -312,7 +312,7 @@ func testUserStoreGet(t *testing.T, rctx request.CTX, ss store.Store) {
u2, _ := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
})
_, nErr := ss.Bot().Save(&model.Bot{
UserId: u2.Id,
@@ -4494,12 +4494,12 @@ func testUserStoreAnalyticsGetSystemAdminCount(t *testing.T, rctx request.CTX, s
u1 := model.User{}
u1.Email = MakeEmail()
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Roles = "system_user system_admin"
u2 := model.User{}
u2.Email = MakeEmail()
u2.Username = model.NewId()
u2.Username = model.NewUsername()
_, nErr := ss.User().Save(rctx, &u1)
require.NoError(t, nErr, "couldn't save user")
@@ -4521,17 +4521,17 @@ func testUserStoreAnalyticsGetGuestCount(t *testing.T, rctx request.CTX, ss stor
u1 := model.User{}
u1.Email = MakeEmail()
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Roles = "system_user system_admin"
u2 := model.User{}
u2.Email = MakeEmail()
u2.Username = model.NewId()
u2.Username = model.NewUsername()
u2.Roles = "system_user"
u3 := model.User{}
u3.Email = MakeEmail()
u3.Username = model.NewId()
u3.Username = model.NewUsername()
u3.Roles = "system_guest"
_, nErr := ss.User().Save(rctx, &u1)
@@ -4559,17 +4559,17 @@ func testUserStoreAnalyticsGetExternalUsers(t *testing.T, rctx request.CTX, ss s
u1 := model.User{}
u1.Email = "a@mattermost.com"
u1.Username = model.NewId()
u1.Username = model.NewUsername()
u1.Roles = "system_user system_admin"
u2 := model.User{}
u2.Email = "b@example.com"
u2.Username = model.NewId()
u2.Username = model.NewUsername()
u2.Roles = "system_user"
u3 := model.User{}
u3.Email = "c@test.com"
u3.Username = model.NewId()
u3.Username = model.NewUsername()
u3.Roles = "system_guest"
_, err = ss.User().Save(rctx, &u1)
@@ -4798,22 +4798,22 @@ func testUserStoreGetProfilesNotInTeam(t *testing.T, rctx request.CTX, ss store.
func testUserStoreClearAllCustomRoleAssignments(t *testing.T, rctx request.CTX, ss store.Store) {
u1 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Roles: "system_user system_admin system_post_all",
}
u2 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Roles: "system_user custom_role system_admin another_custom_role",
}
u3 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Roles: "system_user",
}
u4 := model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Roles: "custom_only",
}
@@ -4852,7 +4852,7 @@ func testUserStoreClearAllCustomRoleAssignments(t *testing.T, rctx request.CTX,
func testUserStoreGetAllAfter(t *testing.T, rctx request.CTX, ss store.Store) {
u1, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
Roles: "system_user system_admin system_post_all",
})
require.NoError(t, err)
@@ -4933,7 +4933,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st
u1, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
CreateAt: model.GetMillis(),
})
require.NoError(t, err)
@@ -4943,7 +4943,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st
u2, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
CreateAt: model.GetMillis(),
})
require.NoError(t, err)
@@ -4970,7 +4970,7 @@ func testUserStoreGetUsersBatchForIndexing(t *testing.T, rctx request.CTX, ss st
u3, err := ss.User().Save(rctx, &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
CreateAt: model.GetMillis(),
})
require.NoError(t, err)
@@ -6151,7 +6151,7 @@ func testIsEmpty(t *testing.T, rctx request.CTX, ss store.Store) {
u := &model.User{
Email: MakeEmail(),
Username: model.NewId(),
Username: model.NewUsername(),
}
u, err = ss.User().Save(rctx, u)
@@ -6168,7 +6168,7 @@ func testIsEmpty(t *testing.T, rctx request.CTX, ss store.Store) {
b := &model.Bot{
UserId: u.Id,
OwnerId: model.NewId(),
Username: model.NewId(),
Username: model.NewUsername(),
}
_, err = ss.Bot().Save(b)

48
server/cmd/mmctl/commands/bot_e2e_test.go
Просмотреть файл

@@ -19,14 +19,14 @@ func (s *MmctlE2ETestSuite) TestListBotCmdF() {
s.RunForSystemAdminAndLocal("List Bot", func(c client.Client) {
printer.Clean()
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: s.th.BasicUser.Id})
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: s.th.BasicUser.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, bot.UserId)
s.Require().Nil(err)
}()
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: s.th.BasicUser.Id})
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: s.th.BasicUser.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, deletedBot.UserId)
@@ -49,21 +49,21 @@ func (s *MmctlE2ETestSuite) TestListBotCmdF() {
s.RunForSystemAdminAndLocal("List Bot only orphaned", func(c client.Client) {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId(), DeleteAt: 1})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId(), DeleteAt: 1})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, user)
s.Require().Nil(err)
}()
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: s.th.BasicUser.Id})
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: s.th.BasicUser.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, bot.UserId)
s.Require().Nil(err)
}()
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, deletedBot.UserId)
@@ -73,7 +73,7 @@ func (s *MmctlE2ETestSuite) TestListBotCmdF() {
deletedBot, appErr = s.th.App.UpdateBotActive(s.th.Context, deletedBot.UserId, false)
s.Require().Nil(appErr)
orphanBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
orphanBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, orphanBot.UserId)
@@ -96,28 +96,28 @@ func (s *MmctlE2ETestSuite) TestListBotCmdF() {
s.RunForSystemAdminAndLocal("List all Bots", func(c client.Client) {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId(), DeleteAt: 1})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId(), DeleteAt: 1})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, user)
s.Require().Nil(err)
}()
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: s.th.BasicUser2.Id})
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: s.th.BasicUser2.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, bot.UserId)
s.Require().Nil(err)
}()
orphanBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
orphanBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, orphanBot.UserId)
s.Require().Nil(err)
}()
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: s.th.BasicUser2.Id})
deletedBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: s.th.BasicUser2.Id})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteBot(s.th.Context, deletedBot.UserId)
@@ -159,13 +159,13 @@ func (s *MmctlE2ETestSuite) TestBotEnableCmd() {
s.SetupTestHelper().InitBasic()
s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableBotAccountCreation = true })
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("enable a bot", func(c client.Client) {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, false)
@@ -191,7 +191,7 @@ func (s *MmctlE2ETestSuite) TestBotEnableCmd() {
s.Run("enable a bot without permissions", func() {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, false)
@@ -219,7 +219,7 @@ func (s *MmctlE2ETestSuite) TestBotEnableCmd() {
s.RunForSystemAdminAndLocal("enable an already enabled bot", func(c client.Client) {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, true)
@@ -247,13 +247,13 @@ func (s *MmctlE2ETestSuite) TestBotDisableCmd() {
s.SetupTestHelper().InitBasic()
s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableBotAccountCreation = true })
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("disable a bot", func(c client.Client) {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, true)
@@ -277,7 +277,7 @@ func (s *MmctlE2ETestSuite) TestBotDisableCmd() {
s.Run("disable a bot without permissions", func() {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, true)
@@ -305,7 +305,7 @@ func (s *MmctlE2ETestSuite) TestBotDisableCmd() {
s.RunForSystemAdminAndLocal("disable an already disabled bot", func(c client.Client) {
printer.Clean()
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: user.Id})
newBot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: user.Id})
s.Require().Nil(appErr)
_, appErr = s.th.App.UpdateBotActive(s.th.Context, newBot.UserId, false)
@@ -333,21 +333,21 @@ func (s *MmctlE2ETestSuite) TestBotAssignCmdF() {
s.RunForSystemAdminAndLocal("Assign Bot", func(c client.Client) {
printer.Clean()
botOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
botOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, botOwner)
s.Require().Nil(err)
}()
newBotOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
newBotOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, newBotOwner)
s.Require().Nil(err)
}()
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: botOwner.Id})
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: botOwner.Id})
s.Require().Nil(appErr)
s.Require().Equal(bot.OwnerId, botOwner.Id)
defer func() {
@@ -366,21 +366,21 @@ func (s *MmctlE2ETestSuite) TestBotAssignCmdF() {
s.Run("Assign Bot without permission", func() {
printer.Clean()
botOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
botOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, botOwner)
s.Require().Nil(err)
}()
newBotOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
newBotOwner, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
defer func() {
err := s.th.App.PermanentDeleteUser(s.th.Context, newBotOwner)
s.Require().Nil(err)
}()
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewId(), OwnerId: botOwner.Id})
bot, appErr := s.th.App.CreateBot(s.th.Context, &model.Bot{Username: model.NewUsername(), OwnerId: botOwner.Id})
s.Require().Nil(appErr)
s.Require().Equal(bot.OwnerId, botOwner.Id)
defer func() {

2
server/cmd/mmctl/commands/channel_e2e_test.go
Просмотреть файл

@@ -324,7 +324,7 @@ func (s *MmctlE2ETestSuite) TestDeleteChannelsCmd() {
s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPIChannelDeletion = true })
defer s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableAPIChannelDeletion = *previousConfig })
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
team, appErr := s.th.App.CreateTeam(s.th.Context, &model.Team{

4
server/cmd/mmctl/commands/channel_users_e2e_test.go
Просмотреть файл

@@ -18,7 +18,7 @@ import (
func (s *MmctlE2ETestSuite) TestChannelUsersAddCmdF() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
_, _, appErr = s.th.App.AddUserToTeam(s.th.Context, s.th.BasicTeam.Id, user.Id, "")
@@ -151,7 +151,7 @@ func (s *MmctlE2ETestSuite) TestChannelUsersAddCmdF() {
func (s *MmctlE2ETestSuite) TestChannelUsersRemoveCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
_, _, appErr = s.th.App.AddUserToTeam(s.th.Context, s.th.BasicTeam.Id, user.Id, "")

4
server/cmd/mmctl/commands/permissions_role_e2e_test.go
Просмотреть файл

@@ -15,7 +15,7 @@ import (
func (s *MmctlE2ETestSuite) TestAssignUsersCmd() {
s.SetupEnterpriseTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.Run("MM-T3721 Should not allow normal user to assign a role", func() {
@@ -68,7 +68,7 @@ func (s *MmctlE2ETestSuite) TestAssignUsersCmd() {
func (s *MmctlE2ETestSuite) TestUnassignUsersCmd() {
s.SetupEnterpriseTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.Run("MM-T3965 Should not allow normal user to unassign a user from a role", func() {

8
server/cmd/mmctl/commands/team_users_e2e_test.go
Просмотреть файл

@@ -17,7 +17,7 @@ import (
func (s *MmctlE2ETestSuite) TestTeamUserAddCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
team, appErr := s.th.App.CreateTeam(s.th.Context, &model.Team{
@@ -171,7 +171,7 @@ func (s *MmctlE2ETestSuite) TestTeamUsersRemoveCmdF() {
s.RunForSystemAdminAndLocal("Remove user from team", func(c client.Client) {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
team := model.Team{
@@ -197,7 +197,7 @@ func (s *MmctlE2ETestSuite) TestTeamUsersRemoveCmdF() {
s.RunForSystemAdminAndLocal("Remove user from non-existent team", func(c client.Client) {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
nonexistentTeamName := model.NewId()
@@ -211,7 +211,7 @@ func (s *MmctlE2ETestSuite) TestTeamUsersRemoveCmdF() {
s.Run("Remove user from team without permissions", func() {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
team := model.Team{

4
server/cmd/mmctl/commands/token_e2e_test.go
Просмотреть файл

@@ -25,7 +25,7 @@ func (s *MmctlE2ETestSuite) TestTokenGenerateForUserCmd() {
s.RunForSystemAdminAndLocal("Generate token for user", func(c client.Client) {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
err := generateTokenForAUserCmdF(c, &cobra.Command{}, []string{user.Email, tokenDescription})
@@ -61,7 +61,7 @@ func (s *MmctlE2ETestSuite) TestTokenGenerateForUserCmd() {
s.Run("Generate token without permission", func() {
printer.Clean()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
err := generateTokenForAUserCmdF(s.th.Client, &cobra.Command{}, []string{user.Email, tokenDescription})

26
server/cmd/mmctl/commands/user_e2e_test.go
Просмотреть файл

@@ -19,7 +19,7 @@ import (
func (s *MmctlE2ETestSuite) TestUserActivateCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("Activate user", func(c client.Client) {
@@ -69,7 +69,7 @@ func (s *MmctlE2ETestSuite) TestUserActivateCmd() {
func (s *MmctlE2ETestSuite) TestUserDeactivateCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("Deactivate user", func(c client.Client) {
@@ -370,7 +370,7 @@ func (s *MmctlE2ETestSuite) TestUserInviteCmdf() {
func (s *MmctlE2ETestSuite) TestResetUserMfaCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId(), MfaActive: true, MfaSecret: "secret"})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId(), MfaActive: true, MfaSecret: "secret"})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("Reset user mfa", func(c client.Client) {
@@ -400,7 +400,7 @@ func (s *MmctlE2ETestSuite) TestResetUserMfaCmd() {
s.th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableMultifactorAuthentication = *previousVal })
}()
userMfaInactive, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId(), MfaActive: false})
userMfaInactive, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId(), MfaActive: false})
s.Require().Nil(appErr)
err := resetUserMfaCmdF(c, &cobra.Command{}, []string{userMfaInactive.Email})
@@ -436,7 +436,7 @@ func (s *MmctlE2ETestSuite) TestResetUserMfaCmd() {
func (s *MmctlE2ETestSuite) TestVerifyUserEmailWithoutTokenCmd() {
s.SetupTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.RunForSystemAdminAndLocal("Verify user email without token", func(c client.Client) {
@@ -500,7 +500,7 @@ func (s *MmctlE2ETestSuite) TestCreateUserCmd() {
s.RunForAllClients("Should not create a user w/o email", func(c client.Client) {
printer.Clean()
username := model.NewId()
username := model.NewUsername()
cmd := &cobra.Command{}
cmd.Flags().String("username", username, "")
cmd.Flags().String("password", "somepass", "")
@@ -531,7 +531,7 @@ func (s *MmctlE2ETestSuite) TestCreateUserCmd() {
s.Run("Should create a user but w/o system-admin privileges", func() {
printer.Clean()
email := s.th.GenerateTestEmail()
username := model.NewId()
username := model.NewUsername()
cmd := &cobra.Command{}
cmd.Flags().String("username", username, "")
cmd.Flags().String("email", email, "")
@@ -550,7 +550,7 @@ func (s *MmctlE2ETestSuite) TestCreateUserCmd() {
s.RunForSystemAdminAndLocal("Should create new system-admin user given required params", func(c client.Client) {
printer.Clean()
email := s.th.GenerateTestEmail()
username := model.NewId()
username := model.NewUsername()
cmd := &cobra.Command{}
cmd.Flags().String("username", username, "")
cmd.Flags().String("email", email, "")
@@ -569,7 +569,7 @@ func (s *MmctlE2ETestSuite) TestCreateUserCmd() {
s.RunForAllClients("Should create new user given required params", func(c client.Client) {
printer.Clean()
email := s.th.GenerateTestEmail()
username := model.NewId()
username := model.NewUsername()
cmd := &cobra.Command{}
cmd.Flags().String("username", username, "")
cmd.Flags().String("email", email, "")
@@ -587,7 +587,7 @@ func (s *MmctlE2ETestSuite) TestCreateUserCmd() {
s.RunForSystemAdminAndLocal("Should create new user with the email already verified only for admin or local mode", func(c client.Client) {
printer.Clean()
email := s.th.GenerateTestEmail()
username := model.NewId()
username := model.NewUsername()
cmd := &cobra.Command{}
cmd.Flags().String("username", username, "")
cmd.Flags().String("email", email, "")
@@ -854,7 +854,7 @@ func (s *MmctlE2ETestSuite) TestUserConvertCmdF() {
s.RunForSystemAdminAndLocal("Valid user to bot convert", func(c client.Client) {
printer.Clean()
user, _ := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, _ := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
email := user.Email
cmd := &cobra.Command{}
@@ -1002,7 +1002,7 @@ func (s *MmctlE2ETestSuite) TestDeleteAllUserCmd() {
func (s *MmctlE2ETestSuite) TestPromoteGuestToUserCmd() {
s.SetupEnterpriseTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.th.App.UpdateConfig(func(c *model.Config) { *c.GuestAccountsSettings.Enable = true })
@@ -1034,7 +1034,7 @@ func (s *MmctlE2ETestSuite) TestPromoteGuestToUserCmd() {
func (s *MmctlE2ETestSuite) TestDemoteUserToGuestCmd() {
s.SetupEnterpriseTestHelper().InitBasic()
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewId(), Password: model.NewId()})
user, appErr := s.th.App.CreateUser(s.th.Context, &model.User{Email: s.th.GenerateTestEmail(), Username: model.NewUsername(), Password: model.NewId()})
s.Require().Nil(appErr)
s.th.App.UpdateConfig(func(c *model.Config) { *c.GuestAccountsSettings.Enable = true })

9
server/public/model/user.go
Просмотреть файл

@@ -453,7 +453,7 @@ func (u *User) PreSave() *AppError {
}
if u.Username == "" {
u.Username = NewId()
u.Username = NewUsername()
}
if u.AuthData != nil && *u.AuthData == "" {
@@ -972,7 +972,8 @@ func HashPassword(password string) (string, error) {
}
var validUsernameChars = regexp.MustCompile(`^[a-z0-9\.\-_]+$`)
var validUsernameCharsForRemote = regexp.MustCompile(`^[a-z0-9\.\-_:]+$`)
var validUsername = regexp.MustCompile(`^[a-z][a-z0-9\.\-_]*$`)
var validUsernameCharsForRemote = regexp.MustCompile(`^[a-z][a-z0-9\.\-_:]*$`)
var restrictedUsernames = map[string]struct{}{
"all": {},
@@ -986,7 +987,7 @@ func IsValidUsername(s string) bool {
return false
}
if !validUsernameChars.MatchString(s) {
if !validUsername.MatchString(s) {
return false
}
@@ -1028,7 +1029,7 @@ func CleanUsername(logger mlog.LoggerIFace, username string) string {
s = strings.Trim(s, "-")
if !IsValidUsername(s) {
s = "a" + NewId()
s = NewUsername()
logger.Warn("Generating new username since provided username was invalid",
mlog.String("provided_username", username), mlog.String("new_username", s))
}

10
server/public/model/user_test.go
Просмотреть файл

@@ -252,11 +252,11 @@ func TestUserIsValid(t *testing.T) {
appErr = user.IsValid()
require.True(t, HasExpectedUserIsValidError(appErr, "username", user.Id, user.Username), "expected user is valid error: %s", appErr.Error())
user.Username = NewId() + "^hello#"
user.Username = NewUsername() + "^hello#"
appErr = user.IsValid()
require.True(t, HasExpectedUserIsValidError(appErr, "username", user.Id, user.Username), "expected user is valid error: %s", appErr.Error())
user.Username = NewId()
user.Username = NewUsername()
appErr = user.IsValid()
require.True(t, HasExpectedUserIsValidError(appErr, "email", user.Id, user.Email), "expected user is valid error: %s", appErr.Error())
@@ -429,9 +429,9 @@ var usernames = []usernamesTest{
{"spin-punch", true, true},
{"sp", true, true},
{"s", true, true},
{"1spin-punch", true, true},
{"-spin-punch", true, true},
{".spin-punch", true, true},
{"1spin-punch", false, false},
{"-spin-punch", false, false},
{".spin-punch", false, false},
{"Spin-punch", false, false},
{"spin punch-", false, false},
{"spin_punch", true, true},

5
server/public/model/utils.go
Просмотреть файл

@@ -383,6 +383,11 @@ func NewId() string {
return encoding.EncodeToString(uuid.NewRandom())
}
// NewUsername is a NewId prefixed with a letter to make valid username
func NewUsername() string {
return "a" + NewId()
}
// NewRandomTeamName is a NewId that will be a valid team name.
func NewRandomTeamName() string {
teamName := NewId()