Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Allow adding of ssh keys for different users #314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
formorer wants to merge 8 commits into from
Closed

Allow adding of ssh keys for different users #314

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
db751c8
Allow creating ssh keys for different users
formorer Aug 19, 2017
60b4b28
Fix parameter handling
formorer Aug 19, 2017
61ee154
Fix typo in url
formorer Aug 19, 2017
a0790fa
Allow deleting ssh keys for given user
formorer Aug 19, 2017
3737a53
Fix conditional check
formorer Aug 19, 2017
efc46a7
Fix logic for delete_ssh_key
formorer Aug 19, 2017
853f6f1
Add function to search for usernames
formorer Aug 20, 2017
36f4890
Fix function name
formorer Aug 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions lib/gitlab/client/users.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,16 @@ def ssh_key(id)
#
# @param [String] title The title of an SSH key.
# @param [String] key The SSH key body.
# @param [Hash] options A customizable set of options.
# @option options [Integer] :user_id id of the user to associate the key with
# @return [Gitlab::ObjectifiedHash] Information about created SSH key.
def create_ssh_key(title, key)
post("/user/keys", body: { title: title, key: key })
def create_ssh_key(title, key, options={})
user_id = options.delete :user_id
if user_id.to_i.zero?
post("/user/keys", body: { title: title, key: key })
else
post("/users/#{user_id}/keys", body: { title: title, key: key })
end
end

# Deletes an SSH key.
Expand All @@ -173,8 +180,13 @@ def create_ssh_key(title, key)
#
# @param [Integer] id The ID of a user's SSH key.
# @return [Gitlab::ObjectifiedHash] Information about deleted SSH key.
def delete_ssh_key(id)
delete("/user/keys/#{id}")
def delete_ssh_key(id, options={})
user_id = options.delete :user_id
if user_id.to_i.zero?
delete("/user/keys/#{id}")
else
delete("/users/#{user_id}/keys/#{id}")
end
end

# Gets user emails.
Expand Down Expand Up @@ -246,5 +258,21 @@ def user_search(search, options={})
options[:search] = search
get("/users", query: options)
end


# Search for user by username
#
# @example
# Gitlab.user_search_username('gitlab')
#
# @param [String] search A username to search
# @param [Hash] options A customizable set of options.
# @option options [String] :per_page Number of user to return per page
# @option options [String] :page The page to retrieve
# @return [Array<Gitlab::ObjectifiedHash>]
def user_search_username(username, options={})
options[:username] = username
get("/users", query: options)
end
end
end