Merge remote-tracking branch 'origin/FD3-99'

Controller/OAuthController.php

@@ -11,7 +11,7 @@ class OAuthController extends Controller
 
     /**
      * @Route("/api/user/me", name="user_data_json")
-     * 
+     *
      * @return JsonResponse
      */
     public function getUserDataJsonAction()
@@ -24,6 +24,22 @@ 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();
+            foreach ($tenancies as $tenancy) {
+                $id = $tenancy->getId();
+                $name = $tenancy->getName();
+                $t[] = compact('id', 'name');
+            }
+            $data['tenancies'] = $t;
+            $tenancyCurrent = $this->getUser()->getTenancyCurrent();
+            $data['tenancyCurrent'] = array();
+            if (!is_null($tenancyCurrent)) {
+                $data['tenancyCurrent']['id'] = $tenancyCurrent->getId();
+                $data['tenancyCurrent']['name'] = $tenancyCurrent->getName();
+            }
         }
 
         return new JsonResponse($data);