Growth spike guest accounts (#19437)
* tools updates * Revert "tools updates" This reverts commit 6293297b55803c5a263e200ebd80192899666ae9. * new endpoint to get users that should potentially be guests * checking authservice to ensure they were an email signup * adding tests for new endpoint * fixing translation issue * permissions for new endpoint * fixing tests * fixing when domain array is empty * fixing when domain array is empty * removing bots from request Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MacBook-Pro.local> Co-authored-by: Benjamin Cooke <benjamincooke@Benjamins-MBP.ht.home> Co-authored-by: mkraft <martinkraft@gmail.com>
Этот коммит содержится в:
@@ -1002,6 +1002,29 @@ func (_m *UserStore) GetUsersBatchForIndexing(startTime int64, endTime int64, li
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetUsersWithInvalidEmails provides a mock function with given fields: page, perPage, restrictedDomains
|
||||
func (_m *UserStore) GetUsersWithInvalidEmails(page int, perPage int, restrictedDomains string) ([]*model.User, error) {
|
||||
ret := _m.Called(page, perPage, restrictedDomains)
|
||||
|
||||
var r0 []*model.User
|
||||
if rf, ok := ret.Get(0).(func(int, int, string) []*model.User); ok {
|
||||
r0 = rf(page, perPage, restrictedDomains)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.User)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(int, int, string) error); ok {
|
||||
r1 = rf(page, perPage, restrictedDomains)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// InferSystemInstallDate provides a mock function with given fields:
|
||||
func (_m *UserStore) InferSystemInstallDate() (int64, error) {
|
||||
ret := _m.Called()
|
||||
|
||||
@@ -91,6 +91,7 @@ func TestUserStore(t *testing.T, ss store.Store, s SqlStore) {
|
||||
t.Run("DeactivateGuests", func(t *testing.T) { testDeactivateGuests(t, ss) })
|
||||
t.Run("ResetLastPictureUpdate", func(t *testing.T) { testUserStoreResetLastPictureUpdate(t, ss) })
|
||||
t.Run("GetKnownUsers", func(t *testing.T) { testGetKnownUsers(t, ss) })
|
||||
t.Run("GetUsersWithInvalidEmails", func(t *testing.T) { testGetUsersWithInvalidEmails(t, ss) })
|
||||
}
|
||||
|
||||
func testUserStoreSave(t *testing.T, ss store.Store) {
|
||||
@@ -4656,6 +4657,7 @@ func testUserStoreGetTeamGroupUsers(t *testing.T, ss store.Store) {
|
||||
require.NoError(t, userErr)
|
||||
require.NotNil(t, user)
|
||||
testUsers = append(testUsers, user)
|
||||
defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }()
|
||||
}
|
||||
require.Len(t, testUsers, 3, "testUsers length doesn't meet required length")
|
||||
userGroupA, userGroupB, userNoGroup := testUsers[0], testUsers[1], testUsers[2]
|
||||
@@ -4776,6 +4778,7 @@ func testUserStoreGetChannelGroupUsers(t *testing.T, ss store.Store) {
|
||||
require.NoError(t, userErr)
|
||||
require.NotNil(t, user)
|
||||
testUsers = append(testUsers, user)
|
||||
defer func() { require.NoError(t, ss.User().PermanentDelete(user.Id)) }()
|
||||
}
|
||||
require.Len(t, testUsers, 3, "testUsers length doesn't meet required length")
|
||||
userGroupA, userGroupB, userNoGroup := testUsers[0], testUsers[1], testUsers[2]
|
||||
@@ -5778,3 +5781,17 @@ func testIsEmpty(t *testing.T, ss store.Store) {
|
||||
require.NoError(t, err)
|
||||
require.True(t, ok)
|
||||
}
|
||||
|
||||
func testGetUsersWithInvalidEmails(t *testing.T, ss store.Store) {
|
||||
u1, err := ss.User().Save(&model.User{
|
||||
Email: "ben@invalid.mattermost.com",
|
||||
Username: "u1" + model.NewId(),
|
||||
})
|
||||
|
||||
require.NoError(t, err)
|
||||
defer func() { require.NoError(t, ss.User().PermanentDelete(u1.Id)) }()
|
||||
|
||||
users, err := ss.User().GetUsersWithInvalidEmails(0, 50, "localhost,simulator.amazonses.com")
|
||||
require.NoError(t, err)
|
||||
assert.Len(t, users, 1)
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user