From c855e61a19099b234aebb8061f92c35df6997db2 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Thu, 18 Jun 2020 11:22:42 +0530 Subject: [PATCH 1/3] Use GpgKeys::CreateService when a user creates gpg keys for themselves via the API --- lib/api/users.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/api/users.rb b/lib/api/users.rb index 5f15787015193f..824ae7bf89804e 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -792,9 +792,9 @@ def find_impersonation_token requires :key, type: String, desc: 'The new GPG key' end post 'gpg_keys' do - key = current_user.gpg_keys.new(declared_params) + key = ::GpgKeys::CreateService.new(current_user, declared_params(include_missing: false)).execute - if key.save + if key.persisted? present key, with: Entities::GpgKey else render_validation_error!(key) -- GitLab From 5764fc2f56029181147f7051c442f4a28d7d032d Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Thu, 18 Jun 2020 11:24:53 +0530 Subject: [PATCH 2/3] Add changelog --- changelogs/unreleased/services-usage-6.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 changelogs/unreleased/services-usage-6.yml diff --git a/changelogs/unreleased/services-usage-6.yml b/changelogs/unreleased/services-usage-6.yml new file mode 100644 index 00000000000000..cd11f7ba937604 --- /dev/null +++ b/changelogs/unreleased/services-usage-6.yml @@ -0,0 +1,5 @@ +--- +title: Use GpgKeys::CreateService when a user creates gpg keys for themselves via the API +merge_request: 34817 +author: Rajendra Kadam +type: fixed -- GitLab From 8de26906f68fe8f5a1ceeb5e51ecd73c164fc160 Mon Sep 17 00:00:00 2001 From: Rajendra Kadam Date: Fri, 19 Jun 2020 10:31:14 +0530 Subject: [PATCH 3/3] Update changelog --- changelogs/unreleased/services-usage-6.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/unreleased/services-usage-6.yml b/changelogs/unreleased/services-usage-6.yml index cd11f7ba937604..14e4384ad94d2f 100644 --- a/changelogs/unreleased/services-usage-6.yml +++ b/changelogs/unreleased/services-usage-6.yml @@ -1,5 +1,5 @@ --- -title: Use GpgKeys::CreateService when a user creates gpg keys for themselves via the API +title: Use GpgKeys::CreateService when a user creates GPG keys for themselves via the API merge_request: 34817 author: Rajendra Kadam type: fixed -- GitLab