Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
82508117
Commit
82508117
authored
Oct 02, 2012
by
Valeriy Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#1585 Api for user creation: base implementation
parent
0187ae4e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
0 deletions
+30
-0
lib/api/helpers.rb
lib/api/helpers.rb
+4
-0
lib/api/users.rb
lib/api/users.rb
+26
-0
No files found.
lib/api/helpers.rb
View file @
82508117
...
@@ -22,6 +22,10 @@ module Gitlab
...
@@ -22,6 +22,10 @@ module Gitlab
unauthorized!
unless
current_user
unauthorized!
unless
current_user
end
end
def
authenticated_as_admin!
forbidden!
unless
current_user
.
is_admin?
end
def
authorize!
action
,
subject
def
authorize!
action
,
subject
unless
abilities
.
allowed?
(
current_user
,
action
,
subject
)
unless
abilities
.
allowed?
(
current_user
,
action
,
subject
)
forbidden!
forbidden!
...
...
lib/api/users.rb
View file @
82508117
...
@@ -23,6 +23,30 @@ module Gitlab
...
@@ -23,6 +23,30 @@ module Gitlab
@user
=
User
.
find
(
params
[
:id
])
@user
=
User
.
find
(
params
[
:id
])
present
@user
,
with:
Entities
::
User
present
@user
,
with:
Entities
::
User
end
end
# Create user. Available only for admin
#
# Parameters:
# email (required) - Email
# name (required) - Name
# password (required) - Password
# password_confirmation (required) - Password confirmation
# skype - Skype ID
# linkedin (required) - Linkedin
# twitter - Twitter account
# projects_limit - Limit projects wich user can create
# Example Request:
# POST /users
post
do
authenticated_as_admin!
attrs
=
attributes_for_keys
[
:email
,
:name
,
:password
,
:password_confirmation
,
:skype
,
:linkedin
,
:twitter
,
:projects_limit
]
user
=
User
.
new
attrs
if
user
.
save
present
user
,
with:
Entities
::
User
else
not_found!
end
end
end
end
resource
:user
do
resource
:user
do
...
@@ -78,6 +102,8 @@ module Gitlab
...
@@ -78,6 +102,8 @@ module Gitlab
key
=
current_user
.
keys
.
find
params
[
:id
]
key
=
current_user
.
keys
.
find
params
[
:id
]
key
.
delete
key
.
delete
end
end
end
end
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment