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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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