From 81b06b5b72a9327f6e4615c6f23cc58a8531a91c Mon Sep 17 00:00:00 2001 From: Allan Guwatudde Date: Wed, 20 Jan 2021 12:25:18 +0300 Subject: [PATCH] Switch creation of users to use app method vs client method (#16673) Co-authored-by: Mattermod --- app/slashcommands/auto_constants.go | 2 +- app/slashcommands/auto_users.go | 6 +++--- app/slashcommands/command_loadtest.go | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/slashcommands/auto_constants.go b/app/slashcommands/auto_constants.go index 266fc38540..099a65d0aa 100644 --- a/app/slashcommands/auto_constants.go +++ b/app/slashcommands/auto_constants.go @@ -9,7 +9,7 @@ import ( ) const ( - UserPassword = "passwd" + UserPassword = "Usr@MMTest123" ChannelType = model.CHANNEL_OPEN BTestTeamDisplayName = "TestTeam" BTestTeamName = "z-z-testdomaina" diff --git a/app/slashcommands/auto_users.go b/app/slashcommands/auto_users.go index cea4dbe378..cf76741e8d 100644 --- a/app/slashcommands/auto_users.go +++ b/app/slashcommands/auto_users.go @@ -93,9 +93,9 @@ func (cfg *AutoUserCreator) createRandomUser() (*model.User, error) { Nickname: userName, Password: UserPassword} - ruser, resp := cfg.client.CreateUserWithInviteId(user, cfg.team.InviteId) - if resp.Error != nil { - return nil, resp.Error + ruser, appErr := cfg.app.CreateUserWithInviteId(user, cfg.team.InviteId, "") + if appErr != nil { + return nil, appErr } status := &model.Status{UserId: ruser.Id, Status: model.STATUS_ONLINE, Manual: false, LastActivityAt: model.GetMillis(), ActiveChannel: ""} diff --git a/app/slashcommands/command_loadtest.go b/app/slashcommands/command_loadtest.go index 1ac2af0bb0..c2c347de27 100644 --- a/app/slashcommands/command_loadtest.go +++ b/app/slashcommands/command_loadtest.go @@ -294,7 +294,9 @@ func (*LoadTestProvider) UsersCommand(a *app.App, args *model.CommandArgs, messa client := model.NewAPIv4Client(args.SiteURL) userCreator := NewAutoUserCreator(a, client, team) userCreator.Fuzzy = doFuzz - userCreator.CreateTestUsers(usersr) + if _, err := userCreator.CreateTestUsers(usersr); err != nil { + return &model.CommandResponse{Text: "Failed to add users: " + err.Error(), ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}, err + } return &model.CommandResponse{Text: "Added users", ResponseType: model.COMMAND_RESPONSE_TYPE_EPHEMERAL}, nil }