Finally remove utils.Cfg (#8113)
* finally remove utils.Cfg * fix compile error * another test compilation fix
Этот коммит содержится в:
Chris
коммит произвёл
Harrison Healey
Harrison Healey
родитель
dce0616305
Коммит
4e6cc846a6
@@ -23,7 +23,7 @@ func TestCreateUser(t *testing.T) {
|
||||
Client := th.Client
|
||||
AdminClient := th.SystemAdminClient
|
||||
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
ruser, resp := Client.CreateUser(&user)
|
||||
CheckNoError(t, resp)
|
||||
@@ -52,7 +52,7 @@ func TestCreateUser(t *testing.T) {
|
||||
CheckErrorMessage(t, resp, "store.sql_user.save.email_exists.app_error")
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
ruser.Email = GenerateTestEmail()
|
||||
ruser.Email = th.GenerateTestEmail()
|
||||
ruser.Username = user.Username
|
||||
_, resp = Client.CreateUser(ruser)
|
||||
CheckErrorMessage(t, resp, "store.sql_user.save.username_exists.app_error")
|
||||
@@ -66,7 +66,7 @@ func TestCreateUser(t *testing.T) {
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = false })
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = false })
|
||||
|
||||
user2 := &model.User{Email: GenerateTestEmail(), Password: "Password1", Username: GenerateTestUsername()}
|
||||
user2 := &model.User{Email: th.GenerateTestEmail(), Password: "Password1", Username: GenerateTestUsername()}
|
||||
_, resp = AdminClient.CreateUser(user2)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
@@ -87,7 +87,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
Client := th.Client
|
||||
|
||||
t.Run("CreateWithHashHappyPath", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
props := make(map[string]string)
|
||||
props["email"] = user.Email
|
||||
props["id"] = th.BasicTeam.Id
|
||||
@@ -113,7 +113,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("NoHashAndNoData", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
props := make(map[string]string)
|
||||
props["email"] = user.Email
|
||||
props["id"] = th.BasicTeam.Id
|
||||
@@ -133,7 +133,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("HashExpired", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
timeNow := time.Now()
|
||||
past49Hours := timeNow.Add(-49*time.Hour).UnixNano() / int64(time.Millisecond)
|
||||
|
||||
@@ -152,7 +152,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("WrongHash", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
props := make(map[string]string)
|
||||
props["email"] = user.Email
|
||||
props["id"] = th.BasicTeam.Id
|
||||
@@ -168,7 +168,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("EnableUserCreationDisable", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
props := make(map[string]string)
|
||||
props["email"] = user.Email
|
||||
@@ -189,7 +189,7 @@ func TestCreateUserWithHash(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
props := make(map[string]string)
|
||||
props["email"] = user.Email
|
||||
@@ -225,7 +225,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
AdminClient := th.SystemAdminClient
|
||||
|
||||
t.Run("CreateWithInviteIdHappyPath", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
inviteId := th.BasicTeam.InviteId
|
||||
|
||||
@@ -245,7 +245,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("WrongInviteId", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
inviteId := model.NewId()
|
||||
|
||||
@@ -255,7 +255,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("NoInviteId", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
_, resp := Client.CreateUserWithInviteId(&user, "")
|
||||
CheckBadRequestStatus(t, resp)
|
||||
@@ -263,7 +263,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("ExpiredInviteId", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
inviteId := th.BasicTeam.InviteId
|
||||
|
||||
@@ -277,7 +277,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("EnableUserCreationDisable", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { cfg.TeamSettings.EnableUserCreation = false })
|
||||
|
||||
@@ -291,7 +291,7 @@ func TestCreateUserWithInviteId(t *testing.T) {
|
||||
})
|
||||
|
||||
t.Run("EnableOpenServerDisable", func(t *testing.T) {
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Corey Hulen", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.TeamSettings.EnableOpenServer = false })
|
||||
|
||||
@@ -471,7 +471,7 @@ func TestGetUserByEmail(t *testing.T) {
|
||||
_, resp = Client.GetUserByEmail(GenerateTestUsername(), "")
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
_, resp = Client.GetUserByEmail(GenerateTestEmail(), "")
|
||||
_, resp = Client.GetUserByEmail(th.GenerateTestEmail(), "")
|
||||
CheckNotFoundStatus(t, resp)
|
||||
|
||||
// Check against privacy config settings
|
||||
@@ -964,7 +964,7 @@ func TestUpdateUser(t *testing.T) {
|
||||
th.App.AddSessionToCache(session)
|
||||
|
||||
ruser.Id = user.Id
|
||||
ruser.Email = GenerateTestEmail()
|
||||
ruser.Email = th.GenerateTestEmail()
|
||||
_, resp = Client.UpdateUser(ruser)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -1047,7 +1047,7 @@ func TestPatchUser(t *testing.T) {
|
||||
session.IsOAuth = true
|
||||
th.App.AddSessionToCache(session)
|
||||
|
||||
patch.Email = model.NewString(GenerateTestEmail())
|
||||
patch.Email = model.NewString(th.GenerateTestEmail())
|
||||
_, resp = Client.PatchUser(user.Id, patch)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
@@ -2070,7 +2070,7 @@ func TestVerifyUserEmail(t *testing.T) {
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
|
||||
user := model.User{Email: GenerateTestEmail(), Nickname: "Darth Vader", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
user := model.User{Email: th.GenerateTestEmail(), Nickname: "Darth Vader", Password: "hello1", Username: GenerateTestUsername(), Roles: model.SYSTEM_ADMIN_ROLE_ID + " " + model.SYSTEM_USER_ROLE_ID}
|
||||
|
||||
ruser, resp := Client.CreateUser(&user)
|
||||
|
||||
@@ -2105,7 +2105,7 @@ func TestSendVerificationEmail(t *testing.T) {
|
||||
CheckBadRequestStatus(t, resp)
|
||||
|
||||
// Even non-existent emails should return 200 OK
|
||||
_, resp = Client.SendVerificationEmail(GenerateTestEmail())
|
||||
_, resp = Client.SendVerificationEmail(th.GenerateTestEmail())
|
||||
CheckNoError(t, resp)
|
||||
|
||||
Client.Logout()
|
||||
@@ -2450,20 +2450,20 @@ func TestGetUserAccessToken(t *testing.T) {
|
||||
if len(rtokens) != 2 {
|
||||
t.Fatal("should have 2 tokens")
|
||||
}
|
||||
|
||||
_, resp = Client.GetUserAccessTokens(0,100)
|
||||
|
||||
_, resp = Client.GetUserAccessTokens(0, 100)
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
rtokens, resp = AdminClient.GetUserAccessTokens(1,1)
|
||||
|
||||
rtokens, resp = AdminClient.GetUserAccessTokens(1, 1)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 1 {
|
||||
t.Fatal("should have 1 token")
|
||||
}
|
||||
|
||||
rtokens, resp = AdminClient.GetUserAccessTokens(0,2)
|
||||
|
||||
rtokens, resp = AdminClient.GetUserAccessTokens(0, 2)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 2 {
|
||||
t.Fatal("should have 2 tokens")
|
||||
}
|
||||
@@ -2474,42 +2474,42 @@ func TestSearchUserAccessToken(t *testing.T) {
|
||||
defer th.TearDown()
|
||||
Client := th.Client
|
||||
AdminClient := th.SystemAdminClient
|
||||
|
||||
|
||||
testDescription := "test token"
|
||||
|
||||
|
||||
th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = true })
|
||||
|
||||
|
||||
th.App.UpdateUserRoles(th.BasicUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_USER_ACCESS_TOKEN_ROLE_ID, false)
|
||||
token, resp := Client.CreateUserAccessToken(th.BasicUser.Id, testDescription)
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
_, resp = Client.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: token.Id})
|
||||
CheckForbiddenStatus(t, resp)
|
||||
|
||||
|
||||
rtokens, resp := AdminClient.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: th.BasicUser.Id})
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 1 {
|
||||
t.Fatal("should have 1 tokens")
|
||||
}
|
||||
|
||||
|
||||
rtokens, resp = AdminClient.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: token.Id})
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 1 {
|
||||
t.Fatal("should have 1 tokens")
|
||||
}
|
||||
|
||||
|
||||
rtokens, resp = AdminClient.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: th.BasicUser.Username})
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 1 {
|
||||
t.Fatal("should have 1 tokens")
|
||||
}
|
||||
|
||||
|
||||
rtokens, resp = AdminClient.SearchUserAccessTokens(&model.UserAccessTokenSearch{Term: "not found"})
|
||||
CheckNoError(t, resp)
|
||||
|
||||
|
||||
if len(rtokens) != 0 {
|
||||
t.Fatal("should have 0 tokens")
|
||||
}
|
||||
@@ -2567,8 +2567,6 @@ func TestDisableUserAccessToken(t *testing.T) {
|
||||
|
||||
testDescription := "test token"
|
||||
|
||||
enableUserAccessTokens := *th.App.Config().ServiceSettings.EnableUserAccessTokens
|
||||
defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens })
|
||||
*th.App.Config().ServiceSettings.EnableUserAccessTokens = true
|
||||
|
||||
th.App.UpdateUserRoles(th.BasicUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_USER_ACCESS_TOKEN_ROLE_ID, false)
|
||||
@@ -2612,8 +2610,6 @@ func TestEnableUserAccessToken(t *testing.T) {
|
||||
|
||||
testDescription := "test token"
|
||||
|
||||
enableUserAccessTokens := *th.App.Config().ServiceSettings.EnableUserAccessTokens
|
||||
defer th.App.UpdateConfig(func(cfg *model.Config) { *cfg.ServiceSettings.EnableUserAccessTokens = enableUserAccessTokens })
|
||||
*th.App.Config().ServiceSettings.EnableUserAccessTokens = true
|
||||
|
||||
th.App.UpdateUserRoles(th.BasicUser.Id, model.SYSTEM_USER_ROLE_ID+" "+model.SYSTEM_USER_ACCESS_TOKEN_ROLE_ID, false)
|
||||
|
||||
Ссылка в новой задаче
Block a user