diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-09 15:39:39 +0300 |
|---|---|---|
| committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-02-10 17:53:01 +0300 |
| commit | 88d610c60e9064f92419481a9df6453b3c8079b3 (patch) | |
| tree | a11df58a8b87c4d169c0a1d10d955563d86802f7 /lib/api/members.rb | |
| parent | 0fddece769352b650c01d3a0920eea05f378b940 (diff) | |
Add member: Always return 409 when a member exists
Diffstat (limited to 'lib/api/members.rb')
| -rw-r--r-- | lib/api/members.rb | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/api/members.rb b/lib/api/members.rb index d85f1f78cd6..d1d78775c6d 100644 --- a/lib/api/members.rb +++ b/lib/api/members.rb @@ -56,16 +56,9 @@ module API member = source.members.find_by(user_id: params[:user_id]) - # We need this explicit check because `source.add_user` doesn't - # currently return the member created so it would return 201 even if - # the member already existed... - # The `source_type == 'group'` check is to ensure back-compatibility - # but 409 behavior should be used for both project and group members in 9.0! - conflict!('Member already exists') if source_type == 'group' && member - - unless member - member = source.add_user(params[:user_id], params[:access_level], current_user: current_user, expires_at: params[:expires_at]) - end + conflict!('Member already exists') if member + + member = source.add_user(params[:user_id], params[:access_level], current_user: current_user, expires_at: params[:expires_at]) if member.persisted? && member.valid? present member.user, with: Entities::Member, member: member |