[MM-16146] When converting a bot to a user, set the role to system_user (#11361)

* when converting a bot to a user, set the role to system_user

* correct govet shadow error

* Change from inline error checking and fix shadow error

* Add SYSTEM_USER_ROLE_ID to the bot user model instead of updating the
role after the bot user is created

* modify UserFromBot test to include Roles field
This commit is contained in:
jfrerich
2019-06-28 09:41:14 -05:00
committed by Christopher Speller
parent 3bce32bbcf
commit 0cae57a6cd
2 changed files with 3 additions and 0 deletions

View File

@@ -169,6 +169,7 @@ func UserFromBot(b *Bot) *User {
Username: b.Username,
Email: fmt.Sprintf("%s@localhost", strings.ToLower(b.Username)),
FirstName: b.DisplayName,
Roles: SYSTEM_USER_ROLE_ID,
}
}

View File

@@ -508,12 +508,14 @@ func TestUserFromBot(t *testing.T) {
Username: "username",
Email: "username@localhost",
FirstName: "display name",
Roles: "system_user",
}, UserFromBot(bot1))
assert.Equal(t, &User{
Id: bot2.UserId,
Username: "username2",
Email: "username2@localhost",
FirstName: "display name 2",
Roles: "system_user",
}, UserFromBot(bot2))
}