Fix on get all members (public)
removed 404 response ( admin check) Change-Id: I55d7db2f8965fad358c9fa94a3cf5889b3a4cc54 Signed-off-by: smarcet <smarcet@gmail.com>
This commit is contained in:
parent
b1fce3cdb9
commit
2bbd5365a6
@ -63,9 +63,6 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
|
||||
*/
|
||||
public function getAll(){
|
||||
|
||||
$current_member = $this->resource_server_context->getCurrentUser();
|
||||
if (is_null($current_member)) return $this->error404();
|
||||
|
||||
$values = Input::all();
|
||||
|
||||
$rules = [
|
||||
@ -148,7 +145,11 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
|
||||
$fields = !empty($fields) ? explode(',', $fields) : [];
|
||||
$relations = Request::input('relations', '');
|
||||
$relations = !empty($relations) ? explode(',', $relations) : [];
|
||||
|
||||
$current_member = $this->resource_server_context->getCurrentUser();
|
||||
$serializer_type = SerializerRegistry::SerializerType_Public;
|
||||
if(!is_null($current_member) && $current_member->isAdmin()){
|
||||
$serializer_type = SerializerRegistry::SerializerType_Admin;
|
||||
}
|
||||
return $this->ok
|
||||
(
|
||||
$data->toArray
|
||||
@ -157,7 +158,7 @@ final class OAuth2MembersApiController extends OAuth2ProtectedController
|
||||
$fields,
|
||||
$relations,
|
||||
[],
|
||||
$current_member->isAdmin() ? SerializerRegistry::SerializerType_Admin : SerializerRegistry::SerializerType_Public
|
||||
$serializer_type
|
||||
)
|
||||
);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user