ec0061a95c
Changes include: - Ensure Member.add_user is not called directly when not necessary - New GroupMember.add_users_to_group to have the same abstraction level as for Project - Refactor Member.add_user to take a source instead of an array of members - Fix Rubocop offenses - Always use Project#add_user instead of project.team.add_user - Factorize users addition as members in Member.add_users_to_source - Make access_level a keyword argument in GroupMember.add_users_to_group and ProjectMember.add_users_to_projects - Destroy any requester before adding them as a member - Improve the way we handle access requesters in Member.add_user Instead of removing the requester and creating a new member, we now simply accepts their access request. This way, they will receive a "access request granted" email. - Fix error that was previously silently ignored - Stop raising when access level is invalid in Member, let Rails validation do their work Signed-off-by: Rémy Coutable <remy@rymai.me>
77 lines
1.4 KiB
Ruby
77 lines
1.4 KiB
Ruby
class GroupMember < Member
|
|
SOURCE_TYPE = 'Namespace'
|
|
|
|
belongs_to :group, class_name: 'Group', foreign_key: 'source_id'
|
|
|
|
# Make sure group member points only to group as it source
|
|
default_value_for :source_type, SOURCE_TYPE
|
|
validates_format_of :source_type, with: /\ANamespace\z/
|
|
default_scope { where(source_type: SOURCE_TYPE) }
|
|
|
|
def self.access_level_roles
|
|
Gitlab::Access.options_with_owner
|
|
end
|
|
|
|
def self.access_levels
|
|
Gitlab::Access.sym_options_with_owner
|
|
end
|
|
|
|
def self.add_users_to_group(group, users, access_level, current_user: nil, expires_at: nil)
|
|
self.transaction do
|
|
add_users_to_source(
|
|
group,
|
|
users,
|
|
access_level,
|
|
current_user: current_user,
|
|
expires_at: expires_at
|
|
)
|
|
end
|
|
end
|
|
|
|
def group
|
|
source
|
|
end
|
|
|
|
def access_field
|
|
access_level
|
|
end
|
|
|
|
# Because source_type is `Namespace`...
|
|
def real_source_type
|
|
'Group'
|
|
end
|
|
|
|
private
|
|
|
|
def send_invite
|
|
notification_service.invite_group_member(self, @raw_invite_token)
|
|
|
|
super
|
|
end
|
|
|
|
def post_create_hook
|
|
notification_service.new_group_member(self)
|
|
|
|
super
|
|
end
|
|
|
|
def post_update_hook
|
|
if access_level_changed?
|
|
notification_service.update_group_member(self)
|
|
end
|
|
|
|
super
|
|
end
|
|
|
|
def after_accept_invite
|
|
notification_service.accept_group_invite(self)
|
|
|
|
super
|
|
end
|
|
|
|
def after_decline_invite
|
|
notification_service.decline_group_invite(self)
|
|
|
|
super
|
|
end
|
|
end
|