kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Remove private_token from API user entity

This commit is contained in:
Douwe Maan 2017-10-12 10:26:13 +02:00
parent a72d687931
commit fbdf057898
6 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/api/users.md
View File

@ -410,8 +410,7 @@ GET /user
"can_create_group": true, "can_create_group": true,
"can_create_project": true, "can_create_project": true,
"two_factor_enabled": true, "two_factor_enabled": true,
"external": false, "external": false
"private_token": "dd34asd13as"
} }
``` ```

4
lib/api/entities.rb
View File

@ -57,10 +57,6 @@ module API
expose :admin?, as: :is_admin expose :admin?, as: :is_admin
end end
class UserWithPrivateDetails < UserWithAdmin
expose :private_token
end
class Email < Grape::Entity class Email < Grape::Entity
expose :id, :email expose :id, :email
end end

4
lib/api/users.rb
View File

@ -507,9 +507,7 @@ module API
end end
get do get do
entity = entity =
if sudo? if current_user.admin?
Entities::UserWithPrivateDetails
elsif current_user.admin?
Entities::UserWithAdmin Entities::UserWithAdmin
else else
Entities::UserPublic Entities::UserPublic

6
spec/fixtures/api/schemas/public_api/v4/user/login.json vendored
View File

@ -27,11 +27,9 @@
"can_create_group", "can_create_group",
"can_create_project", "can_create_project",
"two_factor_enabled", "two_factor_enabled",
"external", "external"
"private_token"
], ],
"properties": { "properties": {
"$ref": "full.json", "$ref": "full.json"
"private_token": { "type": "string" }
} }
} }

4
spec/support/gitlab_stubs/session.json
View File

@ -14,7 +14,5 @@
"provider":null, "provider":null,
"is_admin":false, "is_admin":false,
"can_create_group":false, "can_create_group":false,
"can_create_project":false, "can_create_project":false
"private_token":"Wvjy2Krpb7y8xi93owUz",
"access_token":"Wvjy2Krpb7y8xi93owUz"
} }

6
spec/support/gitlab_stubs/user.json
View File

@ -14,7 +14,5 @@
"provider":null, "provider":null,
"is_admin":false, "is_admin":false,
"can_create_group":false, "can_create_group":false,
"can_create_project":false, "can_create_project":false
"private_token":"Wvjy2Krpb7y8xi93owUz", }
"access_token":"Wvjy2Krpb7y8xi93owUz"
}