Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
5ee9a52554
|
@ -29,8 +29,9 @@ use Cadoles\CoreBundle\Form\UserType;
|
|||
|
||||
class RestController extends Controller
|
||||
{
|
||||
public function loginAction($key,Request $request)
|
||||
public function loginAction(Request $request)
|
||||
{
|
||||
$key=$request->get('key');
|
||||
$output=[];
|
||||
|
||||
// Vérification de la clé
|
||||
|
@ -43,8 +44,10 @@ class RestController extends Controller
|
|||
return new Response(json_encode($output), 200);
|
||||
}
|
||||
|
||||
public function userAction($key, $login, Request $request)
|
||||
public function userAction($login, Request $request)
|
||||
{
|
||||
$key=$request->get('key');
|
||||
|
||||
// Vérification de la clé
|
||||
$realkey = $this->getParameter("apikeyninegate");
|
||||
if($key!=$realkey) {
|
||||
|
@ -143,8 +146,10 @@ class RestController extends Controller
|
|||
}
|
||||
|
||||
|
||||
public function usersAction($key, Request $request)
|
||||
public function usersAction(Request $request)
|
||||
{
|
||||
$key=$request->get('key');
|
||||
|
||||
// Vérification de la clé
|
||||
$realkey = $this->getParameter("apikeyninegate");
|
||||
if($key!=$realkey) {
|
||||
|
@ -174,8 +179,10 @@ class RestController extends Controller
|
|||
return new Response(json_encode($output), 200);
|
||||
}
|
||||
|
||||
public function groupsAction($key, Request $request)
|
||||
public function groupsAction(Request $request)
|
||||
{
|
||||
$key=$request->get('key');
|
||||
|
||||
// Vérification de la clé
|
||||
$realkey = $this->getParameter("apikeyninegate");
|
||||
if($key!=$realkey) {
|
||||
|
|
|
@ -493,17 +493,17 @@ cadoles_core_config_statistic:
|
|||
|
||||
#== REST ==================================================================================================================
|
||||
cadoles_core_rest_login:
|
||||
path: /rest/login/{key}
|
||||
path: /rest/login
|
||||
defaults: { _controller: CadolesCoreBundle:Rest:login }
|
||||
|
||||
cadoles_core_rest_user:
|
||||
path: /rest/user/{key}/{login}
|
||||
path: /rest/user/{login}
|
||||
defaults: { _controller: CadolesCoreBundle:Rest:user }
|
||||
|
||||
cadoles_core_rest_users:
|
||||
path: /rest/users/{key}
|
||||
path: /rest/users
|
||||
defaults: { _controller: CadolesCoreBundle:Rest:users }
|
||||
|
||||
cadoles_core_rest_groups:
|
||||
path: /rest/groups/{key}
|
||||
path: /rest/groups
|
||||
defaults: { _controller: CadolesCoreBundle:Rest:groups }
|
Loading…
Reference in New Issue