kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Set user when adding deploy key to project using API

Browse source
This commit is contained in:
Douwe Maan 2018-03-28 18:53:52 +02:00
parent f56ef20657
commit 59d910f2a1
2 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/api/deploy_keys.rb
View file

@ -54,7 +54,7 @@ module API
present key, with: Entities::DeployKeysProject
end
desc 'Add new deploy key to currently authenticated user' do
desc 'Add new deploy key to a project' do
success Entities::DeployKeysProject
end
params do
@ -66,33 +66,32 @@ module API
params[:key].strip!
# Check for an existing key joined to this project
key = user_project.deploy_keys_projects
deploy_key_project = user_project.deploy_keys_projects
.joins(:deploy_key)
.find_by(keys: { key: params[:key] })
if key
present key, with: Entities::DeployKeysProject
if deploy_key_project
present deploy_key_project, with: Entities::DeployKeysProject
break
end
# Check for available deploy keys in other projects
key = current_user.accessible_deploy_keys.find_by(key: params[:key])
if key
added_key = add_deploy_keys_project(user_project, deploy_key: key, can_push: !!params[:can_push])
deploy_key_project = add_deploy_keys_project(user_project, deploy_key: key, can_push: !!params[:can_push])
present added_key, with: Entities::DeployKeysProject
present deploy_key_project, with: Entities::DeployKeysProject
break
end
# Create a new deploy key
key_attributes = { can_push: !!params[:can_push],
deploy_key_attributes: declared_params.except(:can_push) }
key = add_deploy_keys_project(user_project, key_attributes)
deploy_key_attributes = declared_params.except(:can_push).merge(user: current_user)
deploy_key_project = add_deploy_keys_project(user_project, deploy_key_attributes: deploy_key_attributes, can_push: !!params[:can_push])
if key.valid?
present key, with: Entities::DeployKeysProject
if deploy_key_project.valid?
present deploy_key_project, with: Entities::DeployKeysProject
else
render_validation_error!(key)
render_validation_error!(deploy_key_project)
end
end

4
spec/requests/api/deploy_keys_spec.rb
View file

@ -91,6 +91,10 @@ describe API::DeployKeys do
expect do
post api("/projects/#{project.id}/deploy_keys", admin), key_attrs
end.to change { project.deploy_keys.count }.by(1)
new_key = project.deploy_keys.last
expect(new_key.key).to eq(key_attrs[:key])
expect(new_key.user).to eq(admin)
end
it 'returns an existing ssh key when attempting to add a duplicate' do