|
@@ -11,7 +11,7 @@ class OAuthController extends Controller
|
|
|
|
|
|
/**
|
|
|
* @Route("/api/user/me", name="user_data_json")
|
|
|
- *
|
|
|
+ *
|
|
|
* @return JsonResponse
|
|
|
*/
|
|
|
public function getUserDataJsonAction()
|
|
@@ -24,7 +24,7 @@ class OAuthController extends Controller
|
|
|
$data['firstname'] = $user->getFirstname();
|
|
|
$data['lastname'] = $user->getLastname();
|
|
|
$data['roles'] = $user->getRoles();
|
|
|
-
|
|
|
+
|
|
|
// Tenancies del usuario
|
|
|
$tenancies = $this->get('base_tenancy.tenancy_service')->getTenancies();
|
|
|
$t = array();
|
|
@@ -34,7 +34,7 @@ class OAuthController extends Controller
|
|
|
$t[] = compact('id', 'name');
|
|
|
}
|
|
|
$data['tenancies'] = $t;
|
|
|
- $tenancyCurrent = $user->getTenancyEntityCurrent();
|
|
|
+ $tenancyCurrent = $this->getUser()->getTenancyCurrent();
|
|
|
$data['tenancyCurrent'] = array();
|
|
|
if (!is_null($tenancyCurrent)) {
|
|
|
$data['tenancyCurrent']['id'] = $tenancyCurrent->getId();
|