Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
33955584
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
33955584
编写于
10月 02, 2012
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'api_for_user_creation' of dev.gitlabhq.com:gitlabhq
上级
0187ae4e
bda0a755
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
72 addition
and
0 deletion
+72
-0
doc/api/users.md
doc/api/users.md
+21
-0
lib/api/helpers.rb
lib/api/helpers.rb
+4
-0
lib/api/users.rb
lib/api/users.rb
+26
-0
spec/requests/api/users_spec.rb
spec/requests/api/users_spec.rb
+21
-0
未找到文件。
doc/api/users.md
浏览文件 @
33955584
...
...
@@ -65,6 +65,27 @@ Parameters:
}
```
## User creation
Create user. Available only for admin
```
POST /users
```
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
Will return created user with status
`201 Created`
on success, or
`404 Not
found`
on fail.
## Current user
Get currently authenticated user.
...
...
lib/api/helpers.rb
浏览文件 @
33955584
...
...
@@ -22,6 +22,10 @@ module Gitlab
unauthorized!
unless
current_user
end
def
authenticated_as_admin!
forbidden!
unless
current_user
.
is_admin?
end
def
authorize!
action
,
subject
unless
abilities
.
allowed?
(
current_user
,
action
,
subject
)
forbidden!
...
...
lib/api/users.rb
浏览文件 @
33955584
...
...
@@ -23,6 +23,30 @@ module Gitlab
@user
=
User
.
find
(
params
[
:id
])
present
@user
,
with:
Entities
::
User
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
resource
:user
do
...
...
@@ -78,6 +102,8 @@ module Gitlab
key
=
current_user
.
keys
.
find
params
[
:id
]
key
.
delete
end
end
end
end
spec/requests/api/users_spec.rb
浏览文件 @
33955584
...
...
@@ -4,6 +4,7 @@ describe Gitlab::API do
include
ApiHelpers
let
(
:user
)
{
Factory
:user
}
let
(
:admin
)
{
Factory
:admin
}
let
(
:key
)
{
Factory
:key
,
user:
user
}
describe
"GET /users"
do
...
...
@@ -32,6 +33,26 @@ describe Gitlab::API do
end
end
describe
"POST /users"
do
before
{
admin
}
it
"should not create invalid user"
do
post
api
(
"/users"
,
admin
),
{
email:
"invalid email"
}
response
.
status
.
should
==
404
end
it
"should create user"
do
expect
{
post
api
(
"/users"
,
admin
),
Factory
.
attributes
(
:user
)
}.
to
change
{
User
.
count
}.
by
(
1
)
end
it
"shouldn't available for non admin users"
do
post
api
(
"/users"
,
user
),
Factory
.
attributes
(
:user
)
response
.
status
.
should
==
403
end
end
describe
"GET /user"
do
it
"should return current user"
do
get
api
(
"/user"
,
user
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录