MM-20977 - Inviting multiple users with valid/allowed and inva… (#13372)

This commit is contained in:
Eli Yukelzon
2020-01-14 15:29:50 +02:00
committed by GitHub
parent 51a61f6bc1
commit e77ef9733c
10 changed files with 204 additions and 8 deletions

View File

@@ -288,6 +288,13 @@ type API interface {
// Minimum server version: 5.2
CreateTeamMembers(teamId string, userIds []string, requestorId string) ([]*model.TeamMember, *model.AppError)
// CreateTeamMembersGracefully creates a team membership for all provided user ids and reports the users that were not added.
//
// @tag Team
// @tag User
// Minimum server version: 5.20
CreateTeamMembersGracefully(teamId string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError)
// DeleteTeamMember deletes a team membership.
//
// @tag Team

View File

@@ -1682,6 +1682,37 @@ func (s *apiRPCServer) CreateTeamMembers(args *Z_CreateTeamMembersArgs, returns
return nil
}
type Z_CreateTeamMembersGracefullyArgs struct {
A string
B []string
C string
}
type Z_CreateTeamMembersGracefullyReturns struct {
A []*model.TeamMemberWithError
B *model.AppError
}
func (g *apiRPCClient) CreateTeamMembersGracefully(teamId string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError) {
_args := &Z_CreateTeamMembersGracefullyArgs{teamId, userIds, requestorId}
_returns := &Z_CreateTeamMembersGracefullyReturns{}
if err := g.client.Call("Plugin.CreateTeamMembersGracefully", _args, _returns); err != nil {
log.Printf("RPC call to CreateTeamMembersGracefully API failed: %s", err.Error())
}
return _returns.A, _returns.B
}
func (s *apiRPCServer) CreateTeamMembersGracefully(args *Z_CreateTeamMembersGracefullyArgs, returns *Z_CreateTeamMembersGracefullyReturns) error {
if hook, ok := s.impl.(interface {
CreateTeamMembersGracefully(teamId string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError)
}); ok {
returns.A, returns.B = hook.CreateTeamMembersGracefully(args.A, args.B, args.C)
} else {
return encodableError(fmt.Errorf("API CreateTeamMembersGracefully called but not implemented."))
}
return nil
}
type Z_DeleteTeamMemberArgs struct {
A string
B string

View File

@@ -268,6 +268,31 @@ func (_m *API) CreateTeamMembers(teamId string, userIds []string, requestorId st
return r0, r1
}
// CreateTeamMembersGracefully provides a mock function with given fields: teamId, userIds, requestorId
func (_m *API) CreateTeamMembersGracefully(teamId string, userIds []string, requestorId string) ([]*model.TeamMemberWithError, *model.AppError) {
ret := _m.Called(teamId, userIds, requestorId)
var r0 []*model.TeamMemberWithError
if rf, ok := ret.Get(0).(func(string, []string, string) []*model.TeamMemberWithError); ok {
r0 = rf(teamId, userIds, requestorId)
} else {
if ret.Get(0) != nil {
r0 = ret.Get(0).([]*model.TeamMemberWithError)
}
}
var r1 *model.AppError
if rf, ok := ret.Get(1).(func(string, []string, string) *model.AppError); ok {
r1 = rf(teamId, userIds, requestorId)
} else {
if ret.Get(1) != nil {
r1 = ret.Get(1).(*model.AppError)
}
}
return r0, r1
}
// CreateUser provides a mock function with given fields: user
func (_m *API) CreateUser(user *model.User) (*model.User, *model.AppError) {
ret := _m.Called(user)