diff options
author | Patricio Cano <suprnova32@gmail.com> | 2016-08-30 18:43:24 -0500 |
---|---|---|
committer | Patricio Cano <suprnova32@gmail.com> | 2016-09-15 12:21:00 -0500 |
commit | c25630ee2c2804e351a2c3ae4fd9224434e4698a (patch) | |
tree | 7d183ef29da41a3c3b53790a2fc48402d1f4f397 /lib/api/internal.rb | |
parent | 48f1a61fd5c6aac395be0ce5d59aee61bbb69fe9 (diff) | |
download | gitlab-ce-c25630ee2c2804e351a2c3ae4fd9224434e4698a.tar.gz |
Refactored handling of the `LfsToken` and added functionality to it to simplify external code.
Diffstat (limited to 'lib/api/internal.rb')
-rw-r--r-- | lib/api/internal.rb | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lib/api/internal.rb b/lib/api/internal.rb index 1b3388347a8..1f189d81d16 100644 --- a/lib/api/internal.rb +++ b/lib/api/internal.rb @@ -80,16 +80,18 @@ module API key = Key.find(params[:key_id]) user = key.user - if user - token = Gitlab::LfsToken.new(user).generate - response = { username: user.username, lfs_token: token } - else - token = Gitlab::LfsToken.new(key).generate - response = { username: "lfs-deploy-key-#{key.id}", lfs_token: token } - end + token_handler = + if user + Gitlab::LfsToken.new(user) + else + Gitlab::LfsToken.new(key) + end - response[:repository_http_path] = project.http_url_to_repo - response + { + username: token_handler.actor_name, + lfs_token: token_handler.generate, + repository_http_path: project.http_url_to_repo + } end get "/merge_request_urls" do |