From 5e98aa9c53642e9cbfd307b6abc74f709f2734a5 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Tue, 14 Jul 2015 11:27:13 +0200
Subject: [PATCH 01/24] crud for clients

---
 Controller/Administration/OauthController.php | 141 ++++++++++++++++++
 Form/Administration/OauthClientType.php       |  62 ++++++++
 Manager/OauthManager.php                      |  27 ++++
 Menu/ExternalAuthenticationRenderer.php       |   9 +-
 Resources/config/routing.yml                  |   5 +
 Resources/public/js/administration/oauth.js   |  42 ++++++
 .../Oauth/clientModalForm.html.twig           |  10 ++
 .../views/Administration/Oauth/list.html.twig |  85 +++++++++++
 .../Oauth/modalCreateForm.html.twig           |  22 +++
 .../Parameters/oauthIndex.html.twig           |   7 +-
 10 files changed, 407 insertions(+), 3 deletions(-)
 create mode 100644 Controller/Administration/OauthController.php
 create mode 100644 Form/Administration/OauthClientType.php
 create mode 100644 Manager/OauthManager.php
 create mode 100644 Resources/public/js/administration/oauth.js
 create mode 100644 Resources/views/Administration/Oauth/clientModalForm.html.twig
 create mode 100644 Resources/views/Administration/Oauth/list.html.twig
 create mode 100644 Resources/views/Administration/Oauth/modalCreateForm.html.twig

diff --git a/Controller/Administration/OauthController.php b/Controller/Administration/OauthController.php
new file mode 100644
index 000000000..8f58ea5cc
--- /dev/null
+++ b/Controller/Administration/OauthController.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Controller\Administration;
+
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration as EXT;
+use JMS\DiExtraBundle\Annotation as DI;
+use JMS\SecurityExtraBundle\Annotation as SEC;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Claroline\CoreBundle\Manager\OauthManager;
+use Claroline\CoreBundle\Entity\Oauth\Client;
+use Claroline\CoreBundle\Form\Administration\OauthClientType;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+/**
+ * @DI\Tag("security.secure_service")
+ * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+ */
+class OauthController extends Controller
+{
+    private $oauthManager;
+    private $request;
+
+    /**
+     * @DI\InjectParams({
+     *     "oauthManager" = @DI\Inject("claroline.manager.oauth_manager"),
+     *     "request"      = @DI\Inject("request")
+     * })
+     */
+    public function __construct(
+        OauthManager $oauthManager,
+        $request
+    ) {
+        $this->oauthManager = $oauthManager;
+        $this->request = $request;
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/",
+     *     name="claro_admin_oauth_claroline",
+     *     options = {"expose"=true}
+     * )
+     * @EXT\Template()
+     *
+     * Display the plugin list
+     *
+     * @return Response
+     */
+    public function listAction()
+    {
+        $clients = $this->oauthManager->findAllClients();
+
+        return array('clients' => $clients);
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/form",
+     *     name="claro_admin_oauth_form",
+     *     options = {"expose"=true}
+     * )
+     * @EXT\Template()
+     *
+     * Display the plugin list
+     *
+     * @return Response
+     */
+    public function modalCreateFormAction()
+    {
+        $form = $this->get('form.factory')->create(new OauthClientType());
+
+        return array('form' => $form->createView());
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/form/create",
+     *     name="claro_admin_oauth_client_create",
+     *     options = {"expose"=true}
+     * )
+     * @EXT\Template("ClarolineCoreBundle:Administration:oauth\clientModalForm.html.twig")
+     *
+     * Display the plugin list
+     *
+     * @return Response
+     */
+    public function createClientAction()
+    {
+        $form = $this->get('form.factory')->create(new OauthClientType());
+
+        $form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $grantTypes = $form->get('allowed_grant_types')->getData();
+            $client = $this->oauthManager->createClient();
+            $client->setRedirectUris(array($form->get('uri')->getData()));
+            $client->setAllowedGrantTypes($grantTypes);
+            $client->setName($form->get('name')->getData());
+            $this->oauthManager->updateClient($client);
+
+            return new JsonResponse(array(
+                'id' => $client->getId(),
+                'name' => $form->get('name')->getData(),
+                'uri' => $form->get('uri')->getData(),
+                'grant_type' => $grantTypes
+            ));
+        }
+
+        return array('form' => $form->createView());
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/delete/client/{client}",
+     *     name="oauth_client_remove",
+     *     options = {"expose"=true}
+     * )
+     *
+     * Display the plugin list
+     *
+     * @return Response
+     */
+    public function deleteClientAction(Client $client)
+    {
+        $oldid = $client->getId();
+        $this->oauthManager->deleteClient($client);
+
+        return new JsonResponse(array('id' => $oldid));
+
+    }
+}
diff --git a/Form/Administration/OauthClientType.php b/Form/Administration/OauthClientType.php
new file mode 100644
index 000000000..f2dc3ec71
--- /dev/null
+++ b/Form/Administration/OauthClientType.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Form\Administration;
+
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class OauthClientType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'name',
+            'text',
+            array('constraints' => new NotBlank(), 'label' => 'name')
+        );
+        $builder->add(
+            'allowed_grant_types',
+            'choice',
+            array(
+                'choices' => array(
+                    'authorization_code' => '_authorization_code',
+                    'password' => '_password',
+                    'refresh_token' => '_refresh_token',
+                    'token' => '_token',
+                    'client_credentials' => '_client_credentials'
+                ),
+                'disabled' => isset($this->lockedParams['mailer_transport']),
+                'label' => 'grant_type',
+                'multiple' => true,
+                'constraints' => new NotBlank(),
+                'expanded' => true
+            )
+        );
+        $builder->add(
+            'uri',
+            'text',
+            array('label' => 'uri', 'constraints' => new NotBlank())
+        );
+    }
+
+    public function getName()
+    {
+        return 'oauth_client_form';
+    }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array('translation_domain' => 'platform'));
+    }
+}
diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
new file mode 100644
index 000000000..d30ebf9c6
--- /dev/null
+++ b/Manager/OauthManager.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Manager;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use Claroline\CoreBundle\Event\StrictDispatcher;
+use FOS\OAuthServerBundle\Entity\ClientManager;
+
+/**
+ * @DI\Service("claroline.manager.oauth_manager", parent="fos_oauth_server.client_manager.default")
+ */
+class OauthManager extends ClientManager
+{
+    public function findAllClients()
+    {
+        return $this->repository->findAll();
+    }
+}
diff --git a/Menu/ExternalAuthenticationRenderer.php b/Menu/ExternalAuthenticationRenderer.php
index cdb0222df..5088c1ff0 100644
--- a/Menu/ExternalAuthenticationRenderer.php
+++ b/Menu/ExternalAuthenticationRenderer.php
@@ -37,14 +37,19 @@ public function __construct(
     )
     {
         parent::__construct($matcher, $defaultOptions, $charset);
-    }/*
+    }
 
     protected function renderLinkElement(ItemInterface $item, array $options)
     {
+        return sprintf(
+            '<a href="%s" class="list-group-item">%s</a>',
+            $this->escape($item->getUri()),
+            $this->renderLabel($item, $options)
+        );
     }
 
     protected function renderSpanElement(ItemInterface $item, array $options)
     {
         return $this->renderLinkElement($item, $options);
-    }*/
+    }
 }
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 2f45494e1..8a65da881 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -266,6 +266,11 @@ claro_admin_facet:
     prefix: admin/facet
     type: annotation
 
+claro_admin_oauth:
+    resource: "@ClarolineCoreBundle/Controller/Administration/OauthController.php"
+    prefix: admin/oauth
+    type: annotation
+
 claro_admin_i18n:
     resource: "@ClarolineCoreBundle/Controller/Administration/InternationalizationController.php"
     prefix: admin/i18n
diff --git a/Resources/public/js/administration/oauth.js b/Resources/public/js/administration/oauth.js
new file mode 100644
index 000000000..4e263ed4e
--- /dev/null
+++ b/Resources/public/js/administration/oauth.js
@@ -0,0 +1,42 @@
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+(function () {
+    'use strict';
+
+    var modal = window.Claroline.Modal;
+
+    var addClient = function() {
+        window.location.reload();
+    }
+
+    var removeClientRow = function (event, clientId) {
+        $('#client-row-' + clientId).remove();
+    };
+
+    $('body')
+        .on('click', '#add-client-btn', function(event) {
+            var url = Routing.generate('claro_admin_oauth_form');
+            modal.displayForm(url, addClient, function(){}, 'form_client_creation');
+        })
+        .on('click', '.delete-client-btn', function(event) {
+            var clientid = $(event.target).attr('data-client-id');
+
+            modal.confirmRequest(
+                Routing.generate(
+                    'oauth_client_remove',
+                    {'client': clientid}
+                ),
+                removeClientRow,
+                clientid,
+                Translator.trans('delete_client_message', {}, 'platform'),
+                Translator.trans('delete_client', {}, 'platform')
+            );
+        });
+}) ();
diff --git a/Resources/views/Administration/Oauth/clientModalForm.html.twig b/Resources/views/Administration/Oauth/clientModalForm.html.twig
new file mode 100644
index 000000000..712ea4adc
--- /dev/null
+++ b/Resources/views/Administration/Oauth/clientModalForm.html.twig
@@ -0,0 +1,10 @@
+<div id="oauth-modal" class="modal-dialog">
+    <div class="modal-content">
+        <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h4>{% block header %}{% endblock %}</h4>
+        </div>
+        {% block explanation %} {% endblock %}
+        {% block form %}{% endblock %}
+    </div>
+</div>
diff --git a/Resources/views/Administration/Oauth/list.html.twig b/Resources/views/Administration/Oauth/list.html.twig
new file mode 100644
index 000000000..9427e742d
--- /dev/null
+++ b/Resources/views/Administration/Oauth/list.html.twig
@@ -0,0 +1,85 @@
+{% extends "ClarolineCoreBundle:Administration:layout.html.twig" %}
+
+{% block title %}{{ parent() ~ ' - ' ~ 'server' | trans({}, 'platform') | striptags | raw }}{% endblock %}
+
+{% block breadcrumb %}
+    {{
+        macros.breadcrumbs([
+            {
+                'icon': 'fa fa-cog',
+                'name': 'administration'|trans({}, 'platform'),
+                'href': path('claro_admin_index')
+            },
+            {
+                'name': 'parameters'|trans({}, 'platform'),
+                'href': path('claro_admin_index')
+            },
+            {
+                'name': 'oauth'|trans({}, 'platform'),
+                'href': path('claro_admin_parameters_oauth_index')
+            },
+            {
+                'name': 'claroline'|trans({}, 'platform'),
+                'href': ''
+            }
+        ])
+    }}
+{% endblock %}
+
+{% block section_content %}
+    <div class="panel-heading">
+        <h3 class="panel-title">{{ 'claroline'|trans({}, 'platform') }}</h3>
+    </div>
+
+    <div class="panel-body">
+        <div class="table-responsive">
+            <table class="table table-striped table-bordered table-condensed">
+                <thead>
+                    <tr>
+                        <th> {{ 'redirect_uri'|trans({}, 'platform') }} </th>
+                        <th> {{ 'grant_type'|trans({}, 'platform') }} </th>
+                        <th> {{ 'client_name'|trans({}, 'platform')}} </th>
+                        <th> </th>
+                    </tr>
+                </thead>
+                <tbody id="user-table-body">
+                    {% for client in clients %}
+                        <tr id="client-row-{{ client.getId() }}" data-client-id="{{ client.getId() }}">
+                            <th>
+                                {% for uris in client.getRedirectUris() %}
+                                    {{ uris }}
+                                {% endfor %}
+                            </th>
+                            <th>
+                                {% for grantType in client.getAllowedGrantTypes() %}
+                                    {{ grantType }}
+                                {% endfor %}
+                            </th>
+                            <th> {{ client.getName() }} </th>
+                            <th>
+                                <div class="btn-group">
+                                    <button class="btn btn-danger delete-client-btn"
+                                            data-client-id="{{ client.getId() }}"
+                                    >
+                                        <i class="fa fa-trash"></i>
+                                    </button>
+                                </div>
+                            </th>
+                        </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+        <button id="add-client-btn"
+                type="submit"
+                class="btn btn-primary">
+            {{ 'add'|trans({}, 'platform') }}
+        </button>
+    </div>
+{% endblock %}
+
+{% block javascripts %}
+    {{ parent() }}
+
+    <script type="text/javascript" src="{{ asset('bundles/clarolinecore/js/administration/oauth.js') }}"></script>
+{% endblock %}
diff --git a/Resources/views/Administration/Oauth/modalCreateForm.html.twig b/Resources/views/Administration/Oauth/modalCreateForm.html.twig
new file mode 100644
index 000000000..513fd6ed2
--- /dev/null
+++ b/Resources/views/Administration/Oauth/modalCreateForm.html.twig
@@ -0,0 +1,22 @@
+{% extends "ClarolineCoreBundle:Administration\\Oauth:clientModalForm.html.twig" %}
+
+{% block header %}
+    {{ 'create_client'|trans({}, 'platform') }}
+{% endblock %}
+
+{% block form %}
+    <form role="form"
+        class="form-horizontal"
+        action="{{ path('claro_admin_oauth_client_create') }}"
+        method="post" {{ form_enctype(form) }}
+        id="form_client_creation"
+    >
+        <div class="modal-body">
+            {{ form_widget(form) }}
+        </div>
+        <div class="modal-footer">
+            <button type="submit" id="submit-panel-creation-form" class="btn btn-primary" aria-hidden="true">{{ 'create'|trans({}, 'platform') }}</button>
+            <div class="btn btn-default" data-dismiss="modal" aria-hidden="true">{{ 'cancel'|trans({}, 'platform') }}</div>
+        </div>
+    </form>
+{% endblock %}
diff --git a/Resources/views/Administration/Parameters/oauthIndex.html.twig b/Resources/views/Administration/Parameters/oauthIndex.html.twig
index 3bd8e3ecc..6592151bf 100644
--- a/Resources/views/Administration/Parameters/oauthIndex.html.twig
+++ b/Resources/views/Administration/Parameters/oauthIndex.html.twig
@@ -27,6 +27,11 @@
         <h3 class="panel-title">{{ 'oauth'|trans({}, 'platform') }}</h3>
     </div>
     <div class="panel-body">
-        {{ knp_menu_render('ClarolineCoreBundle:Builder:externalAuthenticationMenu', {}, 'external_authentication') }}
+        <div class="list-group">
+            <a href="{{ path('claro_admin_oauth_claroline') }}" class="list-group-item">Claroline</a>
+        </div>
+        <div class="list-group">
+            {{ knp_menu_render('ClarolineCoreBundle:Builder:externalAuthenticationMenu', {}, 'external_authentication') }}
+        </div>
     </div>
 {% endblock %}

From 5984d2d6a728d5219c73e68f26be669c5f31c173 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Tue, 14 Jul 2015 18:51:21 +0200
Subject: [PATCH 02/24] Serialisze + foxrest bundle.

---
 Controller/API/ApiController.php              |  47 ++++++
 Controller/API/UserController.php             | 150 +++++++++++++++---
 Controller/Administration/UsersController.php |  20 +--
 Entity/Role.php                               |   4 +
 Entity/User.php                               |  24 ++-
 Manager/RoleManager.php                       |  19 +++
 Manager/UserManager.php                       |   7 +
 Resources/config/routing.yml                  |   8 +-
 Resources/config/suggested/fos_rest.yml       |   9 +-
 Resources/config/suggested/security.yml       |   8 +-
 .../views/Administration/Oauth/list.html.twig |   2 +
 11 files changed, 246 insertions(+), 52 deletions(-)
 create mode 100644 Controller/API/ApiController.php

diff --git a/Controller/API/ApiController.php b/Controller/API/ApiController.php
new file mode 100644
index 000000000..1464c4d84
--- /dev/null
+++ b/Controller/API/ApiController.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Controller\API;
+
+use FOS\RestBundle\Util\Codes;
+use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\HttpFoundation\JsonResponse;
+
+class ApiController extends Controller
+{
+    /**
+     * @Route("/connected_user")
+     */
+    public function connectedUserAction()
+    {
+        /** @var \Symfony\Component\Security\Core\SecurityContext $securityContext */
+        $tokenStorage    = $this->container->get('security.token_storage');
+        $securityToken   = $tokenStorage->getToken();
+
+        if (null !== $securityToken) {
+            /** @var \Claroline\CoreBundle\Entity\User $user */
+            $user = $securityToken->getUser();
+
+            if($user) {
+                return new JsonResponse(array(
+                        'id'       => $user->getId(),
+                        'username' => $user->getUsername(),
+                        'user_id'  => $user->getUsername() . $user->getId()
+                    ));
+            }
+        }
+
+        return new JsonResponse(array(
+            'message' => 'User is not identified'
+        ), Codes::HTTP_NOT_FOUND);
+    }
+}
diff --git a/Controller/API/UserController.php b/Controller/API/UserController.php
index ba8fbf07c..76ab8d357 100644
--- a/Controller/API/UserController.php
+++ b/Controller/API/UserController.php
@@ -11,40 +11,138 @@
 
 namespace Claroline\CoreBundle\Controller\API;
 
-use FOS\RestBundle\Util\Codes;
+use FOS\RestBundle\Routing\ClassResourceInterface;
+use FOS\RestBundle\Controller\FOSRestController;
+use FOS\RestBundle\Controller\Annotations\View;
+use Claroline\CoreBundle\Entity\Role;
+use Claroline\CoreBundle\Entity\Tool\Tool;
+use Claroline\CoreBundle\Entity\User;
+use Claroline\CoreBundle\Form\ProfileCreationType;
+use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
+use Claroline\CoreBundle\Manager\AuthenticationManager;
+use Claroline\CoreBundle\Manager\LocaleManager;
+use Claroline\CoreBundle\Manager\MailManager;
+use Claroline\CoreBundle\Manager\RightsManager;
+use Claroline\CoreBundle\Manager\RoleManager;
+use Claroline\CoreBundle\Manager\ToolManager;
+use Claroline\CoreBundle\Manager\ToolMaskDecoderManager;
+use Claroline\CoreBundle\Manager\UserManager;
+use Claroline\CoreBundle\Manager\WorkspaceManager;
+use JMS\DiExtraBundle\Annotation as DI;
+use JMS\SecurityExtraBundle\Annotation as SEC;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration as EXT;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\StreamedResponse;
+use Symfony\Component\Security\Core\Exception\AccessDeniedException;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Claroline\CoreBundle\Persistence\ObjectManager;
 
-/**
- * @Route("/api")
- */
-class UserController extends Controller
+class UserController extends FOSRestController
 {
     /**
-     * @Route("/connected_user")
+     * @DI\InjectParams({
+     *     "authenticationManager"  = @DI\Inject("claroline.common.authentication_manager"),
+     *     "configHandler"          = @DI\Inject("claroline.config.platform_config_handler"),
+     *     "formFactory"            = @DI\Inject("form.factory"),
+     *     "localeManager"          = @DI\Inject("claroline.common.locale_manager"),
+     *     "mailManager"            = @DI\Inject("claroline.manager.mail_manager"),
+     *     "request"                = @DI\Inject("request"),
+     *     "rightsManager"          = @DI\Inject("claroline.manager.rights_manager"),
+     *     "roleManager"            = @DI\Inject("claroline.manager.role_manager"),
+     *     "toolManager"            = @DI\Inject("claroline.manager.tool_manager"),
+     *     "toolMaskDecoderManager" = @DI\Inject("claroline.manager.tool_mask_decoder_manager"),
+     *     "userManager"            = @DI\Inject("claroline.manager.user_manager"),
+     *     "workspaceManager"       = @DI\Inject("claroline.manager.workspace_manager"),
+     *     "om"                     = @DI\Inject("claroline.persistence.object_manager")
+     * })
+     */
+    public function __construct(
+        AuthenticationManager $authenticationManager,
+        FormFactory $formFactory,
+        LocaleManager $localeManager,
+        MailManager $mailManager,
+        PlatformConfigurationHandler $configHandler,
+        Request $request,
+        RightsManager $rightsManager,
+        RoleManager $roleManager,
+        ToolManager $toolManager,
+        ToolMaskDecoderManager $toolMaskDecoderManager,
+        UserManager $userManager,
+        WorkspaceManager $workspaceManager,
+        ObjectManager $om
+    )
+    {
+        $this->authenticationManager = $authenticationManager;
+        $this->configHandler = $configHandler;
+        $this->formFactory = $formFactory;
+        $this->localeManager = $localeManager;
+        $this->mailManager = $mailManager;
+        $this->request = $request;
+        $this->rightsManager = $rightsManager;
+        $this->roleManager = $roleManager;
+        $this->toolManager = $toolManager;
+        $this->toolMaskDecoderManager = $toolMaskDecoderManager;
+        $this->userAdminTool = $this->toolManager->getAdminToolByName('user_management');
+        $this->userManager = $userManager;
+        $this->workspaceManager = $workspaceManager;
+        $this->om = $om;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
      */
-    public function connectedUserAction()
+    public function getUsersAction()
     {
-        /** @var \Symfony\Component\Security\Core\SecurityContext $securityContext */
-        $tokenStorage    = $this->container->get('security.token_storage');
-        $securityToken   = $tokenStorage->getToken();
-
-        if (null !== $securityToken) {
-            /** @var \Claroline\CoreBundle\Entity\User $user */
-            $user = $securityToken->getUser();
-
-            if($user) {
-                return new JsonResponse(array(
-                        'id'       => $user->getId(),
-                        'username' => $user->getUsername(),
-                        'user_id'  => $user->getUsername() . $user->getId()
-                    ));
-            }
+        return $this->userManager->getAll();
+    }
+
+    public function putUserAction()
+    {
+        $roleUser = $this->roleManager->getRoleByName('ROLE_USER');
+
+        $profileType = new ProfileCreationType(
+            $this->localeManager,
+            array($roleUser),
+            true,
+            $this->authenticationManager->getDrivers()
+        );
+
+        $form = $this->formFactory->create($profileType);
+        $form->handleRequest($this->request);
+        $roles = $form->get('platformRoles')->getData();
+        $unavailableRoles = $this->roleManager->validateNewUserRolesInsert($roles);
+
+        if ($form->isValid() && count($unavailableRoles) === 0) {
+            $user = $form->getData();
+            $this->userManager->createUser($user, true, $roles);
+
+            return $this->redirect($this->generateUrl('claro_admin_user_list'));
         }
 
-        return new JsonResponse(array(
-            'message' => 'User is not identified'
-        ), Codes::HTTP_NOT_FOUND);
+        return array(
+            'form_complete_user' => $form->createView(),
+            'error' => $error,
+            'unavailableRoles' => $unavailableRoles,
+        );
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getUserAction($slug)
+    {
+        $user = $this->userManager->getUserByUsername($slug);
+
+        return $user;
+    }
+
+    public function deleteUserAction($slug)
+    {
+
     }
 }
diff --git a/Controller/Administration/UsersController.php b/Controller/Administration/UsersController.php
index 628464065..d8b733115 100644
--- a/Controller/Administration/UsersController.php
+++ b/Controller/Administration/UsersController.php
@@ -214,24 +214,8 @@ public function createAction(User $currentUser)
         );
         $form = $this->formFactory->create($profileType);
         $form->handleRequest($this->request);
-
-        $unavailableRoles = [];
-
-        foreach ($form->get('platformRoles')->getData() as $role) {
-            $isAvailable = $this->roleManager->validateRoleInsert(new User(), $role);
-
-            if (!$isAvailable) {
-                $unavailableRoles[] = $role;
-            }
-        }
-
-        $isAvailable = $this->roleManager->validateRoleInsert(new User(), $roleUser);
-
-        if (!$isAvailable) {
-            $unavailableRoles[] = $roleUser;
-        }
-
-        $unavailableRoles = array_unique($unavailableRoles);
+        $roles = $form->get('platformRoles')->getData();
+        $unavailableRoles = $this->roleManager->validateNewUserRolesInsert($roles);
 
         if ($form->isValid() && count($unavailableRoles) === 0) {
             $user = $form->getData();
diff --git a/Entity/Role.php b/Entity/Role.php
index cb39eac31..6fb37f1b0 100644
--- a/Entity/Role.php
+++ b/Entity/Role.php
@@ -22,6 +22,7 @@
 use Claroline\CoreBundle\Entity\Tool\ToolRights;
 use Claroline\CoreBundle\Entity\Workspace\Workspace;
 use Claroline\CoreBundle\Entity\Tool\PwsToolConfig;
+use JMS\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\RoleRepository")
@@ -40,12 +41,14 @@ class Role implements RoleInterface
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"api"})
      */
     protected $id;
 
     /**
      * @ORM\Column(unique=true)
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $name;
 
@@ -110,6 +113,7 @@ class Role implements RoleInterface
 
     /**
      * @ORM\Column(type="integer")
+     * @Groups({"api"})
      */
     protected $type = self::PLATFORM_ROLE;
 
diff --git a/Entity/User.php b/Entity/User.php
index 4eb52b29c..706a517c7 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -30,6 +30,7 @@
 use Symfony\Component\Validator\Mapping\ClassMetadata;
 use Claroline\CoreBundle\Entity\Facet\FieldFacetValue;
 use Claroline\CoreBundle\Entity\UserOptions;
+use JMS\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Table(name="claro_user")
@@ -47,6 +48,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"api"})
      */
     protected $id;
 
@@ -55,6 +57,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="first_name", length=50)
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $firstName;
 
@@ -63,6 +66,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="last_name", length=50)
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $lastName;
 
@@ -73,6 +77,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @Assert\NotBlank()
      * @Assert\Length(min="3")
      * @ClaroAssert\Username()
+     * @Groups({"api"})
      */
     protected $username;
 
@@ -87,6 +92,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var string
      *
      * @ORM\Column(nullable=true)
+     * @Groups({"api"})
      */
     protected $locale;
 
@@ -109,6 +115,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var string
      *
      * @ORM\Column(nullable=true)
+     * @Groups({"api"})
      */
     protected $phone;
 
@@ -118,6 +125,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @ORM\Column(unique=true)
      * @Assert\NotBlank()
      * @Assert\Email(checkMX = false)
+     * @Groups({"api"})
      */
     protected $mail;
 
@@ -125,6 +133,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var string
      *
      * @ORM\Column(name="administrative_code", nullable=true)
+     * @Groups({"api"})
      */
     protected $administrativeCode;
 
@@ -149,6 +158,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *     cascade={"merge"}
      * )
      * @ORM\JoinTable(name="claro_user_role")
+     * @Groups({"api"})
      */
     protected $roles;
 
@@ -177,6 +187,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="creation_date", type="datetime")
      * @Gedmo\Timestampable(on="create")
+     * @Groups({"api"})
      */
     protected $created;
 
@@ -184,6 +195,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var \DateTime
      *
      * @ORM\Column(name="initialization_date", type="datetime", nullable=true)
+     * @Groups({"api"})
      */
     protected $initDate;
 
@@ -226,6 +238,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var boolean
      *
      * @ORM\Column(type="boolean", nullable=true)
+     * @Groups({"api"})
      */
     protected $hasAcceptedTerms;
 
@@ -233,6 +246,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var boolean
      *
      * @ORM\Column(name="is_enabled", type="boolean")
+     * @Groups({"api"})
      */
     protected $isEnabled = true;
 
@@ -240,11 +254,13 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var boolean
      *
      * @ORM\Column(name="is_mail_notified", type="boolean")
+     * @Groups({"api"})
      */
     protected $isMailNotified = true;
 
     /**
      * @ORM\Column(name="last_uri", length=255, nullable=true)
+     * @Groups({"api"})
      */
     protected $lastUri;
 
@@ -252,6 +268,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var string
      *
      * @ORM\Column(name="public_url", type="string", nullable=true, unique=true)
+     * @Groups({"api"})
      */
     protected $publicUrl;
 
@@ -259,6 +276,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var boolean
      *
      * @ORM\Column(name="has_tuned_public_url", type="boolean")
+     * @Groups({"api"})
      */
     protected $hasTunedPublicUrl = false;
 
@@ -266,6 +284,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var \DateTime
      *
      * @ORM\Column(name="expiration_date", type="datetime", nullable=true)
+     * @Groups({"api"})
      */
     protected $expirationDate;
 
@@ -294,6 +313,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @var string
      *
      * @ORM\Column(nullable=true)
+     * @Groups({"api"})
      */
     protected $authentication;
 
@@ -381,7 +401,7 @@ public function getSalt()
     {
         return $this->salt;
     }
-    
+
     /**
      * @param string $salt
      *
@@ -390,7 +410,7 @@ public function getSalt()
     public function setSalt($salt)
     {
         $this->salt = $salt;
-        
+
         return $this;
     }
 
diff --git a/Manager/RoleManager.php b/Manager/RoleManager.php
index 83388226c..a26f22e91 100644
--- a/Manager/RoleManager.php
+++ b/Manager/RoleManager.php
@@ -803,6 +803,25 @@ public function validateRoleInsert(AbstractRoleSubject $ars, Role $role)
         return false;
     }
 
+    public function validateNewUserRolesInsert(array $roles)
+    {
+        foreach ($roles as $role) {
+            $isAvailable = $this->validateRoleInsert(new User(), $role);
+
+            if (!$isAvailable) {
+                $unavailableRoles[] = $role;
+            }
+        }
+
+        $isAvailable = $this->validateRoleInsert(new User(), $roleUser);
+
+        if (!$isAvailable) {
+            $unavailableRoles[] = $roleUser;
+        }
+
+        return array_unique($unavailableRoles);
+    }
+
     /**
      * @param Role $role
      * @return bool
diff --git a/Manager/UserManager.php b/Manager/UserManager.php
index 64d9de163..b7d633ad5 100644
--- a/Manager/UserManager.php
+++ b/Manager/UserManager.php
@@ -524,6 +524,13 @@ public function getAllUsers($page, $max = 20, $orderedBy = 'id', $order = null)
         return $this->pagerFactory->createPager($query, $page, $max);
     }
 
+    /**
+     */
+    public function getAll()
+    {
+        return $this->userRepo->findAll();
+    }
+
     /**
      * @param integer $page
      * @param integer $max
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 8a65da881..c936631ee 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -277,9 +277,15 @@ claro_admin_i18n:
     type: annotation
 
 claro_api:
-    resource: "@ClarolineCoreBundle/Controller/API"
+    resource: "@ClarolineCoreBundle/Controller/API/ApiController.php"
+    prefix: api
     type: annotation
 
+claro_user_api:
+    resource: "@ClarolineCoreBundle/Controller/API/UserController.php"
+    type: rest
+    prefix: api
+
 claro_contact:
     resource: "@ClarolineCoreBundle/Controller/ContactController.php"
     prefix: contact
diff --git a/Resources/config/suggested/fos_rest.yml b/Resources/config/suggested/fos_rest.yml
index 19323d8d8..e21a35594 100644
--- a/Resources/config/suggested/fos_rest.yml
+++ b/Resources/config/suggested/fos_rest.yml
@@ -1 +1,8 @@
-fos_rest: ~
+fos_rest:
+    view:
+        view_response_listener: force
+    format_listener:
+        rules:
+            priorities: ['json']
+            fallback_format: json
+            prefer_extension: true
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index 4eb83e951..f62e82bec 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,10 +28,10 @@ security:
                 use_referer: true
             anonymous: true
 
-        api:
-            pattern:    ^/api
-            fos_oauth:  true
-            stateless:  true
+        #api:
+        #    pattern:    ^/api
+        #    fos_oauth:  true
+        #    stateless:  true
 
         main:
             pattern: ^/
diff --git a/Resources/views/Administration/Oauth/list.html.twig b/Resources/views/Administration/Oauth/list.html.twig
index 9427e742d..a2fb01e31 100644
--- a/Resources/views/Administration/Oauth/list.html.twig
+++ b/Resources/views/Administration/Oauth/list.html.twig
@@ -36,6 +36,7 @@
             <table class="table table-striped table-bordered table-condensed">
                 <thead>
                     <tr>
+                        <th> {{ 'id'|trans({}, 'platform') }} </th>
                         <th> {{ 'redirect_uri'|trans({}, 'platform') }} </th>
                         <th> {{ 'grant_type'|trans({}, 'platform') }} </th>
                         <th> {{ 'client_name'|trans({}, 'platform')}} </th>
@@ -45,6 +46,7 @@
                 <tbody id="user-table-body">
                     {% for client in clients %}
                         <tr id="client-row-{{ client.getId() }}" data-client-id="{{ client.getId() }}">
+                            <th> {{ client.getId() }} </th>
                             <th>
                                 {% for uris in client.getRedirectUris() %}
                                     {{ uris }}

From 2afef26e11e462a57c98e68192c1bcb634deefef Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Thu, 16 Jul 2015 16:35:40 +0200
Subject: [PATCH 03/24] Full api for workspace, users and groups.

---
 Controller/API/GroupController.php            | 146 ++++++++++++++
 Controller/API/UserController.php             | 179 ++++++++++++------
 Controller/API/WorkspaceController.php        | 152 +++++++++++++++
 .../Administration/GroupsController.php       |   1 -
 Entity/Group.php                              |   3 +
 Entity/Workspace/Workspace.php                |  20 ++
 Form/GroupType.php                            |  30 ++-
 Form/ProfileCreationType.php                  |  19 +-
 Form/ProfileType.php                          |  17 +-
 Form/WorkspaceType.php                        | 116 +++++++++---
 Manager/GroupManager.php                      |   1 +
 Resources/config/routing.yml                  |  10 +
 Resources/config/suggested/fos_rest.yml       |   7 +-
 Resources/config/suggested/monolog_prod.yml   |   2 +-
 Resources/config/suggested/security.yml       |   5 +-
 15 files changed, 604 insertions(+), 104 deletions(-)
 create mode 100644 Controller/API/GroupController.php
 create mode 100644 Controller/API/WorkspaceController.php

diff --git a/Controller/API/GroupController.php b/Controller/API/GroupController.php
new file mode 100644
index 000000000..bf120c450
--- /dev/null
+++ b/Controller/API/GroupController.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Controller\API;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use FOS\RestBundle\Controller\FOSRestController;
+use Claroline\CoreBundle\Persistence\ObjectManager;
+use Claroline\CoreBundle\Manager\GroupManager;
+use Claroline\CoreBundle\Manager\RoleManager;
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\HttpFoundation\Request;
+use FOS\RestBundle\Controller\Annotations\View;
+use Claroline\CoreBundle\Form\GroupType;
+use Claroline\CoreBundle\Entity\Group;
+use Claroline\CoreBundle\Entity\User;
+use Claroline\CoreBundle\Entity\Role;
+
+class GroupController extends FOSRestController
+{
+    /**
+     * @DI\InjectParams({
+     *     "formFactory"  = @DI\Inject("form.factory"),
+     *     "groupManager" = @DI\Inject("claroline.manager.group_manager"),
+     *     "roleManager"  = @DI\Inject("claroline.manager.role_manager"),
+     *     "request"      = @DI\Inject("request"),
+     *     "om"           = @DI\Inject("claroline.persistence.object_manager")
+     * })
+     */
+    public function __construct(
+        FormFactory   $formFactory,
+        GroupManager  $groupManager,
+        RoleManager   $roleManager,
+        ObjectManager $om,
+        Request       $request
+    )
+    {
+        $this->formFactory = $formFactory;
+        $this->groupManager = $groupManager;
+        $this->roleManager = $roleManager;
+        $this->om = $om;
+        $this->groupRepository = $this->om->getRepository('ClarolineCoreBundle:Group');
+        $this->request = $request;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getGroupsAction()
+    {
+        return $this->groupRepository->findAll();
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getGroupAction(Group $group)
+    {
+        return $group;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     * group_form[fieldname] for the put request
+     */
+    public function postGroupAction()
+    {
+        $groupType = new GroupType();
+        $groupType->enableApi();
+        $form = $this->formFactory->create($groupType, new Group());
+        $form->submit($this->request);
+        //$form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $group = $form->getData();
+            $userRole = $this->roleManager->getRoleByName('ROLE_USER');
+            $group->setPlatformRole($userRole);
+            $this->groupManager->insertGroup($group);
+
+            return $group;
+        }
+
+        return $form;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     * group_form[fieldname] for the put request
+     */
+    public function putGroupAction(Group $group)
+    {
+        $groupType = new GroupType();
+        $groupType->enableApi();
+        $form = $this->formFactory->create($groupType, $group);
+        $form->submit($this->request);
+        //$form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $group = $form->getData();
+            $userRole = $this->roleManager->getRoleByName('ROLE_USER');
+            $this->groupManager->insertGroup($group);
+
+            return $group;
+        }
+
+        return $form;
+    }
+
+    /**
+     * @View()
+     */
+    public function deleteGroupAction(Group $group)
+    {
+        $this->groupManager->deleteGroup($user);
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function addGroupRoleAction(Group $group, Role $role)
+    {
+        $this->roleManager->associateRole($group, $role, false);
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function removeGroupRoleAction(Group $group, Role $role)
+    {
+        $this->roleManager->dissociateRole($group, $role);
+
+        return array('success');
+    }
+}
diff --git a/Controller/API/UserController.php b/Controller/API/UserController.php
index 76ab8d357..a46577afc 100644
--- a/Controller/API/UserController.php
+++ b/Controller/API/UserController.php
@@ -11,35 +11,23 @@
 
 namespace Claroline\CoreBundle\Controller\API;
 
-use FOS\RestBundle\Routing\ClassResourceInterface;
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\View;
-use Claroline\CoreBundle\Entity\Role;
-use Claroline\CoreBundle\Entity\Tool\Tool;
 use Claroline\CoreBundle\Entity\User;
+use Claroline\CoreBundle\Entity\Role;
+use Claroline\CoreBundle\Entity\Group;
 use Claroline\CoreBundle\Form\ProfileCreationType;
-use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
-use Claroline\CoreBundle\Manager\AuthenticationManager;
+use Claroline\CoreBundle\Form\ProfileType;
 use Claroline\CoreBundle\Manager\LocaleManager;
-use Claroline\CoreBundle\Manager\MailManager;
-use Claroline\CoreBundle\Manager\RightsManager;
-use Claroline\CoreBundle\Manager\RoleManager;
-use Claroline\CoreBundle\Manager\ToolManager;
-use Claroline\CoreBundle\Manager\ToolMaskDecoderManager;
 use Claroline\CoreBundle\Manager\UserManager;
-use Claroline\CoreBundle\Manager\WorkspaceManager;
+use Claroline\CoreBundle\Manager\GroupManager;
+use Claroline\CoreBundle\Manager\RoleManager;
+use Claroline\CoreBundle\Manager\AuthenticationManager;
+use Claroline\CoreBundle\Manager\ProfilePropertyManager;
 use JMS\DiExtraBundle\Annotation as DI;
-use JMS\SecurityExtraBundle\Annotation as SEC;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration as EXT;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\Form\FormFactory;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\StreamedResponse;
-use Symfony\Component\Security\Core\Exception\AccessDeniedException;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Claroline\CoreBundle\Persistence\ObjectManager;
 
 class UserController extends FOSRestController
@@ -47,50 +35,40 @@ class UserController extends FOSRestController
     /**
      * @DI\InjectParams({
      *     "authenticationManager"  = @DI\Inject("claroline.common.authentication_manager"),
-     *     "configHandler"          = @DI\Inject("claroline.config.platform_config_handler"),
      *     "formFactory"            = @DI\Inject("form.factory"),
      *     "localeManager"          = @DI\Inject("claroline.common.locale_manager"),
-     *     "mailManager"            = @DI\Inject("claroline.manager.mail_manager"),
      *     "request"                = @DI\Inject("request"),
-     *     "rightsManager"          = @DI\Inject("claroline.manager.rights_manager"),
      *     "roleManager"            = @DI\Inject("claroline.manager.role_manager"),
-     *     "toolManager"            = @DI\Inject("claroline.manager.tool_manager"),
-     *     "toolMaskDecoderManager" = @DI\Inject("claroline.manager.tool_mask_decoder_manager"),
      *     "userManager"            = @DI\Inject("claroline.manager.user_manager"),
-     *     "workspaceManager"       = @DI\Inject("claroline.manager.workspace_manager"),
-     *     "om"                     = @DI\Inject("claroline.persistence.object_manager")
+     *     "groupManager"           = @DI\Inject("claroline.manager.group_manager"),
+     *     "om"                     = @DI\Inject("claroline.persistence.object_manager"),
+    *      "profilePropertyManager" = @DI\Inject("claroline.manager.profile_property_manager")
      * })
      */
     public function __construct(
         AuthenticationManager $authenticationManager,
         FormFactory $formFactory,
         LocaleManager $localeManager,
-        MailManager $mailManager,
-        PlatformConfigurationHandler $configHandler,
         Request $request,
-        RightsManager $rightsManager,
-        RoleManager $roleManager,
-        ToolManager $toolManager,
-        ToolMaskDecoderManager $toolMaskDecoderManager,
         UserManager $userManager,
-        WorkspaceManager $workspaceManager,
-        ObjectManager $om
+        GroupManager $groupManager,
+        RoleManager $roleManager,
+        ObjectManager $om,
+        ProfilePropertyManager $profilePropertyManager
     )
     {
         $this->authenticationManager = $authenticationManager;
-        $this->configHandler = $configHandler;
         $this->formFactory = $formFactory;
         $this->localeManager = $localeManager;
-        $this->mailManager = $mailManager;
         $this->request = $request;
-        $this->rightsManager = $rightsManager;
-        $this->roleManager = $roleManager;
-        $this->toolManager = $toolManager;
-        $this->toolMaskDecoderManager = $toolMaskDecoderManager;
-        $this->userAdminTool = $this->toolManager->getAdminToolByName('user_management');
         $this->userManager = $userManager;
-        $this->workspaceManager = $workspaceManager;
+        $this->groupManager = $groupManager;
+        $this->roleManager = $roleManager;
         $this->om = $om;
+        $this->userRepo = $om->getRepository('ClarolineCoreBundle:User');
+        $this->roleRepo = $om->getRepository('ClarolineCoreBundle:Role');
+        $this->groupRepo = $om->getRepository('ClarolineCoreBundle:Group');
+        $this->profilePropertyManager = $profilePropertyManager;
     }
 
     /**
@@ -101,7 +79,12 @@ public function getUsersAction()
         return $this->userManager->getAll();
     }
 
-    public function putUserAction()
+    /**
+     * @View(serializerGroups={"api"})
+     * profile_form_creation[fieldname] for the put request
+     * profile_form_creation[platformRoles][] // for the list of roles
+     */
+    public function postUserAction()
     {
         $roleUser = $this->roleManager->getRoleByName('ROLE_USER');
 
@@ -111,38 +94,122 @@ public function putUserAction()
             true,
             $this->authenticationManager->getDrivers()
         );
+        $profileType->enableApi();
 
         $form = $this->formFactory->create($profileType);
-        $form->handleRequest($this->request);
-        $roles = $form->get('platformRoles')->getData();
-        $unavailableRoles = $this->roleManager->validateNewUserRolesInsert($roles);
+        $form->submit($this->request);
+        //$form->handleRequest($this->request);
 
-        if ($form->isValid() && count($unavailableRoles) === 0) {
+        if ($form->isValid()) {
+            $roles = $form->get('platformRoles')->getData();
             $user = $form->getData();
             $this->userManager->createUser($user, true, $roles);
 
-            return $this->redirect($this->generateUrl('claro_admin_user_list'));
+            return $user;
         }
 
-        return array(
-            'form_complete_user' => $form->createView(),
-            'error' => $error,
-            'unavailableRoles' => $unavailableRoles,
-        );
+        return $form;
     }
 
     /**
      * @View(serializerGroups={"api"})
+     * profile_form[fieldname] for the put request
+     * profile_form[platformRoles][] // for the list of roles
      */
-    public function getUserAction($slug)
+    public function putUserAction(User $user)
     {
-        $user = $this->userManager->getUserByUsername($slug);
+        $roles = $this->roleManager->getPlatformRoles($user);
+        $accesses = $this->profilePropertyManager->getAccessessByRoles(array('ROLE_ADMIN'));
 
+        $formType = new ProfileType(
+            $this->localeManager,
+            $roles,
+            true,
+            true,
+            $accesses,
+            $this->authenticationManager->getDrivers()
+        );
+
+        $formType->enableApi();
+        $userRole = $this->roleManager->getUserRoleByUser($user);
+        $form = $this->formFactory->create($formType, $user);
+        $form->submit($this->request);
+        //$form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $user = $form->getData();
+            $this->roleManager->renameUserRole($userRole, $user->getUsername());
+            $this->userManager->rename($user, $user->getUsername());
+
+            if (isset($form['platformRoles'])) {
+                //verification:
+                //only the admin can grant the role admin
+                //simple users cannot change anything. Don't let them put whatever they want with a fake form.
+                $newRoles = $form['platformRoles']->getData();
+                $this->userManager->setPlatformRoles($user, $newRoles);
+            }
+
+            return $user;
+        }
+
+        return $form;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getUserAction(User $user)
+    {
         return $user;
     }
 
-    public function deleteUserAction($slug)
+    /**
+     * @View()
+     */
+    public function deleteUserAction(User $user)
+    {
+        $this->userManager->deleteUser($user);
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function addUserRoleAction(User $user, Role $role)
+    {
+        $this->roleManager->associateRole($user, $role, false);
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function removeUserRoleAction(User $user, Role $role)
+    {
+        $this->roleManager->dissociateRole($user, $role);
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function addUserGroupAction(User $user, Group $group)
+    {
+        $this->groupManager->addUsersToGroup($group, array($user));
+
+        return array('success');
+    }
+
+    /**
+     * @View()
+     */
+    public function removeUserGroupAction(User $user, Group $group)
     {
+        $this->groupManager->removeUsersFromGroup($group, array($user));
 
+        return array('success');
     }
 }
diff --git a/Controller/API/WorkspaceController.php b/Controller/API/WorkspaceController.php
new file mode 100644
index 000000000..6b00ae535
--- /dev/null
+++ b/Controller/API/WorkspaceController.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Controller\API;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use Claroline\CoreBundle\Entity\Workspace\Workspace;
+use Claroline\CoreBundle\Entity\User;
+use FOS\RestBundle\Controller\FOSRestController;
+use Claroline\CoreBundle\Persistence\ObjectManager;
+use Claroline\CoreBundle\Manager\WorkspaceManager;
+use Claroline\CoreBundle\Form\WorkspaceType;
+use Symfony\Component\Form\FormFactory;
+use Symfony\Component\HttpFoundation\Request;
+use FOS\RestBundle\Controller\Annotations\View;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Claroline\CoreBundle\Library\Workspace\Configuration;
+
+class WorkspaceController extends FOSRestController
+{
+
+    /**
+     * @DI\InjectParams({
+     *     "formFactory"      = @DI\Inject("form.factory"),
+     *     "workspaceManager" = @DI\Inject("claroline.manager.workspace_manager"),
+     *     "request"          = @DI\Inject("request"),
+     *     "tokenStorage"     = @DI\Inject("security.token_storage"),
+     *     "templateDir"      = @DI\Inject("%claroline.param.templates_directory%"),
+     *     "om"               = @DI\Inject("claroline.persistence.object_manager")
+     * })
+     */
+    public function __construct(
+        FormFactory      $formFactory,
+        WorkspaceManager $workspaceManager,
+        ObjectManager    $om,
+        Request          $request,
+        TokenStorageInterface $tokenStorage,
+        $templateDir
+    )
+    {
+        $this->formFactory = $formFactory;
+        $this->workspaceManager = $workspaceManager;
+        $this->om = $om;
+        $this->workspaceRepo = $this->om->getRepository('ClarolineCoreBundle:Workspace\Workspace');
+        $this->request = $request;
+        $this->tokenStorage = $tokenStorage;
+        $this->templateDir = $templateDir;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getWorkspacesAction()
+    {
+        return $this->workspaceRepo->findAll();
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     */
+    public function getWorkspaceAction(Workspace $workspace)
+    {
+        return $workspace;
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     * group_form[workspace_form] for the put request
+     */
+    public function postWorkspaceUserAction(User $user)
+    {
+        $workspaceType = new WorkspaceType($user);
+        $workspaceType->enableApi();
+        $form = $this->formFactory->create($workspaceType);
+        $form->submit($this->request);
+        //$form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $config = Configuration::fromTemplate(
+                $this->templateDir . DIRECTORY_SEPARATOR . 'default.zip'
+            );
+            $config->setWorkspaceName($form->get('name')->getData());
+            $config->setWorkspaceCode($form->get('code')->getData());
+            $config->setDisplayable($form->get('displayable')->getData());
+            $config->setSelfRegistration($form->get('selfRegistration')->getData());
+            $config->setRegistrationValidation($form->get('registrationValidation')->getData());
+            $config->setSelfUnregistration($form->get('selfUnregistration')->getData());
+            $config->setWorkspaceDescription($form->get('description')->getData());
+            $workspace = $this->workspaceManager->create($config, $user);
+            $workspace->setEndDate($form->get('endDate')->getData());
+            $workspace->setMaxStorageSize($form->get('maxStorageSize')->getData());
+            $workspace->setMaxUploadResources($form->get('maxUploadResources')->getData());
+            $workspace->setMaxUsers($form->get('maxUsers')->getData());
+
+            $this->workspaceManager->editWorkspace($workspace);
+
+            return $workspace;
+        }
+
+        return $form;
+    }
+
+    /**
+     * @View()
+     */
+    public function deleteWorkspaceAction(Workspace $workspace)
+    {
+        $this->workspaceManager->deleteWorkspace($workspace);
+
+        return array('success');
+    }
+
+    /**
+     * @View(serializerGroups={"api"})
+     * group_form[workspace_form] for the put request
+     */
+    public function putWorkspaceUserAction(Workspace $workspace, User $user)
+    {
+        $workspaceType = new WorkspaceType($user);
+        $workspaceType->enableApi();
+        $form = $this->formFactory->create($workspaceType, $workspace);
+        $form->submit($this->request);
+
+        if ($form->isValid()) {
+            $workspace->setName($form->get('name')->getData());
+            $workspace->setCode($form->get('code')->getData());
+            $workspace->setDisplayable($form->get('displayable')->getData());
+            $workspace->setSelfRegistration($form->get('selfRegistration')->getData());
+            $workspace->setRegistrationValidation($form->get('registrationValidation')->getData());
+            $workspace->setSelfUnregistration($form->get('selfUnregistration')->getData());
+            $workspace->setDescription($form->get('description')->getData());
+            $workspace->setEndDate($form->get('endDate')->getData());
+            $workspace->setMaxStorageSize($form->get('maxStorageSize')->getData());
+            $workspace->setMaxUploadResources($form->get('maxUploadResources')->getData());
+            $workspace->setMaxUsers($form->get('maxUsers')->getData());
+
+            $this->workspaceManager->editWorkspace($workspace);
+
+            return $workspace;
+        }
+
+        return $form;
+    }
+}
diff --git a/Controller/Administration/GroupsController.php b/Controller/Administration/GroupsController.php
index 912fefe0e..576552251 100644
--- a/Controller/Administration/GroupsController.php
+++ b/Controller/Administration/GroupsController.php
@@ -118,7 +118,6 @@ public function createAction()
             $userRole = $this->roleManager->getRoleByName('ROLE_USER');
             $group->setPlatformRole($userRole);
             $this->groupManager->insertGroup($group);
-            $this->eventDispatcher->dispatch('log', 'Log\LogGroupCreate', array($group));
 
             return $this->redirect($this->generateUrl('claro_admin_group_list'));
         }
diff --git a/Entity/Group.php b/Entity/Group.php
index 23543e9e8..bdeeb7040 100644
--- a/Entity/Group.php
+++ b/Entity/Group.php
@@ -18,6 +18,7 @@
 use Claroline\CoreBundle\Entity\AbstractRoleSubject;
 use Claroline\CoreBundle\Entity\User;
 use Claroline\CoreBundle\Entity\Model\WorkspaceModel;
+use JMS\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\GroupRepository")
@@ -35,12 +36,14 @@ class Group extends AbstractRoleSubject implements OrderableInterface
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"api"})
      */
     protected $id;
 
     /**
      * @ORM\Column()
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $name;
 
diff --git a/Entity/Workspace/Workspace.php b/Entity/Workspace/Workspace.php
index e2254db24..79c188ce6 100644
--- a/Entity/Workspace/Workspace.php
+++ b/Entity/Workspace/Workspace.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Bridge\Doctrine\Validator\Constraints as DoctrineAssert;
 use Symfony\Component\Validator\Constraints as Assert;
+use JMS\Serializer\Annotation\Groups;
 
 /**
  * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\WorkspaceRepository")
@@ -37,43 +38,51 @@ class Workspace
      * @ORM\Id
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
+     * @Groups({"api"})
      */
     protected $id;
 
     /**
      * @ORM\Column()
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $name;
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     * @Groups({"api"})
      */
     protected $description;
 
     /**
      * @ORM\Column(unique=true)
      * @Assert\NotBlank()
+     * @Groups({"api"})
      */
     protected $code;
 
     /**
      * @ORM\Column(type="string", nullable=false)
+     * @Groups({"api"})
      */
     protected $maxStorageSize = "1 TB";
 
     /**
      * @ORM\Column(type="integer", nullable=false)
+     * @Groups({"api"})
      */
     protected $maxUploadResources = 10000;
 
     /**
      * @ORM\Column(type="integer", nullable=false)
+     * @Groups({"api"})
      */
     protected $maxUsers = 10000;
 
     /**
      * @ORM\Column(type="boolean")
+     * @Groups({"api"})
      */
     protected $displayable = false;
 
@@ -116,56 +125,67 @@ class Workspace
      *     targetEntity="Claroline\CoreBundle\Entity\User"
      * )
      * @ORM\JoinColumn(name="user_id", onDelete="SET NULL")
+     * @Groups({"api"})
      */
     protected $creator;
 
     /**
      * @ORM\Column(unique=true)
+     * @Groups({"api"})
      */
     protected $guid;
 
     /**
      * @ORM\Column(name="self_registration", type="boolean")
+     * @Groups({"api"})
      */
     protected $selfRegistration = false;
 
     /**
      * @ORM\Column(name="registration_validation", type="boolean")
+     * @Groups({"api"})
      */
     protected $registrationValidation = false;
 
     /**
      * @ORM\Column(name="self_unregistration", type="boolean")
+     * @Groups({"api"})
      */
     protected $selfUnregistration = false;
 
     /**
      * @ORM\Column(name="creation_date", type="integer", nullable=true)
+     * @Groups({"api"})
      */
     protected $creationDate;
 
     /**
      * @ORM\Column(name="is_personal", type="boolean")
+     * @Groups({"api"})
      */
     protected $isPersonal = false;
 
     /**
      * @ORM\Column(name="start_date", type="datetime", nullable=true)
+     * @Groups({"api"})
      */
     protected $startDate;
 
     /**
      * @ORM\Column(name="end_date", type="datetime", nullable=true)
+     * @Groups({"api"})
      */
     protected $endDate;
 
     /**
      * @ORM\Column(name="is_access_date", type="boolean")
+     * @Groups({"api"})
      */
     protected $isAccessDate = false;
 
     /**
      * @ORM\Column(name="workspace_type", type="integer", nullable=true)
+     * @Groups({"api"})
      */
     protected $workspaceType;
 
diff --git a/Form/GroupType.php b/Form/GroupType.php
index 901e61567..46f182f2d 100644
--- a/Form/GroupType.php
+++ b/Form/GroupType.php
@@ -14,12 +14,25 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class GroupType extends AbstractType
 {
+    public function __construct()
+    {
+        $this->forApi = false;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('name', 'text', array('label' => 'name'));
+        $builder->add(
+            'name',
+            'text',
+            array(
+                'label' => 'name',
+                'constraints' => new NotBlank()
+            )
+        );
     }
 
     public function getName()
@@ -29,11 +42,14 @@ public function getName()
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver
-        ->setDefaults(
-            array(
-                'translation_domain' => 'platform'
-                )
-        );
+        $default = array('translation_domain' => 'platform');
+        if ($this->forApi) $default['csrf_protection'] = false;
+
+        $resolver->setDefaults($default);
+    }
+
+    public function enableApi()
+    {
+        $this->forApi = true;
     }
 }
diff --git a/Form/ProfileCreationType.php b/Form/ProfileCreationType.php
index 98da92154..bb3fb0219 100644
--- a/Form/ProfileCreationType.php
+++ b/Form/ProfileCreationType.php
@@ -44,6 +44,7 @@ public function __construct(
         $this->langs = $localeManager->retrieveAvailableLocales();
         $this->isAdmin = $isAdmin;
         $this->authenticationDrivers = $authenticationDrivers;
+        $this->forApi = false;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -116,12 +117,18 @@ public function getName()
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(
-            array(
-                'data_class' => 'Claroline\CoreBundle\Entity\User',
-                'validation_groups' => array('registration', 'Default'),
-                'translation_domain' => 'platform'
-            )
+        $default = array(
+            'data_class' => 'Claroline\CoreBundle\Entity\User',
+            'validation_groups' => array('registration', 'Default'),
+            'translation_domain' => 'platform'
         );
+        if ($this->forApi) $default['csrf_protection'] = false;
+
+        $resolver->setDefaults($default);
+    }
+
+    public function enableApi()
+    {
+        $this->forApi = true;
     }
 }
diff --git a/Form/ProfileType.php b/Form/ProfileType.php
index 156d866a1..cc9d9db5b 100644
--- a/Form/ProfileType.php
+++ b/Form/ProfileType.php
@@ -50,6 +50,7 @@ public function __construct(
         $this->isGrantedUserAdministration = $isGrantedUserAdministration;
         $this->langs = $localeManager->retrieveAvailableLocales();
         $this->authenticationDrivers = $authenticationDrivers;
+        $this->forApi = false;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -167,11 +168,17 @@ public function getName()
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(
-            array(
-                'data_class'         => 'Claroline\CoreBundle\Entity\User',
-                'translation_domain' => 'platform'
-            )
+        $default = array(
+            'data_class'         => 'Claroline\CoreBundle\Entity\User',
+            'translation_domain' => 'platform'
         );
+        if ($this->forApi) $default['csrf_protection'] = false;
+        
+        $resolver->setDefaults($default);
+    }
+
+    public function enableApi()
+    {
+        $this->forApi = true;
     }
 }
diff --git a/Form/WorkspaceType.php b/Form/WorkspaceType.php
index a1601ddc1..53cb4c810 100644
--- a/Form/WorkspaceType.php
+++ b/Form/WorkspaceType.php
@@ -17,6 +17,7 @@
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+use Symfony\Component\Validator\Constraints\NotBlank;
 
 class WorkspaceType extends AbstractType
 {
@@ -25,6 +26,7 @@ class WorkspaceType extends AbstractType
     public function __construct(User $user)
     {
         $this->user = $user;
+        $this->forApi = false;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -32,40 +34,96 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $user = $this->user;
 
         $builder
-            ->add('name', 'text', array('label' => 'name'))
+            ->add(
+                'name',
+                'text',
+                array(
+                    'label' => 'name',
+                    'constraints' => new NotBlank()
+                )
+            )
             ->add(
                 'code',
                 'text',
-                array('constraints' => array(new WorkspaceUniqueCode()), 'label' => 'code')
-            )->add(
+                array(
+                    'constraints' => array(new WorkspaceUniqueCode(), new NotBlank()),
+                    'label' => 'code'
+                )
+            )
+            ->add(
                 'description',
                 isset($options['theme_options']['tinymce']) && !$options['theme_options']['tinymce'] ?
                     'textarea' :
                     'tinymce',
                 array('required' => false, 'label' => 'description')
-            )
-            ->add(
-                'model',
-                'entity',
-                array(
-                    'class' => 'ClarolineCoreBundle:Model\WorkspaceModel',
-                    'query_builder' => function (EntityRepository $er) use ($user) {
+            );
+
+            if (!$this->forApi) {
+                $builder->add(
+                    'model',
+                    'entity',
+                    array(
+                        'class' => 'ClarolineCoreBundle:Model\WorkspaceModel',
+                        'query_builder' => function (EntityRepository $er) use ($user) {
+
+                            return $er->createQueryBuilder('wm')
+                                ->join('wm.users', 'u')
+                                ->where('u.id = :userId')
+                                ->setParameter('userId', $user->getId())
+                                ->orderBy('wm.name', 'ASC');
+                        },
+                        'property' => 'nameAndWorkspace',
+                        'required' => false,
+                        'label' => 'model'
+                    )
+                );
+            }
+            $builder
+                ->add('displayable', 'checkbox', array('required' => false, 'label' => 'displayable_in_workspace_list'))
+                ->add('selfRegistration', 'checkbox', array('required' => false, 'label' => 'public_registration'))
+                ->add('registrationValidation', 'checkbox', array('required' => false, 'label' => 'registration_validation'))
+                ->add('selfUnregistration', 'checkbox', array('required' => false, 'label' => 'public_unregistration'));
 
-                        return $er->createQueryBuilder('wm')
-                            ->join('wm.users', 'u')
-                            ->where('u.id = :userId')
-                            ->setParameter('userId', $user->getId())
-                            ->orderBy('wm.name', 'ASC');
-                    },
-                    'property' => 'nameAndWorkspace',
-                    'required' => false,
-                    'label' => 'model'
+        if ($this->forApi) {
+            $builder->add(
+                'maxStorageSize',
+                'text',
+                array(
+                    'label' => 'max_storage_size',
+                    'constraints' => array(new NotBlank())
                 )
-            )
-            ->add('displayable', 'checkbox', array('required' => false, 'label' => 'displayable_in_workspace_list'))
-            ->add('selfRegistration', 'checkbox', array('required' => false, 'label' => 'public_registration'))
-            ->add('registrationValidation', 'checkbox', array('required' => false, 'label' => 'registration_validation'))
-            ->add('selfUnregistration', 'checkbox', array('required' => false, 'label' => 'public_unregistration'));
+            );
+            $builder->add(
+                'maxUploadResources',
+                'text',
+                array(
+                    'label' => 'max_amount_resources',
+                    'constraints' => array(new NotBlank())
+                )
+            );
+            $builder->add(
+                'maxUsers',
+                'text',
+                array(
+                    'label' => 'workspace_max_users',
+                    'constraints' => array(new NotBlank())
+                )
+            );
+            $params = array(
+                'label' => 'expiration_date',
+                'format' => 'dd-MM-yyyy',
+                'widget' => 'single_text',
+                'input' => 'datetime',
+                'attr' => array(
+                    'class' => 'datepicker input-small',
+                    'data-date-format' => 'dd-mm-yyyy',
+                    'autocomplete' => 'off'
+                ),
+                'constraints' => array(new NotBlank())
+            );
+
+            $builder->add('endDate', 'datepicker', $params);
+        }
     }
 
     public function getName()
@@ -73,8 +131,16 @@ public function getName()
         return 'workspace_form';
     }
 
+    public function enableApi()
+    {
+        $this->forApi = true;
+    }
+
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
-        $resolver->setDefaults(array('translation_domain' => 'platform'));
+        $default = array('translation_domain' => 'platform');
+        if ($this->forApi) $default['csrf_protection'] = false;
+
+        $resolver->setDefaults($default);
     }
 }
diff --git a/Manager/GroupManager.php b/Manager/GroupManager.php
index 6adcf9073..0ddc6c422 100644
--- a/Manager/GroupManager.php
+++ b/Manager/GroupManager.php
@@ -74,6 +74,7 @@ public function __construct(
     public function insertGroup(Group $group)
     {
         $this->om->persist($group);
+        $this->eventDispatcher->dispatch('log', 'Log\LogGroupCreate', array($group));
         $this->om->flush();
     }
 
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index c936631ee..8bbe635e3 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -286,6 +286,16 @@ claro_user_api:
     type: rest
     prefix: api
 
+claro_workspace_api:
+    resource: "@ClarolineCoreBundle/Controller/API/WorkspaceController.php"
+    type: rest
+    prefix: api
+
+claro_group_api:
+    resource: "@ClarolineCoreBundle/Controller/API/GroupController.php"
+    type: rest
+    prefix: api
+
 claro_contact:
     resource: "@ClarolineCoreBundle/Controller/ContactController.php"
     prefix: contact
diff --git a/Resources/config/suggested/fos_rest.yml b/Resources/config/suggested/fos_rest.yml
index e21a35594..c82d858df 100644
--- a/Resources/config/suggested/fos_rest.yml
+++ b/Resources/config/suggested/fos_rest.yml
@@ -1,6 +1,11 @@
+# app/config/config.yml
 fos_rest:
+    disable_csrf_role: true
+    param_fetcher_listener: true
+    body_listener: true
+    format_listener: true
     view:
-        view_response_listener: force
+        view_response_listener: 'force'
     format_listener:
         rules:
             priorities: ['json']
diff --git a/Resources/config/suggested/monolog_prod.yml b/Resources/config/suggested/monolog_prod.yml
index c02b124c6..c434cb482 100644
--- a/Resources/config/suggested/monolog_prod.yml
+++ b/Resources/config/suggested/monolog_prod.yml
@@ -4,7 +4,7 @@ monolog:
             type:         fingers_crossed
             action_level: error
             handler:      nested
-            exculded_404s:
+            excluded_404s:
                 - ^/bundles
                 - ^/js
                 - ^/uploads
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index f62e82bec..183a7d56d 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,8 +28,9 @@ security:
                 use_referer: true
             anonymous: true
 
-        #api:
-        #    pattern:    ^/api
+        api:
+            pattern:    ^/api
+            security: false
         #    fos_oauth:  true
         #    stateless:  true
 

From f67661db657cdda3735e3dec7f3e4c7d31ad773f Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Fri, 17 Jul 2015 11:21:16 +0200
Subject: [PATCH 04/24] Platform parameters can be edited trough the api

---
 Controller/API/ParametersController.php | 49 +++++++++++++++++++++++++
 Resources/config/routing.yml            |  6 +++
 Resources/config/suggested/security.yml |  9 ++---
 3 files changed, 59 insertions(+), 5 deletions(-)
 create mode 100644 Controller/API/ParametersController.php

diff --git a/Controller/API/ParametersController.php b/Controller/API/ParametersController.php
new file mode 100644
index 000000000..f2a3dbc1c
--- /dev/null
+++ b/Controller/API/ParametersController.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Controller\API;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use Symfony\Component\HttpFoundation\Request;
+use FOS\RestBundle\Controller\FOSRestController;
+use FOS\RestBundle\Controller\Annotations\View;
+use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
+
+class ParametersController extends FOSRestController
+{
+    private $request;
+
+    /**
+     * @DI\InjectParams({
+     *     "request" = @DI\Inject("request"),
+     *     "ch"      = @DI\Inject("claroline.config.platform_config_handler")
+     * })
+     */
+    public function __construct(Request $request, PlatformConfigurationHandler $ch)
+    {
+        $this->request = $request;
+        $this->ch = $ch;
+    }
+
+    /**
+     * @View()
+     */
+    public function postParametersAction()
+    {
+        $data = $this->request->request;
+
+        foreach ($data as $parameter => $value) {
+            $this->ch->setParameter($parameter, $value);
+        }
+
+        return $data;
+    }
+}
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index 8bbe635e3..acb8d3c8c 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -296,6 +296,12 @@ claro_group_api:
     type: rest
     prefix: api
 
+claro_parameters_api:
+    resource: "@ClarolineCoreBundle/Controller/API/ParametersController.php"
+    type: rest
+    prefix: api
+
+
 claro_contact:
     resource: "@ClarolineCoreBundle/Controller/ContactController.php"
     prefix: contact
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index 183a7d56d..373228f38 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,11 +28,10 @@ security:
                 use_referer: true
             anonymous: true
 
-        api:
-            pattern:    ^/api
-            security: false
-        #    fos_oauth:  true
-        #    stateless:  true
+        #api:
+            #pattern:    ^/api
+            #fos_oauth:  true
+            #stateless:  true
 
         main:
             pattern: ^/

From 9b7cf0ee1b6e53cdffb47fd3f384078056c1f811 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Fri, 17 Jul 2015 16:00:38 +0200
Subject: [PATCH 05/24] wip

---
 Manager/OauthManager.php                         |  6 ++++++
 Resources/config/suggested/security.yml          |  8 ++++----
 Resources/public/js/administration/oauth.js      | 10 ++++++++++
 .../views/Administration/Oauth/list.html.twig    | 16 ++++++++++++++++
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index d30ebf9c6..f74f7bf16 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -14,6 +14,7 @@
 use JMS\DiExtraBundle\Annotation as DI;
 use Claroline\CoreBundle\Event\StrictDispatcher;
 use FOS\OAuthServerBundle\Entity\ClientManager;
+use Claroline\CoreBundle\Entity\Oauth\Client;
 
 /**
  * @DI\Service("claroline.manager.oauth_manager", parent="fos_oauth_server.client_manager.default")
@@ -24,4 +25,9 @@ public function findAllClients()
     {
         return $this->repository->findAll();
     }
+
+    public function connect(Client $client)
+    {
+
+    }
 }
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index 373228f38..4eb83e951 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,10 +28,10 @@ security:
                 use_referer: true
             anonymous: true
 
-        #api:
-            #pattern:    ^/api
-            #fos_oauth:  true
-            #stateless:  true
+        api:
+            pattern:    ^/api
+            fos_oauth:  true
+            stateless:  true
 
         main:
             pattern: ^/
diff --git a/Resources/public/js/administration/oauth.js b/Resources/public/js/administration/oauth.js
index 4e263ed4e..07a2339b4 100644
--- a/Resources/public/js/administration/oauth.js
+++ b/Resources/public/js/administration/oauth.js
@@ -11,6 +11,7 @@
     'use strict';
 
     var modal = window.Claroline.Modal;
+    var id = '';
 
     var addClient = function() {
         window.location.reload();
@@ -25,6 +26,15 @@
             var url = Routing.generate('claro_admin_oauth_form');
             modal.displayForm(url, addClient, function(){}, 'form_client_creation');
         })
+        .on('click', '.show-client-btn', function(event) {
+            modal.simpleContainer('', $(event.target).attr('data-client-id') + '_' + $(event.target).attr('data-client-random'));
+        })
+        .on('click', '.show-secret-btn', function(event) {
+            modal.simpleContainer('', $(event.target).attr('data-secret'));
+        })
+        .on('click', '.show-refresh-btn', function(event) {
+            modal.simpleContainer('', $(event.target).attr('data-url'));
+        })
         .on('click', '.delete-client-btn', function(event) {
             var clientid = $(event.target).attr('data-client-id');
 
diff --git a/Resources/views/Administration/Oauth/list.html.twig b/Resources/views/Administration/Oauth/list.html.twig
index a2fb01e31..c808d9312 100644
--- a/Resources/views/Administration/Oauth/list.html.twig
+++ b/Resources/views/Administration/Oauth/list.html.twig
@@ -60,6 +60,22 @@
                             <th> {{ client.getName() }} </th>
                             <th>
                                 <div class="btn-group">
+                                    <button class="btn btn-default show-client-btn"
+                                            data-client-id="{{ client.getId() }}"
+                                            data-client-random="{{ client.getRandomId() }}"
+                                    >
+                                        <i class="fa fa-info"></i>
+                                    </button>
+                                    <button class="btn btn-default show-secret-btn"
+                                            data-secret="{{ client.getSecret() }}"
+                                    >
+                                        <i class="fa fa-key"></i>
+                                    </button>
+                                    <button class="btn btn-default show-refresh-btn"
+                                        data-url="/oauth/v2/auth?client_id={{ client.getId() }}_{{ client.getRandomId() }}&redirect_uri={% for uris in client.getRedirectUris() %}{{ uris }}{% endfor %}&response_type=token"
+                                    >
+                                        <i class="fa fa-refresh"></i>
+                                    </button>
                                     <button class="btn btn-danger delete-client-btn"
                                             data-client-id="{{ client.getId() }}"
                                     >

From f789a1fb66da7426ebfdaea12432aa9548afc5ee Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Mon, 20 Jul 2015 11:12:08 +0200
Subject: [PATCH 06/24] Updating composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ba04428f8..b793a6470 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,7 @@
         "claroline/bundle-recorder": "~5.0",
         "claroline/kernel-bundle": "~5.0",
         "claroline/installation-bundle": "~5.0",
-        "claroline/front-end-bundle": "~5.0",
+        "claroline/front-end-bundle": "dev-6.x-dev",
         "claroline/migration-bundle": "~5.0",
         "johngrogg/ics-parser": "dev-master",
         "gregwar/captcha-bundle": "1.0.12",

From c21b2dcb2d911ca0578293128d581ff22e5f91c4 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 12:07:18 +0200
Subject: [PATCH 07/24] nelmio api doc as dev-master

---
 Controller/API/UserController.php                     | 6 ++++++
 Resources/config/routing.yml                          | 1 -
 Resources/config/suggested/nelmio_api_doc_config.yml  | 5 ++++-
 Resources/config/suggested/nelmio_api_doc_routing.yml | 3 ---
 Resources/doc/api/api.md                              | 1 +
 composer.json                                         | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 Resources/doc/api/api.md

diff --git a/Controller/API/UserController.php b/Controller/API/UserController.php
index a46577afc..d3bc58904 100644
--- a/Controller/API/UserController.php
+++ b/Controller/API/UserController.php
@@ -29,6 +29,7 @@
 use Symfony\Component\Form\FormFactory;
 use Symfony\Component\HttpFoundation\Request;
 use Claroline\CoreBundle\Persistence\ObjectManager;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
 class UserController extends FOSRestController
 {
@@ -73,6 +74,11 @@ public function __construct(
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     decription="Returns the users list",
+     *     section="user",
+     *     views = {"api"}
+     * )
      */
     public function getUsersAction()
     {
diff --git a/Resources/config/routing.yml b/Resources/config/routing.yml
index acb8d3c8c..a80b051e7 100644
--- a/Resources/config/routing.yml
+++ b/Resources/config/routing.yml
@@ -301,7 +301,6 @@ claro_parameters_api:
     type: rest
     prefix: api
 
-
 claro_contact:
     resource: "@ClarolineCoreBundle/Controller/ContactController.php"
     prefix: contact
diff --git a/Resources/config/suggested/nelmio_api_doc_config.yml b/Resources/config/suggested/nelmio_api_doc_config.yml
index 0747d37a7..51de617ee 100644
--- a/Resources/config/suggested/nelmio_api_doc_config.yml
+++ b/Resources/config/suggested/nelmio_api_doc_config.yml
@@ -1 +1,4 @@
-nelmio_api_doc: ~
+nelmio_api_doc:
+    name: 'API documentation'
+    sandbox:
+        enabled: false
diff --git a/Resources/config/suggested/nelmio_api_doc_routing.yml b/Resources/config/suggested/nelmio_api_doc_routing.yml
index 58ebd4137..e69de29bb 100644
--- a/Resources/config/suggested/nelmio_api_doc_routing.yml
+++ b/Resources/config/suggested/nelmio_api_doc_routing.yml
@@ -1,3 +0,0 @@
-NelmioApiDocBundle:
-    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
-    prefix:   /api/doc
diff --git a/Resources/doc/api/api.md b/Resources/doc/api/api.md
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/Resources/doc/api/api.md
@@ -0,0 +1 @@
+
diff --git a/composer.json b/composer.json
index b793a6470..7329f6531 100644
--- a/composer.json
+++ b/composer.json
@@ -49,7 +49,7 @@
         "mrclay/minify": "~2.2",
         "natxet/CssMin": "3.0.2",
         "werkint/jsmin": "1.0.0",
-        "nelmio/api-doc-bundle": "~2.7",
+        "nelmio/api-doc-bundle": "dev-master",
         "claroline/bundle-recorder": "~5.0",
         "claroline/kernel-bundle": "~5.0",
         "claroline/installation-bundle": "~5.0",

From 60de45ce00770beefd72b8521a774c85dca52ab4 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 12:09:05 +0200
Subject: [PATCH 08/24] updating composer.json

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 7329f6531..0fd20b19d 100644
--- a/composer.json
+++ b/composer.json
@@ -50,11 +50,11 @@
         "natxet/CssMin": "3.0.2",
         "werkint/jsmin": "1.0.0",
         "nelmio/api-doc-bundle": "dev-master",
-        "claroline/bundle-recorder": "~5.0",
-        "claroline/kernel-bundle": "~5.0",
-        "claroline/installation-bundle": "~5.0",
+        "claroline/bundle-recorder": "dev-6.x-dev",
+        "claroline/kernel-bundle": "dev-6.x-dev",
+        "claroline/installation-bundle": "dev-6.x-dev",
         "claroline/front-end-bundle": "dev-6.x-dev",
-        "claroline/migration-bundle": "~5.0",
+        "claroline/migration-bundle": "dev-6.x-dev",
         "johngrogg/ics-parser": "dev-master",
         "gregwar/captcha-bundle": "1.0.12",
         "knplabs/knp-menu-bundle": "2.0.0",

From 8a60bf68156b6d68d87427c0d38fd8a59ffb6623 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 15:31:33 +0200
Subject: [PATCH 09/24] api doc

---
 Controller/API/GroupController.php      |  33 ++-
 Controller/API/ParametersController.php |   8 +
 Controller/API/UserController.php       |  44 +++-
 Controller/API/WorkspaceController.php  |  25 ++-
 Form/Field/DatePickerType.php           |   3 +-
 Form/ProfileCreationType.php            |   4 +
 Form/ProfileType.php                    |   6 +-
 Form/WorkspaceType.php                  |   3 +
 Resources/config/suggested/fos_rest.yml |   5 +
 Resources/config/suggested/security.yml |   8 +-
 Resources/doc/api/api.md                |   1 -
 Resources/doc/api/group.md              | 114 +++++++++++
 Resources/doc/api/parameters.md         |  17 ++
 Resources/doc/api/user.md               | 256 ++++++++++++++++++++++++
 Resources/doc/api/workspace.md          | 209 +++++++++++++++++++
 15 files changed, 718 insertions(+), 18 deletions(-)
 delete mode 100644 Resources/doc/api/api.md
 create mode 100644 Resources/doc/api/group.md
 create mode 100644 Resources/doc/api/parameters.md
 create mode 100644 Resources/doc/api/user.md
 create mode 100644 Resources/doc/api/workspace.md

diff --git a/Controller/API/GroupController.php b/Controller/API/GroupController.php
index bf120c450..c90007017 100644
--- a/Controller/API/GroupController.php
+++ b/Controller/API/GroupController.php
@@ -23,6 +23,7 @@
 use Claroline\CoreBundle\Entity\Group;
 use Claroline\CoreBundle\Entity\User;
 use Claroline\CoreBundle\Entity\Role;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
 class GroupController extends FOSRestController
 {
@@ -53,6 +54,10 @@ public function __construct(
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     description="Returns the groups list",
+     *     views = {"group"}
+     * )
      */
     public function getGroupsAction()
     {
@@ -61,6 +66,10 @@ public function getGroupsAction()
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     description="Returns a group",
+     *     views = {"group"}
+     * )
      */
     public function getGroupAction(Group $group)
     {
@@ -69,7 +78,11 @@ public function getGroupAction(Group $group)
 
     /**
      * @View(serializerGroups={"api"})
-     * group_form[fieldname] for the put request
+     * @ApiDoc(
+     *     description="Create a group",
+     *     views = {"group"},
+     *     input="Claroline\CoreBundle\Form\GroupType"
+     * )
      */
     public function postGroupAction()
     {
@@ -93,7 +106,11 @@ public function postGroupAction()
 
     /**
      * @View(serializerGroups={"api"})
-     * group_form[fieldname] for the put request
+     * @ApiDoc(
+     *     description="Update a group",
+     *     views = {"group"},
+     *     input="Claroline\CoreBundle\Form\GroupType"
+     * )
      */
     public function putGroupAction(Group $group)
     {
@@ -116,6 +133,10 @@ public function putGroupAction(Group $group)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Removes a group",
+     *     views = {"group"},
+     * )
      */
     public function deleteGroupAction(Group $group)
     {
@@ -126,6 +147,10 @@ public function deleteGroupAction(Group $group)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Add a role to a group",
+     *     views = {"group"}
+     * )
      */
     public function addGroupRoleAction(Group $group, Role $role)
     {
@@ -136,6 +161,10 @@ public function addGroupRoleAction(Group $group, Role $role)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Remove a role from a group",
+     *     views = {"group"}
+     * )
      */
     public function removeGroupRoleAction(Group $group, Role $role)
     {
diff --git a/Controller/API/ParametersController.php b/Controller/API/ParametersController.php
index f2a3dbc1c..7f0e9ca53 100644
--- a/Controller/API/ParametersController.php
+++ b/Controller/API/ParametersController.php
@@ -16,6 +16,7 @@
 use FOS\RestBundle\Controller\FOSRestController;
 use FOS\RestBundle\Controller\Annotations\View;
 use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
 class ParametersController extends FOSRestController
 {
@@ -35,6 +36,13 @@ public function __construct(Request $request, PlatformConfigurationHandler $ch)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Update/Add a parameters in the platform_options.yml file",
+     *     views = {"parameters"},
+     *     parameters={
+     *          {"name"="parameter_name", "dataType"="any", "required"=true ,"description"="The parameter_name is the parameter you want to change"}
+     *     }
+     * )
      */
     public function postParametersAction()
     {
diff --git a/Controller/API/UserController.php b/Controller/API/UserController.php
index d3bc58904..6d2b1907c 100644
--- a/Controller/API/UserController.php
+++ b/Controller/API/UserController.php
@@ -75,9 +75,8 @@ public function __construct(
     /**
      * @View(serializerGroups={"api"})
      * @ApiDoc(
-     *     decription="Returns the users list",
-     *     section="user",
-     *     views = {"api"}
+     *     description="Returns the users list",
+     *     views = {"user"}
      * )
      */
     public function getUsersAction()
@@ -87,8 +86,11 @@ public function getUsersAction()
 
     /**
      * @View(serializerGroups={"api"})
-     * profile_form_creation[fieldname] for the put request
-     * profile_form_creation[platformRoles][] // for the list of roles
+     * @ApiDoc(
+     *     description="Creates a user",
+     *     views = {"user"},
+     *     input="Claroline\CoreBundle\Form\ProfileCreationType"
+     * )
      */
     public function postUserAction()
     {
@@ -119,8 +121,11 @@ public function postUserAction()
 
     /**
      * @View(serializerGroups={"api"})
-     * profile_form[fieldname] for the put request
-     * profile_form[platformRoles][] // for the list of roles
+     * @ApiDoc(
+     *     description="Update a user",
+     *     views = {"user"},
+     *     input="Claroline\CoreBundle\Form\ProfileType"
+     * )
      */
     public function putUserAction(User $user)
     {
@@ -163,6 +168,10 @@ public function putUserAction(User $user)
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     description="Returns a user",
+     *     views = {"user"}
+     * )
      */
     public function getUserAction(User $user)
     {
@@ -171,6 +180,11 @@ public function getUserAction(User $user)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Removes a user",
+     *     section="user",
+     *     views = {"api"}
+     * )
      */
     public function deleteUserAction(User $user)
     {
@@ -181,6 +195,10 @@ public function deleteUserAction(User $user)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Add a role to a user",
+     *     views = {"user"}
+     * )
      */
     public function addUserRoleAction(User $user, Role $role)
     {
@@ -191,6 +209,10 @@ public function addUserRoleAction(User $user, Role $role)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="remove a role from a user",
+     *     views = {"user"}
+     * )
      */
     public function removeUserRoleAction(User $user, Role $role)
     {
@@ -201,6 +223,10 @@ public function removeUserRoleAction(User $user, Role $role)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Add a user in a group",
+     *     views = {"user"}
+     * )
      */
     public function addUserGroupAction(User $user, Group $group)
     {
@@ -211,6 +237,10 @@ public function addUserGroupAction(User $user, Group $group)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Remove a user from a group",
+     *     views = {"user"}
+     * )
      */
     public function removeUserGroupAction(User $user, Group $group)
     {
diff --git a/Controller/API/WorkspaceController.php b/Controller/API/WorkspaceController.php
index 6b00ae535..f11542d8e 100644
--- a/Controller/API/WorkspaceController.php
+++ b/Controller/API/WorkspaceController.php
@@ -23,6 +23,7 @@
 use FOS\RestBundle\Controller\Annotations\View;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Claroline\CoreBundle\Library\Workspace\Configuration;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
 
 class WorkspaceController extends FOSRestController
 {
@@ -57,6 +58,10 @@ public function __construct(
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     description="Returns the workspaces list",
+     *     views = {"workspace"}
+     * )
      */
     public function getWorkspacesAction()
     {
@@ -65,6 +70,10 @@ public function getWorkspacesAction()
 
     /**
      * @View(serializerGroups={"api"})
+     * @ApiDoc(
+     *     description="Returns a workspace",
+     *     views = {"workspace"}
+     * )
      */
     public function getWorkspaceAction(Workspace $workspace)
     {
@@ -73,7 +82,11 @@ public function getWorkspaceAction(Workspace $workspace)
 
     /**
      * @View(serializerGroups={"api"})
-     * group_form[workspace_form] for the put request
+     * @ApiDoc(
+     *     description="Create a workspace",
+     *     views = {"workspace"},
+     *     input="Claroline\CoreBundle\Form\WorkspaceType"
+     * )
      */
     public function postWorkspaceUserAction(User $user)
     {
@@ -110,6 +123,10 @@ public function postWorkspaceUserAction(User $user)
 
     /**
      * @View()
+     * @ApiDoc(
+     *     description="Removes a workspace",
+     *     views = {"workspace"}
+     * )
      */
     public function deleteWorkspaceAction(Workspace $workspace)
     {
@@ -120,7 +137,11 @@ public function deleteWorkspaceAction(Workspace $workspace)
 
     /**
      * @View(serializerGroups={"api"})
-     * group_form[workspace_form] for the put request
+     * @ApiDoc(
+     *     description="Update a workspace",
+     *     views = {"workspace"},
+     *     input="Claroline\CoreBundle\Form\WorkspaceType"
+     * )
      */
     public function putWorkspaceUserAction(Workspace $workspace, User $user)
     {
diff --git a/Form/Field/DatePickerType.php b/Form/Field/DatePickerType.php
index 27de8162a..e875cde58 100644
--- a/Form/Field/DatePickerType.php
+++ b/Form/Field/DatePickerType.php
@@ -47,13 +47,14 @@ public function buildView(FormView $view, FormInterface $form, array $options)
 
     public function setDefaultOptions(OptionsResolverInterface $resolver)
     {
+        $lang = (php_sapi_name() === 'cli') ? 'en': $this->localeManager->getUserLocale($this->container->get('request'));
         $resolver->setDefaults(
             array(
                 'input'              => 'datetime',
                 'widget'             => 'single_text',
                 'component'          => false,
                 'autoclose'          => false,
-                'language'           => $this->localeManager->getUserLocale($this->container->get('request'))
+                'language'           => $lang
             )
         );
     }
diff --git a/Form/ProfileCreationType.php b/Form/ProfileCreationType.php
index bb3fb0219..937b73df0 100644
--- a/Form/ProfileCreationType.php
+++ b/Form/ProfileCreationType.php
@@ -49,6 +49,10 @@ public function __construct(
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        if (php_sapi_name() === 'cli') {
+            $this->isAdmin = true;
+        }
+        
         parent::buildForm($builder, $options);
         $isAdmin = $this->isAdmin;
 
diff --git a/Form/ProfileType.php b/Form/ProfileType.php
index cc9d9db5b..b98173158 100644
--- a/Form/ProfileType.php
+++ b/Form/ProfileType.php
@@ -55,6 +55,10 @@ public function __construct(
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
+        if (php_sapi_name() === 'cli') {
+            $this->isAdmin = true;
+        }
+        
         parent::buildForm($builder, $options);
 
         $builder
@@ -173,7 +177,7 @@ public function setDefaultOptions(OptionsResolverInterface $resolver)
             'translation_domain' => 'platform'
         );
         if ($this->forApi) $default['csrf_protection'] = false;
-        
+
         $resolver->setDefaults($default);
     }
 
diff --git a/Form/WorkspaceType.php b/Form/WorkspaceType.php
index 53cb4c810..8769ce8d0 100644
--- a/Form/WorkspaceType.php
+++ b/Form/WorkspaceType.php
@@ -32,6 +32,9 @@ public function __construct(User $user)
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $user = $this->user;
+        if (php_sapi_name() === 'cli') {
+            $this->forApi = true;
+        }
 
         $builder
             ->add(
diff --git a/Resources/config/suggested/fos_rest.yml b/Resources/config/suggested/fos_rest.yml
index c82d858df..50bb88cae 100644
--- a/Resources/config/suggested/fos_rest.yml
+++ b/Resources/config/suggested/fos_rest.yml
@@ -6,6 +6,11 @@ fos_rest:
     format_listener: true
     view:
         view_response_listener: 'force'
+        formats:
+            json: true
+            xml: true
+        templating_formats:
+            html: false
     format_listener:
         rules:
             priorities: ['json']
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index 4eb83e951..373228f38 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,10 +28,10 @@ security:
                 use_referer: true
             anonymous: true
 
-        api:
-            pattern:    ^/api
-            fos_oauth:  true
-            stateless:  true
+        #api:
+            #pattern:    ^/api
+            #fos_oauth:  true
+            #stateless:  true
 
         main:
             pattern: ^/
diff --git a/Resources/doc/api/api.md b/Resources/doc/api/api.md
deleted file mode 100644
index 8b1378917..000000000
--- a/Resources/doc/api/api.md
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/Resources/doc/api/group.md b/Resources/doc/api/group.md
new file mode 100644
index 000000000..dd0d992a5
--- /dev/null
+++ b/Resources/doc/api/group.md
@@ -0,0 +1,114 @@
+### `GET` /api/groups.{_format} ###
+
+_Returns the groups list_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+
+### `POST` /api/groups.{_format} ###
+
+_Create a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+#### Parameters ####
+
+group_form:
+
+  * type: object (GroupType)
+  * required: true
+
+group_form[name]:
+
+  * type: string
+  * required: true
+  * description: name
+
+
+### `GET` /api/groups/{group}.{_format} ###
+
+_Returns a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**group**
+
+
+
+### `PUT` /api/groups/{group}.{_format} ###
+
+_Update a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**group**
+
+
+#### Parameters ####
+
+group_form:
+
+  * type: object (GroupType)
+  * required: false
+
+group_form[name]:
+
+  * type: string
+  * required: true
+  * description: name
+
+
+### `DELETE` /api/groups/{group}.{_format} ###
+
+_Removes a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**group**
+
+
+
+### `PATCH` /api/groups/{group}/roles/{role}/add.{_format} ###
+
+_Add a role to a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**group**
+
+**role**
+
+
+
+### `GET` /api/groups/{group}/roles/{role}/remove.{_format} ###
+
+_Remove a role from a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**group**
+
+**role**
diff --git a/Resources/doc/api/parameters.md b/Resources/doc/api/parameters.md
new file mode 100644
index 000000000..1451b3743
--- /dev/null
+++ b/Resources/doc/api/parameters.md
@@ -0,0 +1,17 @@
+### `POST` /api/parameters.{_format} ###
+
+_Update/Add a parameters in the platform_options.yml file_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+#### Parameters ####
+
+parameter_name:
+
+  * type: any
+  * required: true
+  * description: The parameter_name is the parameter you want to change
diff --git a/Resources/doc/api/user.md b/Resources/doc/api/user.md
new file mode 100644
index 000000000..6282fd5aa
--- /dev/null
+++ b/Resources/doc/api/user.md
@@ -0,0 +1,256 @@
+### `GET` /api/users.{_format} ###
+
+_Returns the users list_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+
+### `POST` /api/users.{_format} ###
+
+_Creates a user_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+#### Parameters ####
+
+profile_form_creation:
+
+  * type: object (ProfileCreationType)
+  * required: true
+
+profile_form_creation[firstName]:
+
+  * type: string
+  * required: true
+  * description: first_name
+
+profile_form_creation[lastName]:
+
+  * type: string
+  * required: true
+  * description: last_name
+
+profile_form_creation[username]:
+
+  * type: string
+  * required: true
+  * description: username
+
+profile_form_creation[plainPassword]:
+
+  * type: object (RepeatedType)
+  * required: true
+
+profile_form_creation[plainPassword][first]:
+
+  * type: string
+  * required: true
+  * description: password
+
+profile_form_creation[plainPassword][second]:
+
+  * type: string
+  * required: true
+  * description: verification
+
+profile_form_creation[administrativeCode]:
+
+  * type: string
+  * required: false
+  * description: administrative_code
+
+profile_form_creation[mail]:
+
+  * type: string
+  * required: true
+  * description: email
+
+profile_form_creation[phone]:
+
+  * type: string
+  * required: false
+  * description: phone
+
+profile_form_creation[locale]:
+
+  * type: choice
+  * required: false
+  * description: language
+
+profile_form_creation[authentication]:
+
+  * type: choice
+  * required: false
+  * description: authentication
+
+profile_form_creation[platformRoles][]:
+
+  * type: array of choices
+  * required: true
+  * description: roles
+
+
+### `GET` /api/users/{user}.{_format} ###
+
+_Returns a user_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+
+
+### `PUT` /api/users/{user}.{_format} ###
+
+_Update a user_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+
+#### Parameters ####
+
+profile_form:
+
+  * type: object (ProfileType)
+  * required: false
+
+profile_form[firstName]:
+
+  * type: string
+  * required: true
+  * description: first_name
+
+profile_form[lastName]:
+
+  * type: string
+  * required: true
+  * description: last_name
+
+profile_form[username]:
+
+  * type: string
+  * required: true
+  * description: username
+
+profile_form[administrativeCode]:
+
+  * type: string
+  * required: false
+  * description: administrative_code
+
+profile_form[mail]:
+
+  * type: string
+  * required: false
+  * description: email
+
+profile_form[phone]:
+
+  * type: string
+  * required: false
+  * description: phone
+
+profile_form[locale]:
+
+  * type: choice
+  * required: false
+  * description: language
+
+profile_form[pictureFile]:
+
+  * type: file
+  * required: false
+  * description: picture_profile
+
+profile_form[description]:
+
+  * type: string
+  * required: false
+  * description: description
+
+profile_form[authentication]:
+
+  * type: choice
+  * required: false
+  * description: authentication
+
+profile_form[platformRoles][]:
+
+  * type: array of choices
+  * required: true
+  * description: roles
+
+
+### `PATCH` /api/users/{user}/groups/{group}/add.{_format} ###
+
+_Add a user in a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+**group**
+
+
+
+### `GET` /api/users/{user}/groups/{group}/remove.{_format} ###
+
+_Remove a user from a group_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+**group**
+
+
+
+### `PATCH` /api/users/{user}/roles/{role}/add.{_format} ###
+
+_Add a role to a user_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+**role**
+
+
+
+### `GET` /api/users/{user}/roles/{role}/remove.{_format} ###
+
+_remove a role from a user_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+**role**
diff --git a/Resources/doc/api/workspace.md b/Resources/doc/api/workspace.md
new file mode 100644
index 000000000..308797f1d
--- /dev/null
+++ b/Resources/doc/api/workspace.md
@@ -0,0 +1,209 @@
+### `GET` /api/workspaces.{_format} ###
+
+_Returns the workspaces list_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+
+
+### `POST` /api/workspaces/{user}/users.{_format} ###
+
+_Create a workspace_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**user**
+
+
+#### Parameters ####
+
+workspace_form:
+
+  * type: object (WorkspaceType)
+  * required: true
+
+workspace_form[name]:
+
+  * type: string
+  * required: true
+  * description: name
+
+workspace_form[code]:
+
+  * type: string
+  * required: true
+  * description: code
+
+workspace_form[description]:
+
+  * type: string
+  * required: false
+  * description: description
+
+workspace_form[displayable]:
+
+  * type: boolean
+  * required: false
+  * description: displayable_in_workspace_list
+
+workspace_form[selfRegistration]:
+
+  * type: boolean
+  * required: false
+  * description: public_registration
+
+workspace_form[registrationValidation]:
+
+  * type: boolean
+  * required: false
+  * description: registration_validation
+
+workspace_form[selfUnregistration]:
+
+  * type: boolean
+  * required: false
+  * description: public_unregistration
+
+workspace_form[maxStorageSize]:
+
+  * type: string
+  * required: true
+  * description: max_storage_size
+
+workspace_form[maxUploadResources]:
+
+  * type: string
+  * required: true
+  * description: max_amount_resources
+
+workspace_form[maxUsers]:
+
+  * type: string
+  * required: true
+  * description: workspace_max_users
+
+workspace_form[endDate]:
+
+  * type: datetime
+  * required: true
+  * description: expiration_date
+
+
+### `GET` /api/workspaces/{workspace}.{_format} ###
+
+_Returns a workspace_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**workspace**
+
+
+
+### `DELETE` /api/workspaces/{workspace}.{_format} ###
+
+_Removes a workspace_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**workspace**
+
+
+
+### `PUT` /api/workspaces/{workspace}/users/{user}.{_format} ###
+
+_Update a workspace_
+
+#### Requirements ####
+
+**_format**
+
+  - Requirement: json|xml
+**workspace**
+
+**user**
+
+
+#### Parameters ####
+
+workspace_form:
+
+  * type: object (WorkspaceType)
+  * required: false
+
+workspace_form[name]:
+
+  * type: string
+  * required: true
+  * description: name
+
+workspace_form[code]:
+
+  * type: string
+  * required: true
+  * description: code
+
+workspace_form[description]:
+
+  * type: string
+  * required: false
+  * description: description
+
+workspace_form[displayable]:
+
+  * type: boolean
+  * required: false
+  * description: displayable_in_workspace_list
+
+workspace_form[selfRegistration]:
+
+  * type: boolean
+  * required: false
+  * description: public_registration
+
+workspace_form[registrationValidation]:
+
+  * type: boolean
+  * required: false
+  * description: registration_validation
+
+workspace_form[selfUnregistration]:
+
+  * type: boolean
+  * required: false
+  * description: public_unregistration
+
+workspace_form[maxStorageSize]:
+
+  * type: string
+  * required: true
+  * description: max_storage_size
+
+workspace_form[maxUploadResources]:
+
+  * type: string
+  * required: true
+  * description: max_amount_resources
+
+workspace_form[maxUsers]:
+
+  * type: string
+  * required: true
+  * description: workspace_max_users
+
+workspace_form[endDate]:
+
+  * type: datetime
+  * required: true
+  * description: expiration_date

From 15f428f9885f6350f2778d9eab07c9e85de822fe Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 15:36:42 +0200
Subject: [PATCH 10/24] Fixing markdown.

---
 Resources/doc/api/group.md      | 7 +++++++
 Resources/doc/api/parameters.md | 1 +
 Resources/doc/api/user.md       | 8 ++++++++
 Resources/doc/api/workspace.md  | 5 +++++
 4 files changed, 21 insertions(+)

diff --git a/Resources/doc/api/group.md b/Resources/doc/api/group.md
index dd0d992a5..8a5fd35be 100644
--- a/Resources/doc/api/group.md
+++ b/Resources/doc/api/group.md
@@ -9,6 +9,7 @@ _Returns the groups list_
   - Requirement: json|xml
 
 
+
 ### `POST` /api/groups.{_format} ###
 
 _Create a group_
@@ -19,6 +20,7 @@ _Create a group_
 
   - Requirement: json|xml
 
+
 #### Parameters ####
 
 group_form:
@@ -42,6 +44,7 @@ _Returns a group_
 **_format**
 
   - Requirement: json|xml
+
 **group**
 
 
@@ -55,6 +58,7 @@ _Update a group_
 **_format**
 
   - Requirement: json|xml
+
 **group**
 
 
@@ -81,6 +85,7 @@ _Removes a group_
 **_format**
 
   - Requirement: json|xml
+
 **group**
 
 
@@ -94,6 +99,7 @@ _Add a role to a group_
 **_format**
 
   - Requirement: json|xml
+
 **group**
 
 **role**
@@ -109,6 +115,7 @@ _Remove a role from a group_
 **_format**
 
   - Requirement: json|xml
+
 **group**
 
 **role**
diff --git a/Resources/doc/api/parameters.md b/Resources/doc/api/parameters.md
index 1451b3743..6801f3d4e 100644
--- a/Resources/doc/api/parameters.md
+++ b/Resources/doc/api/parameters.md
@@ -8,6 +8,7 @@ _Update/Add a parameters in the platform_options.yml file_
 
   - Requirement: json|xml
 
+
 #### Parameters ####
 
 parameter_name:
diff --git a/Resources/doc/api/user.md b/Resources/doc/api/user.md
index 6282fd5aa..6747ff27c 100644
--- a/Resources/doc/api/user.md
+++ b/Resources/doc/api/user.md
@@ -9,6 +9,7 @@ _Returns the users list_
   - Requirement: json|xml
 
 
+
 ### `POST` /api/users.{_format} ###
 
 _Creates a user_
@@ -19,6 +20,7 @@ _Creates a user_
 
   - Requirement: json|xml
 
+
 #### Parameters ####
 
 profile_form_creation:
@@ -107,6 +109,7 @@ _Returns a user_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 
@@ -120,6 +123,7 @@ _Update a user_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 
@@ -206,6 +210,7 @@ _Add a user in a group_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 **group**
@@ -221,6 +226,7 @@ _Remove a user from a group_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 **group**
@@ -236,6 +242,7 @@ _Add a role to a user_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 **role**
@@ -251,6 +258,7 @@ _remove a role from a user_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 **role**
diff --git a/Resources/doc/api/workspace.md b/Resources/doc/api/workspace.md
index 308797f1d..c21a950f7 100644
--- a/Resources/doc/api/workspace.md
+++ b/Resources/doc/api/workspace.md
@@ -9,6 +9,7 @@ _Returns the workspaces list_
   - Requirement: json|xml
 
 
+
 ### `POST` /api/workspaces/{user}/users.{_format} ###
 
 _Create a workspace_
@@ -18,6 +19,7 @@ _Create a workspace_
 **_format**
 
   - Requirement: json|xml
+
 **user**
 
 
@@ -104,6 +106,7 @@ _Returns a workspace_
 **_format**
 
   - Requirement: json|xml
+
 **workspace**
 
 
@@ -117,6 +120,7 @@ _Removes a workspace_
 **_format**
 
   - Requirement: json|xml
+
 **workspace**
 
 
@@ -130,6 +134,7 @@ _Update a workspace_
 **_format**
 
   - Requirement: json|xml
+
 **workspace**
 
 **user**

From 300a200d7df5041532773c959c34802920c5d996 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 15:40:35 +0200
Subject: [PATCH 11/24] More markdown fixes

---
 Resources/doc/api/group.md      | 20 +++++++-------------
 Resources/doc/api/parameters.md |  3 +--
 Resources/doc/api/user.md       | 23 ++++++++---------------
 Resources/doc/api/workspace.md  | 15 +++++----------
 4 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/Resources/doc/api/group.md b/Resources/doc/api/group.md
index 8a5fd35be..5697e4d89 100644
--- a/Resources/doc/api/group.md
+++ b/Resources/doc/api/group.md
@@ -4,23 +4,21 @@ _Returns the groups list_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 
-
 ### `POST` /api/groups.{_format} ###
 
 _Create a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
-
 #### Parameters ####
 
 group_form:
@@ -41,27 +39,25 @@ _Returns a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **group**
 
 
-
 ### `PUT` /api/groups/{group}.{_format} ###
 
 _Update a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **group**
 
-
 #### Parameters ####
 
 group_form:
@@ -82,22 +78,21 @@ _Removes a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **group**
 
 
-
 ### `PATCH` /api/groups/{group}/roles/{role}/add.{_format} ###
 
 _Add a role to a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **group**
@@ -105,15 +100,14 @@ _Add a role to a group_
 **role**
 
 
-
 ### `GET` /api/groups/{group}/roles/{role}/remove.{_format} ###
 
 _Remove a role from a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **group**
diff --git a/Resources/doc/api/parameters.md b/Resources/doc/api/parameters.md
index 6801f3d4e..25e45579b 100644
--- a/Resources/doc/api/parameters.md
+++ b/Resources/doc/api/parameters.md
@@ -4,11 +4,10 @@ _Update/Add a parameters in the platform_options.yml file_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
-
 #### Parameters ####
 
 parameter_name:
diff --git a/Resources/doc/api/user.md b/Resources/doc/api/user.md
index 6747ff27c..91b84b126 100644
--- a/Resources/doc/api/user.md
+++ b/Resources/doc/api/user.md
@@ -4,23 +4,21 @@ _Returns the users list_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 
-
 ### `POST` /api/users.{_format} ###
 
 _Creates a user_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
-
 #### Parameters ####
 
 profile_form_creation:
@@ -106,27 +104,25 @@ _Returns a user_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
 
 
-
 ### `PUT` /api/users/{user}.{_format} ###
 
 _Update a user_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
 
-
 #### Parameters ####
 
 profile_form:
@@ -207,8 +203,8 @@ _Add a user in a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
@@ -216,15 +212,14 @@ _Add a user in a group_
 **group**
 
 
-
 ### `GET` /api/users/{user}/groups/{group}/remove.{_format} ###
 
 _Remove a user from a group_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
@@ -232,15 +227,14 @@ _Remove a user from a group_
 **group**
 
 
-
 ### `PATCH` /api/users/{user}/roles/{role}/add.{_format} ###
 
 _Add a role to a user_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
@@ -248,15 +242,14 @@ _Add a role to a user_
 **role**
 
 
-
 ### `GET` /api/users/{user}/roles/{role}/remove.{_format} ###
 
 _remove a role from a user_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
diff --git a/Resources/doc/api/workspace.md b/Resources/doc/api/workspace.md
index c21a950f7..0207e03f6 100644
--- a/Resources/doc/api/workspace.md
+++ b/Resources/doc/api/workspace.md
@@ -4,25 +4,23 @@ _Returns the workspaces list_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 
-
 ### `POST` /api/workspaces/{user}/users.{_format} ###
 
 _Create a workspace_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **user**
 
-
 #### Parameters ####
 
 workspace_form:
@@ -103,43 +101,40 @@ _Returns a workspace_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **workspace**
 
 
-
 ### `DELETE` /api/workspaces/{workspace}.{_format} ###
 
 _Removes a workspace_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **workspace**
 
 
-
 ### `PUT` /api/workspaces/{workspace}/users/{user}.{_format} ###
 
 _Update a workspace_
 
 #### Requirements ####
 
-**_format**
 
+**_format**
   - Requirement: json|xml
 
 **workspace**
 
 **user**
 
-
 #### Parameters ####
 
 workspace_form:

From af4a6de865169ce2f5099f1c0e4f81dbcefd445b Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 22 Jul 2015 17:59:34 +0200
Subject: [PATCH 12/24] codemirror integration

---
 Resources/config/suggested/fos_rest.yml |  2 --
 Resources/public/js/tinymce/tinymce.js  | 10 ++++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Resources/config/suggested/fos_rest.yml b/Resources/config/suggested/fos_rest.yml
index 50bb88cae..3b8d30ab0 100644
--- a/Resources/config/suggested/fos_rest.yml
+++ b/Resources/config/suggested/fos_rest.yml
@@ -9,8 +9,6 @@ fos_rest:
         formats:
             json: true
             xml: true
-        templating_formats:
-            html: false
     format_listener:
         rules:
             priorities: ['json']
diff --git a/Resources/public/js/tinymce/tinymce.js b/Resources/public/js/tinymce/tinymce.js
index 6b2810479..865c0b9a6 100644
--- a/Resources/public/js/tinymce/tinymce.js
+++ b/Resources/public/js/tinymce/tinymce.js
@@ -21,8 +21,11 @@
     //Load external plugins
     tinymce.PluginManager.load('mention', home.asset + 'bundles/frontend/tinymce/plugins/mention/plugin.min.js');
     tinymce.PluginManager.load('accordion', home.asset + 'bundles/frontend/tinymce/plugins/accordion/plugin.min.js');
+    tinymce.PluginManager.load('codemirror', home.asset + 'bundles/frontend/tinymce/plugins/codemirror/plugin.min.js');
     tinymce.DOM.loadCSS(home.asset + 'bundles/frontend/tinymce/plugins/mention/css/autocomplete.css');
 
+    var codemirrorPath = home.asset + 'bundles/frontend/tinymce/plugins/codemirror/codemirror-4.8';
+
     /**
      * Claroline TinyMCE parameters and methods.
      */
@@ -251,6 +254,9 @@
         },
         'picker': {
             'openResourcesInNewTab': false
+        },
+        'codemirror': {
+            'path': codemirrorPath
         }
     };
 
@@ -267,10 +273,10 @@
                 'autoresize advlist autolink lists link image charmap print preview hr anchor pagebreak',
                 'searchreplace wordcount visualblocks visualchars fullscreen',
                 'insertdatetime media nonbreaking save table directionality',
-                'template paste textcolor emoticons code -mention -accordion'
+                'template paste textcolor emoticons code -mention -accordion -codemirror'
             ];
 
-            var toolbar1 = 'bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | fullscreen displayAllButtons |'
+            var toolbar1 = 'bold italic underline strikethrough | alignleft aligncenter alignright alignjustify | fullscreen displayAllButtons'
 
             $.each(tinymce.claroline.plugins, function(key, value) {
                 if (value === true) {

From 502fc879e82cf1674fa2dfd14c7243a87bb0c809 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Thu, 23 Jul 2015 11:49:18 +0200
Subject: [PATCH 13/24] Resource creation ordered.

---
 Controller/ResourceController.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Controller/ResourceController.php b/Controller/ResourceController.php
index 9ac06779f..b0b72e4f5 100644
--- a/Controller/ResourceController.php
+++ b/Controller/ResourceController.php
@@ -634,11 +634,19 @@ public function openDirectoryAction(ResourceNode $node = null)
 
         unset($element);
 
+        $sorted = array();
+
+        foreach ($creatableTypes as $type) {
+            $sorted[$this->translator->trans($type, array(), 'resource')] = $type;
+        }
+
+        ksort($sorted);
+
         $jsonResponse = new JsonResponse(
             array(
                 'id'                => $directoryId,
                 'path'              => $path,
-                'creatableTypes'    => $creatableTypes,
+                'creatableTypes'    => $sorted,
                 'nodes'             => $nodesWithCreatorPerms,
                 'canChangePosition' => $canChangePosition,
                 'workspace_id'      => $workspaceId,
@@ -969,10 +977,10 @@ public function changeZoom($zoom)
     public function exportAction(array $nodes)
     {
         if (count($nodes) === 0) {
-            
+
             throw new \Exception('No resource to export');
         }
-            
+
         $workspace = $nodes[0]->getWorkspace();
         $archive = $this->transferManager->exportResources($workspace, $nodes);
         $fileName = $workspace->getCode() . '.zip';

From f2a66c0225696f0a92183f98faf6c5d7010609dc Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Thu, 23 Jul 2015 14:15:28 +0200
Subject: [PATCH 14/24] Default personal workspace template is now different.

---
 .../Required/Data/LoadTemplateData.php        |   6 ++-
 Library/Installation/AdditionalInstaller.php  |   4 ++
 .../Installation/Updater/Updater060000.php    |  41 ++++++++++++++++++
 Manager/UserManager.php                       |   6 +--
 Resources/config/parameters.yml               |   1 +
 Resources/template/manifest.yml               |  39 +++++++++++++++++
 Resources/template/personal.zip               | Bin 0 -> 375 bytes
 7 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 Library/Installation/Updater/Updater060000.php
 create mode 100644 Resources/template/manifest.yml
 create mode 100644 Resources/template/personal.zip

diff --git a/DataFixtures/Required/Data/LoadTemplateData.php b/DataFixtures/Required/Data/LoadTemplateData.php
index d5b74415d..282615199 100644
--- a/DataFixtures/Required/Data/LoadTemplateData.php
+++ b/DataFixtures/Required/Data/LoadTemplateData.php
@@ -23,9 +23,11 @@ class LoadTemplateData implements RequiredFixture
     public function load(ObjectManager $manager)
     {
         $destinationPath = $this->container->getParameter('claroline.param.templates_directory'). '/default.zip';
-        $sourcePath = $this->container->getParameter('claroline.param.default_template');
         @unlink($destinationPath);
-        copy($sourcePath, $destinationPath);
+        copy($this->container->getParameter('claroline.param.default_template'), $destinationPath);
+        $destinationPath = $this->container->getParameter('claroline.param.templates_directory'). '/personal.zip';
+        @unlink($destinationPath);
+        copy($this->container->getParameter('claroline.param.personal_template'), $destinationPath);
     }
 
     public function setContainer($container)
diff --git a/Library/Installation/AdditionalInstaller.php b/Library/Installation/AdditionalInstaller.php
index 7fa508b30..931380f24 100644
--- a/Library/Installation/AdditionalInstaller.php
+++ b/Library/Installation/AdditionalInstaller.php
@@ -214,6 +214,10 @@ public function postUpdate($currentVersion, $targetVersion)
                 $updater = new Updater\Updater050108($this->container);
                 $updater->setLogger($this->logger);
                 $updater->postUpdate();
+            case version_compare($currentVersion, '6.0.0', '<'):
+                $updater = new Updater\Updater060000($this->container);
+                $updater->setLogger($this->logger);
+                $updater->postUpdate();
         }
     }
 
diff --git a/Library/Installation/Updater/Updater060000.php b/Library/Installation/Updater/Updater060000.php
new file mode 100644
index 000000000..2371e39bb
--- /dev/null
+++ b/Library/Installation/Updater/Updater060000.php
@@ -0,0 +1,41 @@
+<?php
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Library\Installation\Updater;
+
+use Claroline\CoreBundle\Entity\Resource\ResourceIcon;
+use Claroline\CoreBundle\Entity\Tool\OrderedTool;
+use Claroline\CoreBundle\Entity\Tool\Tool;
+use Claroline\CoreBundle\Library\Utilities\FileSystem;
+use Claroline\InstallationBundle\Updater\Updater;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+class Updater060000 extends Updater
+{
+    private $container;
+
+    public function __construct(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    public function postUpdate()
+    {
+        $this->updateTemplate();
+    }
+
+    private function updateTemplate()
+    {
+        $this->log('Updating template file');
+        $destinationPath = $this->container->getParameter('claroline.param.templates_directory'). '/personal.zip';
+        @unlink($destinationPath);
+        copy($this->container->getParameter('claroline.param.personal_template'), $destinationPath);
+    }
+}
diff --git a/Manager/UserManager.php b/Manager/UserManager.php
index b7d633ad5..1626be787 100644
--- a/Manager/UserManager.php
+++ b/Manager/UserManager.php
@@ -63,7 +63,7 @@ class UserManager
      * Constructor.
      *
      * @DI\InjectParams({
-     *     "personalWsTemplateFile" = @DI\Inject("%claroline.param.templates_directory%"),
+     *     "templateDir"            = @DI\Inject("%claroline.param.templates_directory%"),
      *     "mailManager"            = @DI\Inject("claroline.manager.mail_manager"),
      *     "objectManager"          = @DI\Inject("claroline.persistence.object_manager"),
      *     "pagerFactory"           = @DI\Inject("claroline.pager.pager_factory"),
@@ -80,7 +80,7 @@ class UserManager
      * })
      */
     public function __construct(
-        $personalWsTemplateFile,
+        $templateDir,
         MailManager $mailManager,
         ObjectManager $objectManager,
         PagerFactory $pagerFactory,
@@ -101,7 +101,7 @@ public function __construct(
         $this->workspaceManager       = $workspaceManager;
         $this->toolManager            = $toolManager;
         $this->strictEventDispatcher  = $strictEventDispatcher;
-        $this->personalWsTemplateFile = $personalWsTemplateFile . "default.zip";
+        $this->personalWsTemplateFile = $templateDir . "personal.zip";
         $this->translator             = $translator;
         $this->platformConfigHandler  = $platformConfigHandler;
         $this->pagerFactory           = $pagerFactory;
diff --git a/Resources/config/parameters.yml b/Resources/config/parameters.yml
index f3b168f83..5d18f9679 100644
--- a/Resources/config/parameters.yml
+++ b/Resources/config/parameters.yml
@@ -14,6 +14,7 @@ parameters:
     claroline.param.relative_thumbnail_base_path: "uploads/thumbnails"
     claroline.param.templates_directory: "%claroline.param.files_directory%/templates/"
     claroline.param.default_template: "%kernel.root_dir%/../vendor/claroline/core-bundle/Claroline/CoreBundle/Resources/template/default.zip"
+    claroline.param.personal_template: "%kernel.root_dir%/../vendor/claroline/core-bundle/Claroline/CoreBundle/Resources/template/personal.zip"
     claroline.param.plugin_skel_directory: "%kernel.root_dir%/../vendor/claroline/core-bundle/Claroline/CoreBundle/Resources/bundle-creator/skel"
     claroline.param.plugin_template_resource_directory: "%kernel.root_dir%/../vendor/claroline/core-bundle/Claroline/CoreBundle/Resources/bundle-creator/optional/resource"
     claroline.param.plugin_template_tool_directory: "%kernel.root_dir%/../vendor/claroline/core-bundle/Claroline/CoreBundle/Resources/bundle-creator/optional/tool"
diff --git a/Resources/template/manifest.yml b/Resources/template/manifest.yml
new file mode 100644
index 000000000..4d1c11281
--- /dev/null
+++ b/Resources/template/manifest.yml
@@ -0,0 +1,39 @@
+properties:
+    name: 'default'
+    code: default
+    visible: true
+    self_registration: true
+    self_unregistration: true
+    owner: null
+
+roles:
+    -
+        role:
+            name: ROLE_WS_COLLABORATOR
+            translation: collaborator
+            is_base_role: false
+tools:
+    -
+        tool:
+            type: resource_manager
+            translation: resource_manager
+            roles:
+                -
+                    name: ROLE_WS_COLLABORATOR
+            data:
+                root:
+                    uid: 0
+                    roles:
+                        -
+                            role:
+                                name: ROLE_WS_COLLABORATOR
+                                rights:
+                                    open: true
+                                    export: true
+    -
+        tool:
+            type: home
+            translation: home
+            roles:
+                -
+                    name: ROLE_WS_COLLABORATOR
diff --git a/Resources/template/personal.zip b/Resources/template/personal.zip
new file mode 100644
index 0000000000000000000000000000000000000000..65d81e21195b6e445efcaf502d8731e1bdcd9bf2
GIT binary patch
literal 375
zcmWIWW@Zs#W?<l8P%rrIX4q7+<SzpQ!&#sR50K7H%*#wmEiTck%+1+4$v^vug22)D
zKSg%FU3sB6@Ajo=g$ZI+B9nbK9Xc{G@b~lE*H4IfHb;nklePJi_Qkf8XEI|MS5EL%
z$EbA|t}N$FdwFrLl5{55n=YlF0b#rn3zGRKMjVJV&^cu_&2Qqr=+9QcOZ|E8T)Cwj
zCMx_-t@6gT6})a@Q-i+6{#Lpdf3*1ew&%;&+3zp?yH0mTW_S4Ei2_d@4$iN*zI2Vm
z5>~<7SCNZaPYFI$JkB<I@4@Yy(Goh9a*k_)PP1A}UwC2WyLnqa?|;au_VUR`54EC+
za!;;axzfKfq$9j%=Kn*p^`?rie)=eB&!!U&QU^9YI4!Vy%R_nL!iA!nf(2HW|NJQ*
n;LXTn&x|{ufMEp$3JpsdK{Rr(1$eWvfy5Yr&<aSaGlF;k#a5dt

literal 0
HcmV?d00001


From 6d9f7a25d978fcadc3b83f248c38d40e8b578cc1 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Fri, 24 Jul 2015 14:53:16 +0200
Subject: [PATCH 15/24] api oauth connection documentation.

---
 .../suggested/fos_oauth_server_config.yml     |  5 ++++
 Resources/config/suggested/security.yml       |  8 +++----
 Resources/doc/api/oauth.md                    | 24 +++++++++++++++++++
 3 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 Resources/doc/api/oauth.md

diff --git a/Resources/config/suggested/fos_oauth_server_config.yml b/Resources/config/suggested/fos_oauth_server_config.yml
index 4c70effb1..f99275216 100644
--- a/Resources/config/suggested/fos_oauth_server_config.yml
+++ b/Resources/config/suggested/fos_oauth_server_config.yml
@@ -4,3 +4,8 @@ fos_oauth_server:
     access_token_class:  Claroline\CoreBundle\Entity\Oauth\AccessToken
     refresh_token_class: Claroline\CoreBundle\Entity\Oauth\RefreshToken
     auth_code_class:     Claroline\CoreBundle\Entity\Oauth\AuthCode
+    service:
+        options:
+            access_token_lifetime: 3600
+            refresh_token_lifetime: 1209600
+            auth_code_lifetime: 30
diff --git a/Resources/config/suggested/security.yml b/Resources/config/suggested/security.yml
index 373228f38..4eb83e951 100644
--- a/Resources/config/suggested/security.yml
+++ b/Resources/config/suggested/security.yml
@@ -28,10 +28,10 @@ security:
                 use_referer: true
             anonymous: true
 
-        #api:
-            #pattern:    ^/api
-            #fos_oauth:  true
-            #stateless:  true
+        api:
+            pattern:    ^/api
+            fos_oauth:  true
+            stateless:  true
 
         main:
             pattern: ^/
diff --git a/Resources/doc/api/oauth.md b/Resources/doc/api/oauth.md
new file mode 100644
index 000000000..30687fb44
--- /dev/null
+++ b/Resources/doc/api/oauth.md
@@ -0,0 +1,24 @@
+Oauth Connection
+=================
+- [Client generation](#client-generation)
+- [Oauth connection](#oauth-connection)
+- [Api usage](#api-usage)
+
+Client generation
+-----------------
+- Go into administration => parameters => oauth => claroline (CLIENT_HOST/admin/oauth/).
+- Create a new client here.
+
+Oauth connection
+----------------
+- request this url: CLIENT_HOST/oauth/v2/token?client_id=CLIENT_ID&client_secret=CLIENT_SECRET&grant_type=client_credentials
+- Store the returned access_token somewhere (you'll need it later).
+
+Oauth refresh
+-------------
+- TODO
+
+Api usage
+---------
+- Once you have your access token, you can access the api by passing the access_token as an url parameter.
+> CLIENT_HOST/api/path/to/url.json?access_token=TOKEN

From 49f58c2abe0fe69fb8f18390c38cafc81811e96d Mon Sep 17 00:00:00 2001
From: Godfraind <nicolas.godfraind@gmail.com>
Date: Fri, 24 Jul 2015 14:54:53 +0200
Subject: [PATCH 16/24] Update oauth.md

---
 Resources/doc/api/oauth.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/doc/api/oauth.md b/Resources/doc/api/oauth.md
index 30687fb44..1a02d81f1 100644
--- a/Resources/doc/api/oauth.md
+++ b/Resources/doc/api/oauth.md
@@ -21,4 +21,5 @@ Oauth refresh
 Api usage
 ---------
 - Once you have your access token, you can access the api by passing the access_token as an url parameter.
+
 > CLIENT_HOST/api/path/to/url.json?access_token=TOKEN

From 44eaa3c879c73763a338dd6978cc52bfe3c0acea Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Mon, 27 Jul 2015 14:21:51 +0200
Subject: [PATCH 17/24] Wrapper for the curl api.

---
 Command/Dev/ApiTestCommand.php                | 78 +++++++++++++++++++
 Controller/Administration/OauthController.php |  3 +-
 Entity/Oauth/ClarolineAccess.php              | 66 ++++++++++++++++
 Form/Administration/OauthClientType.php       |  2 +-
 Manager/ApiManager.php                        | 60 ++++++++++++++
 Manager/CurlManager.php                       | 41 ++++++++++
 Manager/OauthManager.php                      | 39 +++++++++-
 .../pdo_mysql/Version20150727141151.php       | 39 ++++++++++
 8 files changed, 324 insertions(+), 4 deletions(-)
 create mode 100644 Command/Dev/ApiTestCommand.php
 create mode 100644 Entity/Oauth/ClarolineAccess.php
 create mode 100644 Manager/ApiManager.php
 create mode 100644 Manager/CurlManager.php
 create mode 100644 Migrations/pdo_mysql/Version20150727141151.php

diff --git a/Command/Dev/ApiTestCommand.php b/Command/Dev/ApiTestCommand.php
new file mode 100644
index 000000000..57c34b7db
--- /dev/null
+++ b/Command/Dev/ApiTestCommand.php
@@ -0,0 +1,78 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Command\Dev;
+
+use Symfony\Bundle\FrameworkBundle\Command\ContainerAwareCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Input\InputArgument;
+use Claroline\CoreBundle\Library\Workspace\Configuration;
+
+class ApiTestCommand extends ContainerAwareCommand
+{
+    protected function configure()
+    {
+        $this->setName('claroline:api:test')->setDescription('Tests the api');
+        $this->setDefinition(
+            array(
+                new InputArgument('host', InputArgument::REQUIRED, 'The host'),
+                new InputArgument('url', InputArgument::REQUIRED, 'The url'),
+                new InputArgument('client_name', InputArgument::REQUIRED, 'The client name')
+            )
+        );
+    }
+
+    protected function interact(InputInterface $input, OutputInterface $output)
+    {
+        $params = array(
+            'host' => 'The host',
+            'url' => 'The url',
+            'client_name' => 'The client name'
+        );
+
+        foreach ($params as $argument => $argumentName) {
+            if (!$input->getArgument($argument)) {
+                $input->setArgument(
+                    $argument, $this->askArgument($output, $argumentName)
+                );
+            }
+        }
+    }
+
+    protected function askArgument(OutputInterface $output, $argumentName)
+    {
+        $argument = $this->getHelper('dialog')->askAndValidate(
+            $output,
+            "Enter the {$argumentName}: ",
+            function ($argument) {
+                if (empty($argument)) {
+                    throw new \Exception('This argument is required');
+                }
+
+                return $argument;
+            }
+        );
+
+        return $argument;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $apiManager = $this->getContainer()->get('claroline.manager.api_manager');
+        $host = $input->getArgument('host');
+        $url = $input->getArgument('url');
+        $clientName = $input->getArgument('client_name');
+        $client = $this->getContainer()->get('claroline.manager.oauth_manager')->findClientBy(array('name' => $clientName));
+        $response = $apiManager->url($host, $url, $client);
+        echo $response;
+    }
+}
diff --git a/Controller/Administration/OauthController.php b/Controller/Administration/OauthController.php
index 8f58ea5cc..b30889291 100644
--- a/Controller/Administration/OauthController.php
+++ b/Controller/Administration/OauthController.php
@@ -97,13 +97,12 @@ public function modalCreateFormAction()
     public function createClientAction()
     {
         $form = $this->get('form.factory')->create(new OauthClientType());
-
         $form->handleRequest($this->request);
 
         if ($form->isValid()) {
             $grantTypes = $form->get('allowed_grant_types')->getData();
             $client = $this->oauthManager->createClient();
-            $client->setRedirectUris(array($form->get('uri')->getData()));
+            if ($uri = $form->get('uri')->getData()) $client->setRedirectUris(array($uri));
             $client->setAllowedGrantTypes($grantTypes);
             $client->setName($form->get('name')->getData());
             $this->oauthManager->updateClient($client);
diff --git a/Entity/Oauth/ClarolineAccess.php b/Entity/Oauth/ClarolineAccess.php
new file mode 100644
index 000000000..884c0aca1
--- /dev/null
+++ b/Entity/Oauth/ClarolineAccess.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Entity\Oauth;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="claro_api_claroline_access")
+ * @ORM\Entity
+ */
+class ClarolineAccess
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\Oauth\Client", inversedBy="authCodes")
+     * @ORM\JoinColumn(nullable=false)
+     */
+    protected $client;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="access_token", type="string", nullable=false)
+     */
+    protected $accessToken;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setClient(Client $client)
+    {
+        $this->client = $client;
+    }
+
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    public function setAccessToken($accessToken)
+    {
+        $this->accessToken = $accessToken;
+    }
+
+    public function getAccessToken()
+    {
+        return $this->accessToken;
+    }
+}
diff --git a/Form/Administration/OauthClientType.php b/Form/Administration/OauthClientType.php
index f2dc3ec71..a4ff68bd1 100644
--- a/Form/Administration/OauthClientType.php
+++ b/Form/Administration/OauthClientType.php
@@ -46,7 +46,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
         $builder->add(
             'uri',
             'text',
-            array('label' => 'uri', 'constraints' => new NotBlank())
+            array('label' => 'uri')
         );
     }
 
diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
new file mode 100644
index 000000000..88328796d
--- /dev/null
+++ b/Manager/ApiManager.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Manager;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use Claroline\CoreBundle\Persistence\ObjectManager;
+use Claroline\CoreBundle\Entity\Oauth\Client;
+
+/**
+ * @DI\Service("claroline.manager.api_manager")
+ */
+class ApiManager
+{
+
+    /**
+     * @DI\InjectParams({
+     *     "om"           = @DI\Inject("claroline.persistence.object_manager"),
+     *     "oauthManager" = @DI\Inject("claroline.manager.oauth_manager"),
+     *     "curlManager"  = @DI\Inject("claroline.manager.curl_manager")
+     * })
+     */
+    public function __construct(
+        ObjectManager $om,
+        OauthManager $oauthManager,
+        CurlManager $curlManager
+    )
+    {
+        $this->om = $om;
+        $this->oauthManager = $oauthManager;
+        $this->curlManager = $curlManager;
+    }
+
+    public function url($host, $url, Client $client, $payload = null, $type = 'GET')
+    {
+        $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
+            ->findOneByClient($client);
+        if (!$access) $this->oauthManager->connect($host, $client);
+        $url = $host . '/' . $url . '?access_token=' . $access->getAccessToken();
+        $serverOutput = $this->curlManager->exec($url, $type);
+        $json = json_decode($serverOutput);
+
+        if ($json) {
+            if ($json->error === 'access_denied') {
+                $this->oauthManager->connect($host, $client);
+                $this->url($host, $url, $client, $payload, $type);
+            }
+        }
+
+        return $serverOutput;
+    }
+}
diff --git a/Manager/CurlManager.php b/Manager/CurlManager.php
new file mode 100644
index 000000000..6dc957ed6
--- /dev/null
+++ b/Manager/CurlManager.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Manager;
+
+use JMS\DiExtraBundle\Annotation as DI;
+use Claroline\CoreBundle\Event\StrictDispatcher;
+use Claroline\CoreBundle\Entity\Oauth\Client;
+
+/**
+ * @DI\Service("claroline.manager.curl_manager")
+ */
+class CurlManager
+{
+    public function exec($url, $type = 'GET')
+    {
+        $ch = curl_init();
+        curl_setopt($ch, CURLOPT_URL, $url);
+
+        switch ($type) {
+            case 'POST': curl_setopt($ch, CURLOPT_POST, 1); break;
+            case 'PUT': curl_setopt($ch, CURLOPT_PUT, 1); break;
+        }
+
+        //$qs = http_build_query(array('payload' => $payload));
+        //curl_setopt($ch, CURLOPT_POSTFIELDS, $qs);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $serverOutput = curl_exec($ch);
+        curl_close($ch);
+
+        return $serverOutput;
+    }
+}
diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index f74f7bf16..3d42c4237 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -15,19 +15,56 @@
 use Claroline\CoreBundle\Event\StrictDispatcher;
 use FOS\OAuthServerBundle\Entity\ClientManager;
 use Claroline\CoreBundle\Entity\Oauth\Client;
+use Claroline\CoreBundle\Entity\Oauth\ClarolineAccess;
+use Claroline\CoreBundle\Persistence\ObjectManager;
 
 /**
  * @DI\Service("claroline.manager.oauth_manager", parent="fos_oauth_server.client_manager.default")
  */
 class OauthManager extends ClientManager
 {
+    /** @DI\Inject("claroline.manager.curl_manager") */
+    public $curlManager;
+    /** @DI\Inject("claroline.persistence.object_manager") */
+    public $om;
+
     public function findAllClients()
     {
         return $this->repository->findAll();
     }
 
-    public function connect(Client $client)
+    public function connect($host, Client $client)
     {
+        $url = $host . '/oauth/v2/token?client_id=' .
+            $client->getId() . '_' . $client->getRandomId() . '&client_secret=' .
+            $client->getSecret() . '&grant_type=client_credentials';
+
+        $serverOutput = $this->curlManager->exec($url);
+        $json = json_decode($serverOutput);
+
+        if (property_exists($json, 'access_token')) {
+            $this->createAccess($client, $json->access_token);
+            return;
+        }
 
+        throw new \Exception('The oauth connection for client ' . $client->getName() . ' could not be initialized');
+    }
+
+    /**
+     * Only 1 access per client !
+     */
+    private function createAccess(Client $client, $token)
+    {
+        //1st step, remove any existing access
+        $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
+            ->findOneByClient($client);
+        $this->om->remove($access);
+        $this->om->flush();
+        //2nd step, creates a new access
+        $access = new ClarolineAccess();
+        $access->setClient($client);
+        $access->setAccessToken($token);
+        $this->om->persist($access);
+        $this->om->flush();
     }
 }
diff --git a/Migrations/pdo_mysql/Version20150727141151.php b/Migrations/pdo_mysql/Version20150727141151.php
new file mode 100644
index 000000000..aadf253bd
--- /dev/null
+++ b/Migrations/pdo_mysql/Version20150727141151.php
@@ -0,0 +1,39 @@
+<?php
+
+namespace Claroline\CoreBundle\Migrations\pdo_mysql;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated migration based on mapping information: modify it with caution
+ *
+ * Generation date: 2015/07/27 02:11:51
+ */
+class Version20150727141151 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->addSql("
+            CREATE TABLE claro_api_claroline_access (
+                id INT AUTO_INCREMENT NOT NULL, 
+                client_id INT NOT NULL, 
+                access_token VARCHAR(255) NOT NULL, 
+                INDEX IDX_2B10E8B119EB6921 (client_id), 
+                PRIMARY KEY(id)
+            ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
+        ");
+        $this->addSql("
+            ALTER TABLE claro_api_claroline_access 
+            ADD CONSTRAINT FK_2B10E8B119EB6921 FOREIGN KEY (client_id) 
+            REFERENCES claro_api_client (id)
+        ");
+    }
+
+    public function down(Schema $schema)
+    {
+        $this->addSql("
+            DROP TABLE claro_api_claroline_access
+        ");
+    }
+}
\ No newline at end of file

From 56437b7a2d89c5963956e1a971d9f0b0ed0bb6da Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Mon, 27 Jul 2015 16:24:14 +0200
Subject: [PATCH 18/24] oauth

---
 Command/Dev/ApiTestCommand.php                  |  2 +-
 Entity/Oauth/ClarolineAccess.php                | 15 ++++++++-------
 Entity/Oauth/Client.php                         |  5 +++++
 Manager/ApiManager.php                          | 12 ++++++------
 Manager/CurlManager.php                         | 16 +++++++++++++---
 Manager/OauthManager.php                        | 17 +++++++++--------
 ...0727141151.php => Version20150727162008.php} | 12 +++---------
 7 files changed, 45 insertions(+), 34 deletions(-)
 rename Migrations/pdo_mysql/{Version20150727141151.php => Version20150727162008.php} (64%)

diff --git a/Command/Dev/ApiTestCommand.php b/Command/Dev/ApiTestCommand.php
index 57c34b7db..282035f6b 100644
--- a/Command/Dev/ApiTestCommand.php
+++ b/Command/Dev/ApiTestCommand.php
@@ -72,7 +72,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $url = $input->getArgument('url');
         $clientName = $input->getArgument('client_name');
         $client = $this->getContainer()->get('claroline.manager.oauth_manager')->findClientBy(array('name' => $clientName));
-        $response = $apiManager->url($host, $url, $client);
+        $response = $apiManager->url($host, $url, $client->getConcatRandomId(), $client->getSecret());
         echo $response;
     }
 }
diff --git a/Entity/Oauth/ClarolineAccess.php b/Entity/Oauth/ClarolineAccess.php
index 884c0aca1..5e1f419f5 100644
--- a/Entity/Oauth/ClarolineAccess.php
+++ b/Entity/Oauth/ClarolineAccess.php
@@ -27,10 +27,11 @@ class ClarolineAccess
     protected $id;
 
     /**
-     * @ORM\ManyToOne(targetEntity="Claroline\CoreBundle\Entity\Oauth\Client", inversedBy="authCodes")
-     * @ORM\JoinColumn(nullable=false)
+     * @var string
+     *
+     * @ORM\Column(name="random_id", type="string", nullable=false)
      */
-    protected $client;
+    protected $randomId;
 
     /**
      * @var string
@@ -44,14 +45,14 @@ public function getId()
         return $this->id;
     }
 
-    public function setClient(Client $client)
+    public function setRandomId($randomId)
     {
-        $this->client = $client;
+        $this->randomId = $randomId;
     }
 
-    public function getClient()
+    public function getRandomId()
     {
-        return $this->client;
+        return $this->randomId;
     }
 
     public function setAccessToken($accessToken)
diff --git a/Entity/Oauth/Client.php b/Entity/Oauth/Client.php
index 21f7ceabb..fbc1eb9b0 100644
--- a/Entity/Oauth/Client.php
+++ b/Entity/Oauth/Client.php
@@ -138,4 +138,9 @@ public function getRefreshTokens()
     {
         return $this->refreshTokens;
     }
+
+    public function getConcatRandomId()
+    {
+        return $this->id . '_' . $this->getRandomId();
+    }
 }
diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
index 88328796d..00eb39acf 100644
--- a/Manager/ApiManager.php
+++ b/Manager/ApiManager.php
@@ -39,19 +39,19 @@ public function __construct(
         $this->curlManager = $curlManager;
     }
 
-    public function url($host, $url, Client $client, $payload = null, $type = 'GET')
+    public function url($host, $url, $id, $secret, $payload = null, $type = 'GET')
     {
         $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
-            ->findOneByClient($client);
-        if (!$access) $this->oauthManager->connect($host, $client);
+            ->findOneByRandomId($id);
+        if (!$access) $this->oauthManager->connect($host, $id, $secret);
         $url = $host . '/' . $url . '?access_token=' . $access->getAccessToken();
-        $serverOutput = $this->curlManager->exec($url, $type);
+        $serverOutput = $this->curlManager->exec($url, $payload, $type);
         $json = json_decode($serverOutput);
 
         if ($json) {
             if ($json->error === 'access_denied') {
-                $this->oauthManager->connect($host, $client);
-                $this->url($host, $url, $client, $payload, $type);
+                $this->oauthManager->connect($host, $id, $secret);
+                $this->url($host, $url, $id, $secret, $payload, $type);
             }
         }
 
diff --git a/Manager/CurlManager.php b/Manager/CurlManager.php
index 6dc957ed6..1f670b48a 100644
--- a/Manager/CurlManager.php
+++ b/Manager/CurlManager.php
@@ -20,14 +20,14 @@
  */
 class CurlManager
 {
-    public function exec($url, $type = 'GET')
+    public function exec($url, $payload = null, $type = 'GET')
     {
         $ch = curl_init();
         curl_setopt($ch, CURLOPT_URL, $url);
 
         switch ($type) {
-            case 'POST': curl_setopt($ch, CURLOPT_POST, 1); break;
-            case 'PUT': curl_setopt($ch, CURLOPT_PUT, 1); break;
+            case 'POST': $this->setPostCurl($ch, $payload); break;
+            case 'PUT': $this->setPutCurl($ch, $payload); break;
         }
 
         //$qs = http_build_query(array('payload' => $payload));
@@ -38,4 +38,14 @@ public function exec($url, $type = 'GET')
 
         return $serverOutput;
     }
+
+    private function setPostCurl($ch, $payload)
+    {
+        curl_setopt($ch, CURLOPT_POST, 1);
+    }
+
+    private function setPutCurl($ch, $payload)
+    {
+        curl_setopt($ch, CURLOPT_PUT, 1);
+    }
 }
diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index 3d42c4237..295fd0ca7 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -33,36 +33,37 @@ public function findAllClients()
         return $this->repository->findAll();
     }
 
-    public function connect($host, Client $client)
+    public function connect($host, $id, $secret)
     {
         $url = $host . '/oauth/v2/token?client_id=' .
-            $client->getId() . '_' . $client->getRandomId() . '&client_secret=' .
-            $client->getSecret() . '&grant_type=client_credentials';
+            $id . '&client_secret=' .
+            $secret . '&grant_type=client_credentials';
 
         $serverOutput = $this->curlManager->exec($url);
+        echo $serverOutput;
         $json = json_decode($serverOutput);
 
         if (property_exists($json, 'access_token')) {
-            $this->createAccess($client, $json->access_token);
+            $this->createAccess($id, $json->access_token);
             return;
         }
 
-        throw new \Exception('The oauth connection for client ' . $client->getName() . ' could not be initialized');
+        throw new \Exception('The oauth connection for id ' . $id . ' could not be initialized');
     }
 
     /**
      * Only 1 access per client !
      */
-    private function createAccess(Client $client, $token)
+    private function createAccess($randomId, $token)
     {
         //1st step, remove any existing access
         $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
-            ->findOneByClient($client);
+            ->findOneByRandomId($randomId);
         $this->om->remove($access);
         $this->om->flush();
         //2nd step, creates a new access
         $access = new ClarolineAccess();
-        $access->setClient($client);
+        $access->setRandomId($id);
         $access->setAccessToken($token);
         $this->om->persist($access);
         $this->om->flush();
diff --git a/Migrations/pdo_mysql/Version20150727141151.php b/Migrations/pdo_mysql/Version20150727162008.php
similarity index 64%
rename from Migrations/pdo_mysql/Version20150727141151.php
rename to Migrations/pdo_mysql/Version20150727162008.php
index aadf253bd..11c84fd21 100644
--- a/Migrations/pdo_mysql/Version20150727141151.php
+++ b/Migrations/pdo_mysql/Version20150727162008.php
@@ -8,26 +8,20 @@
 /**
  * Auto-generated migration based on mapping information: modify it with caution
  *
- * Generation date: 2015/07/27 02:11:51
+ * Generation date: 2015/07/27 04:20:09
  */
-class Version20150727141151 extends AbstractMigration
+class Version20150727162008 extends AbstractMigration
 {
     public function up(Schema $schema)
     {
         $this->addSql("
             CREATE TABLE claro_api_claroline_access (
                 id INT AUTO_INCREMENT NOT NULL, 
-                client_id INT NOT NULL, 
+                random_id VARCHAR(255) NOT NULL, 
                 access_token VARCHAR(255) NOT NULL, 
-                INDEX IDX_2B10E8B119EB6921 (client_id), 
                 PRIMARY KEY(id)
             ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
         ");
-        $this->addSql("
-            ALTER TABLE claro_api_claroline_access 
-            ADD CONSTRAINT FK_2B10E8B119EB6921 FOREIGN KEY (client_id) 
-            REFERENCES claro_api_client (id)
-        ");
     }
 
     public function down(Schema $schema)

From eb016e75f8b786bb274f250d2e3b80be09685a5b Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Mon, 27 Jul 2015 17:08:02 +0200
Subject: [PATCH 19/24] api post is now working

---
 Manager/ApiManager.php   |  8 +++++---
 Manager/CurlManager.php  | 14 ++++++++++++++
 Manager/OauthManager.php |  9 +++++----
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
index 00eb39acf..c448e6b35 100644
--- a/Manager/ApiManager.php
+++ b/Manager/ApiManager.php
@@ -49,9 +49,11 @@ public function url($host, $url, $id, $secret, $payload = null, $type = 'GET')
         $json = json_decode($serverOutput);
 
         if ($json) {
-            if ($json->error === 'access_denied') {
-                $this->oauthManager->connect($host, $id, $secret);
-                $this->url($host, $url, $id, $secret, $payload, $type);
+            if (property_exists($json, 'error')) {
+                if ($json->error === 'access_denied') {
+                    $this->oauthManager->connect($host, $id, $secret);
+                    $this->url($host, $url, $id, $secret, $payload, $type);
+                }
             }
         }
 
diff --git a/Manager/CurlManager.php b/Manager/CurlManager.php
index 1f670b48a..12708d010 100644
--- a/Manager/CurlManager.php
+++ b/Manager/CurlManager.php
@@ -42,10 +42,24 @@ public function exec($url, $payload = null, $type = 'GET')
     private function setPostCurl($ch, $payload)
     {
         curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $this->urlify($payload));
     }
 
     private function setPutCurl($ch, $payload)
     {
         curl_setopt($ch, CURLOPT_PUT, 1);
     }
+
+    private function urlify($payload)
+    {
+        $string = '';
+
+        foreach ($payload as $key => $value) {
+            $string .= $key.'='.$value.'&';
+        }
+
+        rtrim($string, '&');
+
+        return $string;
+    }
 }
diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index 295fd0ca7..b7f6ced1e 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -40,7 +40,6 @@ public function connect($host, $id, $secret)
             $secret . '&grant_type=client_credentials';
 
         $serverOutput = $this->curlManager->exec($url);
-        echo $serverOutput;
         $json = json_decode($serverOutput);
 
         if (property_exists($json, 'access_token')) {
@@ -59,11 +58,13 @@ private function createAccess($randomId, $token)
         //1st step, remove any existing access
         $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
             ->findOneByRandomId($randomId);
-        $this->om->remove($access);
-        $this->om->flush();
+        if ($access) {
+            $this->om->remove($access);
+            $this->om->flush();
+        }
         //2nd step, creates a new access
         $access = new ClarolineAccess();
-        $access->setRandomId($id);
+        $access->setRandomId($randomId);
         $access->setAccessToken($token);
         $this->om->persist($access);
         $this->om->flush();

From d2a5d8d9bf8f2bd719f2187cf01beb3472e6070f Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Tue, 28 Jul 2015 10:06:27 +0200
Subject: [PATCH 20/24] User forApi repository method.

---
 Controller/API/UserController.php |  8 ++++++++
 Manager/ApiManager.php            |  4 +++-
 Manager/CurlManager.php           |  9 +++++++++
 Repository/UserRepository.php     | 13 +++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/Controller/API/UserController.php b/Controller/API/UserController.php
index 6d2b1907c..9f09c350c 100644
--- a/Controller/API/UserController.php
+++ b/Controller/API/UserController.php
@@ -30,6 +30,7 @@
 use Symfony\Component\HttpFoundation\Request;
 use Claroline\CoreBundle\Persistence\ObjectManager;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 class UserController extends FOSRestController
 {
@@ -126,6 +127,7 @@ public function postUserAction()
      *     views = {"user"},
      *     input="Claroline\CoreBundle\Form\ProfileType"
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function putUserAction(User $user)
     {
@@ -172,6 +174,7 @@ public function putUserAction(User $user)
      *     description="Returns a user",
      *     views = {"user"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function getUserAction(User $user)
     {
@@ -185,6 +188,7 @@ public function getUserAction(User $user)
      *     section="user",
      *     views = {"api"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function deleteUserAction(User $user)
     {
@@ -199,6 +203,7 @@ public function deleteUserAction(User $user)
      *     description="Add a role to a user",
      *     views = {"user"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function addUserRoleAction(User $user, Role $role)
     {
@@ -213,6 +218,7 @@ public function addUserRoleAction(User $user, Role $role)
      *     description="remove a role from a user",
      *     views = {"user"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function removeUserRoleAction(User $user, Role $role)
     {
@@ -227,6 +233,7 @@ public function removeUserRoleAction(User $user, Role $role)
      *     description="Add a user in a group",
      *     views = {"user"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function addUserGroupAction(User $user, Group $group)
     {
@@ -241,6 +248,7 @@ public function addUserGroupAction(User $user, Group $group)
      *     description="Remove a user from a group",
      *     views = {"user"}
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function removeUserGroupAction(User $user, Group $group)
     {
diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
index c448e6b35..02c8b872f 100644
--- a/Manager/ApiManager.php
+++ b/Manager/ApiManager.php
@@ -17,6 +17,8 @@
 
 /**
  * @DI\Service("claroline.manager.api_manager")
+ * This service allows 2 instances of claroline-connect to communicate through their REST api.
+ * The REST api requires an oauth authentication (wich is why the $id/$secret combination is required)
  */
 class ApiManager
 {
@@ -50,7 +52,7 @@ public function url($host, $url, $id, $secret, $payload = null, $type = 'GET')
 
         if ($json) {
             if (property_exists($json, 'error')) {
-                if ($json->error === 'access_denied') {
+                if ($json->error === 'access_denied' || $json->error = 'invalid_grant') {
                     $this->oauthManager->connect($host, $id, $secret);
                     $this->url($host, $url, $id, $secret, $payload, $type);
                 }
diff --git a/Manager/CurlManager.php b/Manager/CurlManager.php
index 12708d010..5569f87c7 100644
--- a/Manager/CurlManager.php
+++ b/Manager/CurlManager.php
@@ -14,6 +14,7 @@
 use JMS\DiExtraBundle\Annotation as DI;
 use Claroline\CoreBundle\Event\StrictDispatcher;
 use Claroline\CoreBundle\Entity\Oauth\Client;
+use Symfony\Component\Form\AbstractType;
 
 /**
  * @DI\Service("claroline.manager.curl_manager")
@@ -39,6 +40,14 @@ public function exec($url, $payload = null, $type = 'GET')
         return $serverOutput;
     }
 
+    /**
+     * Transforms an entity into an array wich will be used by the 'post' curl request for a specified form.
+     */
+    public function formEncode($entity, AbstractType $formType)
+    {
+        $data = array();
+    }
+
     private function setPostCurl($ch, $payload)
     {
         curl_setopt($ch, CURLOPT_POST, 1);
diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
index 806e6963a..34350dc7c 100644
--- a/Repository/UserRepository.php
+++ b/Repository/UserRepository.php
@@ -1555,4 +1555,17 @@ public function findUsersForUserPicker(
 
         return $executeQuery ? $query->getResult() : $query;
     }
+
+    public function findForApi($data)
+    {
+        $dql = 'SELECT u FROM Claroline\CoreBundle\Entity\User u
+            WHERE u.id = :data
+            OR u.username LIKE :data
+            OR u.mail LIKE :data';
+
+        $query = $this->_em->createQuery($dql);
+        $query->setParameter('data', $data);
+
+        return $query->getOneOrNullResult();
+    }
 }

From ae999b1cfd468fcfb82f50e60c1c0f8a8995070d Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Tue, 28 Jul 2015 10:07:49 +0200
Subject: [PATCH 21/24] Param converter.

---
 Controller/API/WorkspaceController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Controller/API/WorkspaceController.php b/Controller/API/WorkspaceController.php
index f11542d8e..ce98fc8aa 100644
--- a/Controller/API/WorkspaceController.php
+++ b/Controller/API/WorkspaceController.php
@@ -24,6 +24,7 @@
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Claroline\CoreBundle\Library\Workspace\Configuration;
 use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 
 class WorkspaceController extends FOSRestController
 {
@@ -87,6 +88,7 @@ public function getWorkspaceAction(Workspace $workspace)
      *     views = {"workspace"},
      *     input="Claroline\CoreBundle\Form\WorkspaceType"
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function postWorkspaceUserAction(User $user)
     {
@@ -142,6 +144,7 @@ public function deleteWorkspaceAction(Workspace $workspace)
      *     views = {"workspace"},
      *     input="Claroline\CoreBundle\Form\WorkspaceType"
      * )
+     * @ParamConverter("user", class="ClarolineCoreBundle:User", options={"repository_method" = "findForApi"})
      */
     public function putWorkspaceUserAction(Workspace $workspace, User $user)
     {

From 158825cb1597cc0c45fac7ace492b04c4dc60f9d Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Tue, 28 Jul 2015 15:04:56 +0200
Subject: [PATCH 22/24] SerializedName

---
 Entity/User.php                | 22 ++++++++++++++++++++++
 Entity/Workspace/Workspace.php | 20 ++++++++++++++++++++
 Form/WorkspaceType.php         |  2 +-
 Manager/ApiManager.php         | 22 ++++++++++++++++++++++
 4 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/Entity/User.php b/Entity/User.php
index 706a517c7..387338e76 100644
--- a/Entity/User.php
+++ b/Entity/User.php
@@ -31,6 +31,7 @@
 use Claroline\CoreBundle\Entity\Facet\FieldFacetValue;
 use Claroline\CoreBundle\Entity\UserOptions;
 use JMS\Serializer\Annotation\Groups;
+use JMS\Serializer\Annotation\SerializedName;
 
 /**
  * @ORM\Table(name="claro_user")
@@ -58,6 +59,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @ORM\Column(name="first_name", length=50)
      * @Assert\NotBlank()
      * @Groups({"api"})
+     * @SerializedName("firstName")
      */
     protected $firstName;
 
@@ -67,6 +69,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @ORM\Column(name="last_name", length=50)
      * @Assert\NotBlank()
      * @Groups({"api"})
+     * @SerializedName("lastName")
      */
     protected $lastName;
 
@@ -78,6 +81,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @Assert\Length(min="3")
      * @ClaroAssert\Username()
      * @Groups({"api"})
+     * @SerializedName("username")
      */
     protected $username;
 
@@ -93,6 +97,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(nullable=true)
      * @Groups({"api"})
+     * @SerializedName("locale")
      */
     protected $locale;
 
@@ -116,6 +121,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(nullable=true)
      * @Groups({"api"})
+     * @SerializedName("phone")
      */
     protected $phone;
 
@@ -126,6 +132,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @Assert\NotBlank()
      * @Assert\Email(checkMX = false)
      * @Groups({"api"})
+     * @SerializedName("mail")
      */
     protected $mail;
 
@@ -134,6 +141,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="administrative_code", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("administrativeCode")
      */
     protected $administrativeCode;
 
@@ -188,6 +196,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      * @ORM\Column(name="creation_date", type="datetime")
      * @Gedmo\Timestampable(on="create")
      * @Groups({"api"})
+     * @SerializedName("created")
      */
     protected $created;
 
@@ -196,6 +205,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="initialization_date", type="datetime", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("initDate")
      */
     protected $initDate;
 
@@ -221,6 +231,8 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
 
     /**
      * @ORM\Column(nullable=true)
+     * @Groups({"api"})
+     * @SerializedName("picture")
      */
     protected $picture;
 
@@ -231,6 +243,8 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
 
     /**
      * @ORM\Column(type="text", nullable=true)
+     * @Groups({"api"})
+     * @SerializedName("description")
      */
     protected $description;
 
@@ -239,6 +253,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(type="boolean", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("hasAcceptedTerms")
      */
     protected $hasAcceptedTerms;
 
@@ -247,6 +262,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="is_enabled", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("isEnabled")
      */
     protected $isEnabled = true;
 
@@ -255,12 +271,14 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="is_mail_notified", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("isMailNotified")
      */
     protected $isMailNotified = true;
 
     /**
      * @ORM\Column(name="last_uri", length=255, nullable=true)
      * @Groups({"api"})
+     * @SerializedName("lastUri")
      */
     protected $lastUri;
 
@@ -269,6 +287,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="public_url", type="string", nullable=true, unique=true)
      * @Groups({"api"})
+     * @SerializedName("publicUrl")
      */
     protected $publicUrl;
 
@@ -277,6 +296,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="has_tuned_public_url", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("hasTunedPublicUrl")
      */
     protected $hasTunedPublicUrl = false;
 
@@ -285,6 +305,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(name="expiration_date", type="datetime", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("expirationDate")
      */
     protected $expirationDate;
 
@@ -314,6 +335,7 @@ class User extends AbstractRoleSubject implements Serializable, AdvancedUserInte
      *
      * @ORM\Column(nullable=true)
      * @Groups({"api"})
+     * @SerializedName("authentication")
      */
     protected $authentication;
 
diff --git a/Entity/Workspace/Workspace.php b/Entity/Workspace/Workspace.php
index 79c188ce6..112b56599 100644
--- a/Entity/Workspace/Workspace.php
+++ b/Entity/Workspace/Workspace.php
@@ -17,6 +17,7 @@
 use Symfony\Bridge\Doctrine\Validator\Constraints as DoctrineAssert;
 use Symfony\Component\Validator\Constraints as Assert;
 use JMS\Serializer\Annotation\Groups;
+use JMS\Serializer\Annotation\SerializedName;
 
 /**
  * @ORM\Entity(repositoryClass="Claroline\CoreBundle\Repository\WorkspaceRepository")
@@ -39,6 +40,7 @@ class Workspace
      * @ORM\Column(type="integer")
      * @ORM\GeneratedValue(strategy="AUTO")
      * @Groups({"api"})
+     * @SerializedName("id")
      */
     protected $id;
 
@@ -46,12 +48,14 @@ class Workspace
      * @ORM\Column()
      * @Assert\NotBlank()
      * @Groups({"api"})
+     * @SerializedName("name")
      */
     protected $name;
 
     /**
      * @ORM\Column(type="text", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("description")
      */
     protected $description;
 
@@ -59,30 +63,35 @@ class Workspace
      * @ORM\Column(unique=true)
      * @Assert\NotBlank()
      * @Groups({"api"})
+     * @SerializedName("code")
      */
     protected $code;
 
     /**
      * @ORM\Column(type="string", nullable=false)
      * @Groups({"api"})
+     * @SerializedName("maxStorageSize")
      */
     protected $maxStorageSize = "1 TB";
 
     /**
      * @ORM\Column(type="integer", nullable=false)
      * @Groups({"api"})
+     * @SerializedName("maxUploadResources")
      */
     protected $maxUploadResources = 10000;
 
     /**
      * @ORM\Column(type="integer", nullable=false)
      * @Groups({"api"})
+     * @SerializedName("maxUsers")
      */
     protected $maxUsers = 10000;
 
     /**
      * @ORM\Column(type="boolean")
      * @Groups({"api"})
+     * @SerializedName("displayable")
      */
     protected $displayable = false;
 
@@ -126,66 +135,77 @@ class Workspace
      * )
      * @ORM\JoinColumn(name="user_id", onDelete="SET NULL")
      * @Groups({"api"})
+     * @SerializedName("creator")
      */
     protected $creator;
 
     /**
      * @ORM\Column(unique=true)
      * @Groups({"api"})
+     * @SerializedName("guid")
      */
     protected $guid;
 
     /**
      * @ORM\Column(name="self_registration", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("selfRegistration")
      */
     protected $selfRegistration = false;
 
     /**
      * @ORM\Column(name="registration_validation", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("registrationValidation")
      */
     protected $registrationValidation = false;
 
     /**
      * @ORM\Column(name="self_unregistration", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("selfUnregistration")
      */
     protected $selfUnregistration = false;
 
     /**
      * @ORM\Column(name="creation_date", type="integer", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("creationDate")
      */
     protected $creationDate;
 
     /**
      * @ORM\Column(name="is_personal", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("isPersonal")
      */
     protected $isPersonal = false;
 
     /**
      * @ORM\Column(name="start_date", type="datetime", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("startDate")
      */
     protected $startDate;
 
     /**
      * @ORM\Column(name="end_date", type="datetime", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("endDate")
      */
     protected $endDate;
 
     /**
      * @ORM\Column(name="is_access_date", type="boolean")
      * @Groups({"api"})
+     * @SerializedName("isAccessDate")
      */
     protected $isAccessDate = false;
 
     /**
      * @ORM\Column(name="workspace_type", type="integer", nullable=true)
      * @Groups({"api"})
+     * @SerializedName("workspaceType")
      */
     protected $workspaceType;
 
diff --git a/Form/WorkspaceType.php b/Form/WorkspaceType.php
index 8769ce8d0..cebf8fbcd 100644
--- a/Form/WorkspaceType.php
+++ b/Form/WorkspaceType.php
@@ -23,7 +23,7 @@ class WorkspaceType extends AbstractType
 {
     private $user;
 
-    public function __construct(User $user)
+    public function __construct(User $user = null)
     {
         $this->user = $user;
         $this->forApi = false;
diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
index 02c8b872f..9f2a6c675 100644
--- a/Manager/ApiManager.php
+++ b/Manager/ApiManager.php
@@ -14,6 +14,8 @@
 use JMS\DiExtraBundle\Annotation as DI;
 use Claroline\CoreBundle\Persistence\ObjectManager;
 use Claroline\CoreBundle\Entity\Oauth\Client;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\AbstractType;
 
 /**
  * @DI\Service("claroline.manager.api_manager")
@@ -61,4 +63,24 @@ public function url($host, $url, $id, $secret, $payload = null, $type = 'GET')
 
         return $serverOutput;
     }
+
+    public function formEncode($entity, Form $form, AbstractType $formType)
+    {
+        var_dump($entity);
+        $baseName = $formType->getName();
+        $payload = array();
+
+        foreach ($form->getIterator() as $el) {
+            if (is_array($entity)) {
+                $payload[$baseName . '[' . $el->getName() . ']'] = $entity[$el->getName()];
+            }
+        }
+
+        return $payload;
+    }
+
+    private function getRealPropertyName($property)
+    {
+        
+    }
 }

From 4e4ce7efbf007b044d4d5ac2c2f03e3cf21843f3 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 29 Jul 2015 15:54:19 +0200
Subject: [PATCH 23/24] oauth inter platform (wip)

---
 Controller/Administration/OauthController.php | 159 ++++++++++-
 Entity/Oauth/ClarolineAccess.php              |  43 ++-
 Entity/Oauth/Client.php                       |   1 +
 Entity/Oauth/FriendRequest.php                |  96 +++++++
 Entity/Oauth/PendingFriend.php                |  86 ++++++
 Form/Administration/RequestFriendType.php     |  44 +++
 Manager/ApiManager.php                        |   6 -
 Manager/CurlManager.php                       |   1 +
 Manager/OauthManager.php                      | 119 +++++++-
 .../pdo_mysql/Version20150727162008.php       |  33 ---
 .../pdo_mysql/Version20150729155304.php       |  70 +++++
 Resources/public/js/administration/oauth.js   |  67 +++++
 .../views/Administration/Oauth/list.html.twig | 256 +++++++++++++-----
 .../Oauth/requestFriendForm.html.twig         |  22 ++
 14 files changed, 884 insertions(+), 119 deletions(-)
 create mode 100644 Entity/Oauth/FriendRequest.php
 create mode 100644 Entity/Oauth/PendingFriend.php
 create mode 100644 Form/Administration/RequestFriendType.php
 delete mode 100644 Migrations/pdo_mysql/Version20150727162008.php
 create mode 100644 Migrations/pdo_mysql/Version20150729155304.php
 create mode 100644 Resources/views/Administration/Oauth/requestFriendForm.html.twig

diff --git a/Controller/Administration/OauthController.php b/Controller/Administration/OauthController.php
index b30889291..3658f006a 100644
--- a/Controller/Administration/OauthController.php
+++ b/Controller/Administration/OauthController.php
@@ -18,12 +18,14 @@
 use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Claroline\CoreBundle\Manager\OauthManager;
 use Claroline\CoreBundle\Entity\Oauth\Client;
+use Claroline\CoreBundle\Entity\Oauth\FriendRequest;
+use Claroline\CoreBundle\Entity\Oauth\PendingFriend;
 use Claroline\CoreBundle\Form\Administration\OauthClientType;
+use Claroline\CoreBundle\Form\Administration\RequestFriendType;
 use Symfony\Component\HttpFoundation\JsonResponse;
 
 /**
  * @DI\Tag("security.secure_service")
- * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
  */
 class OauthController extends Controller
 {
@@ -51,16 +53,21 @@ public function __construct(
      *     options = {"expose"=true}
      * )
      * @EXT\Template()
-     *
-     * Display the plugin list
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
      *
      * @return Response
      */
     public function listAction()
     {
         $clients = $this->oauthManager->findAllClients();
+        $friendRequests = $this->oauthManager->findAllFriendRequests();
+        $pendingFriends = $this->oauthManager->findAllPendingFriends();
 
-        return array('clients' => $clients);
+        return array(
+            'clients' => $clients,
+            'friendRequests' => $friendRequests,
+            'pendingFriends' => $pendingFriends
+        );
     }
 
     /**
@@ -70,8 +77,7 @@ public function listAction()
      *     options = {"expose"=true}
      * )
      * @EXT\Template()
-     *
-     * Display the plugin list
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
      *
      * @return Response
      */
@@ -89,8 +95,7 @@ public function modalCreateFormAction()
      *     options = {"expose"=true}
      * )
      * @EXT\Template("ClarolineCoreBundle:Administration:oauth\clientModalForm.html.twig")
-     *
-     * Display the plugin list
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
      *
      * @return Response
      */
@@ -124,8 +129,7 @@ public function createClientAction()
      *     name="oauth_client_remove",
      *     options = {"expose"=true}
      * )
-     *
-     * Display the plugin list
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
      *
      * @return Response
      */
@@ -135,6 +139,141 @@ public function deleteClientAction(Client $client)
         $this->oauthManager->deleteClient($client);
 
         return new JsonResponse(array('id' => $oldid));
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/request/friend/form",
+     *     name="oauth_request_friend_form",
+     *     options = {"expose"=true}
+     * )
+     *
+     * @EXT\Template()
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+     *
+     * @return Response
+     */
+    public function requestFriendFormAction()
+    {
+        $form = $this->get('form.factory')->create(new RequestFriendType());
+
+        return array('form' => $form->createView());
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/request/friend/submit",
+     *     name="oauth_request_friend_submit",
+     *     options = {"expose"=true}
+     * )
+     * @EXT\Template("ClarolineCoreBundle:Administration:oauth\requestFriendForm.html.twig")
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+     *
+     * @return Response
+     */
+    public function requestFriendSubmitAction()
+    {
+        $form = $this->get('form.factory')->create(new RequestFriendType(), new FriendRequest());
+        $form->handleRequest($this->request);
+
+        if ($form->isValid()) {
+            $request = $form->getData();
+            $data = $this->oauthManager->createFriendRequest($request);
+
+            return new JsonResponse(array(
+                'id' => $request->getId(),
+                'name' => $request->getName(),
+                'host' => $request->getHost(),
+                'success' => is_array($data),
+                'data' => $data
+            ));
+        }
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/request/friend/remove/{friend}",
+     *     name="oauth_request_friend_remove",
+     *     options = {"expose"=true}
+     * )
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+     *
+     * @return Response
+     */
+    public function removeFriendRequest(FriendRequest $friend)
+    {
+        $oldid = $friend->getId();
+        $this->oauthManager->removeFriendRequest($friend);
+
+        return new JsonResponse(array('id' => $oldid));
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/request/pending/remove/{friend}",
+     *     name="oauth_pending_friend_remove",
+     *     options = {"expose"=true}
+     * )
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+     *
+     * @return Response
+     */
+    public function removePendingFriend(PendingFriend $friend)
+    {
+        $oldid = $friend->getId();
+        $this->oauthManager->removePendingFriend($friend);
+
+        return new JsonResponse(array('id' => $oldid));
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/request/friend/name/{name}",
+     *     name="oauth_request_friend_new",
+     *     options = {"expose"=true}
+     * )
+     *
+     * @return Response
+     */
+    public function newFriendRequestAction($name)
+    {
+        $host = $this->request->query->get('host');
+        $this->oauthManager->addPendingFriendRequest($name, $host);
+
+        return new JsonResponse(array('name' => $name, 'host' => $host));
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/friends/accept/{friend}",
+     *     name="oauth_friends_accept",
+     *     options = {"expose"=true}
+     * )
+     * @SEC\PreAuthorize("canOpenAdminTool('platform_parameters')")
+     *
+     * @return Response
+     */
+    public function acceptFriendAction(PendingFriend $friend)
+    {
+        $client = $this->oauthManager->acceptFriendAction($friend);
+
+        return new JsonResponse(array('id' => $client->getId()));
+    }
+
+    /**
+     * @EXT\Route(
+     *     "/id/{id}/secret/{secret}/name/{name}",
+     *     name="oauth_receive_data",
+     *     options = {"expose"=true}
+     * )
+     *
+     * @return Response
+     */
+    public function receiveOauthDataAction($id, $secret, $name)
+    {
+        $friendRequest = $this->oauthManager->findFriendRequestByName($name);
+        $access = $this->oauthManager->connect($friendRequest->getHost(), $id, $secret, $friendRequest);
 
+        return new JsonResponse('done');
     }
 }
diff --git a/Entity/Oauth/ClarolineAccess.php b/Entity/Oauth/ClarolineAccess.php
index 5e1f419f5..32f0d7829 100644
--- a/Entity/Oauth/ClarolineAccess.php
+++ b/Entity/Oauth/ClarolineAccess.php
@@ -16,6 +16,9 @@
 /**
  * @ORM\Table(name="claro_api_claroline_access")
  * @ORM\Entity
+ *
+ * This entity stores the list of Accesses generated. It's used to find the access_token wich was
+ * returned for a specific randomId.
  */
 class ClarolineAccess
 {
@@ -36,10 +39,28 @@ class ClarolineAccess
     /**
      * @var string
      *
-     * @ORM\Column(name="access_token", type="string", nullable=false)
+     * @ORM\Column(name="secret", type="string", nullable=false)
+     */
+    protected $secret;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="access_token", type="string", nullable=true)
      */
     protected $accessToken;
 
+    /**
+     * @var FriendRequest
+     *
+     * @ORM\OneToOne(
+     *     targetEntity="Claroline\CoreBundle\Entity\Oauth\FriendRequest"
+     * )
+     * @ORM\JoinColumn(name="friend_request_id", onDelete="SET NULL")
+     */
+    protected $friendRequest;
+
+
     public function getId()
     {
         return $this->id;
@@ -64,4 +85,24 @@ public function getAccessToken()
     {
         return $this->accessToken;
     }
+
+    public function setSecret($secret)
+    {
+        $this->secret = $secret;
+    }
+
+    public function getSecret()
+    {
+        return $this->secret;
+    }
+
+    public function setFriendRequest(FriendRequest $request)
+    {
+        $this->friendRequest = $request;
+    }
+
+    public function getFriendRequest()
+    {
+        return $this->request;
+    }
 }
diff --git a/Entity/Oauth/Client.php b/Entity/Oauth/Client.php
index fbc1eb9b0..1add1b22c 100644
--- a/Entity/Oauth/Client.php
+++ b/Entity/Oauth/Client.php
@@ -32,6 +32,7 @@ class Client extends BaseClient
      * @var string
      *
      * @ORM\Column(name="name", type="string", nullable=false)
+     * @ORM\Column(unique=true)
      */
     protected $name;
 
diff --git a/Entity/Oauth/FriendRequest.php b/Entity/Oauth/FriendRequest.php
new file mode 100644
index 000000000..5ba975147
--- /dev/null
+++ b/Entity/Oauth/FriendRequest.php
@@ -0,0 +1,96 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Entity\Oauth;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="claro_friend_request")
+ * @ORM\Entity
+ */
+class FriendRequest
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="host", type="string", nullable=false)
+     */
+
+    protected $host;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", nullable=false)
+     * @ORM\Column(unique=true)
+     */
+    protected $name;
+
+    /**
+     * @var boolean
+     *
+     * @ORM\Column(name="is_activated", type="boolean")
+     */
+    protected $isActivated = false;
+
+    /**
+     * @ORM\OneToOne(targetEntity="Claroline\CoreBundle\Entity\Oauth\ClarolineAccess", mappedBy="friendRequest")
+     **/
+    protected $clarolineAccess;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setHost($host)
+    {
+        $this->host = $host;
+    }
+
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    public function setIsActivated($bool)
+    {
+        $this->isActivated = $bool;
+    }
+
+    public function isActivated()
+    {
+        return $this->isActivated;
+    }
+
+    public function getClarolineAccess()
+    {
+        return $this->clarolineAccess;
+    }
+}
diff --git a/Entity/Oauth/PendingFriend.php b/Entity/Oauth/PendingFriend.php
new file mode 100644
index 000000000..007a776d3
--- /dev/null
+++ b/Entity/Oauth/PendingFriend.php
@@ -0,0 +1,86 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Entity\Oauth;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Table(name="claro_pending_friend")
+ * @ORM\Entity
+ */
+class PendingFriend
+{
+    /**
+     * @ORM\Id
+     * @ORM\Column(type="integer")
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="ip", type="string", nullable=false)
+     */
+    protected $ip;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="host", type="string", nullable=false)
+     */
+
+    protected $host;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="name", type="string", nullable=false)
+     * @ORM\Column(unique=true)
+     */
+    protected $name;
+
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    public function setIp($ip)
+    {
+        $this->ip = $ip;
+    }
+
+    public function getIp()
+    {
+        return $this->ip;
+    }
+
+    public function setHost($host)
+    {
+        $this->host = $host;
+    }
+
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    public function setName($name)
+    {
+        $this->name = $name;
+    }
+
+    public function getName()
+    {
+        return $this->name;
+    }
+}
diff --git a/Form/Administration/RequestFriendType.php b/Form/Administration/RequestFriendType.php
new file mode 100644
index 000000000..90db6e90b
--- /dev/null
+++ b/Form/Administration/RequestFriendType.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Claroline Connect package.
+ *
+ * (c) Claroline Consortium <consortium@claroline.net>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Claroline\CoreBundle\Form\Administration;
+
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolverInterface;
+
+class RequestFriendType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add(
+            'name',
+            'text',
+            array('constraints' => new NotBlank(), 'label' => 'name')
+        );
+        $builder->add(
+            'host',
+            'text',
+            array('constraints' => new NotBlank(), 'label' => 'host')
+        );
+    }
+
+    public function getName()
+    {
+        return 'request_friend_form';
+    }
+
+    public function setDefaultOptions(OptionsResolverInterface $resolver)
+    {
+        $resolver->setDefaults(array('translation_domain' => 'platform'));
+    }
+}
diff --git a/Manager/ApiManager.php b/Manager/ApiManager.php
index 9f2a6c675..da58452d3 100644
--- a/Manager/ApiManager.php
+++ b/Manager/ApiManager.php
@@ -66,7 +66,6 @@ public function url($host, $url, $id, $secret, $payload = null, $type = 'GET')
 
     public function formEncode($entity, Form $form, AbstractType $formType)
     {
-        var_dump($entity);
         $baseName = $formType->getName();
         $payload = array();
 
@@ -78,9 +77,4 @@ public function formEncode($entity, Form $form, AbstractType $formType)
 
         return $payload;
     }
-
-    private function getRealPropertyName($property)
-    {
-        
-    }
 }
diff --git a/Manager/CurlManager.php b/Manager/CurlManager.php
index 5569f87c7..eba20252a 100644
--- a/Manager/CurlManager.php
+++ b/Manager/CurlManager.php
@@ -57,6 +57,7 @@ private function setPostCurl($ch, $payload)
     private function setPutCurl($ch, $payload)
     {
         curl_setopt($ch, CURLOPT_PUT, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $this->urlify($payload));
     }
 
     private function urlify($payload)
diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index b7f6ced1e..44584c5c8 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -16,6 +16,8 @@
 use FOS\OAuthServerBundle\Entity\ClientManager;
 use Claroline\CoreBundle\Entity\Oauth\Client;
 use Claroline\CoreBundle\Entity\Oauth\ClarolineAccess;
+use Claroline\CoreBundle\Entity\Oauth\FriendRequest;
+use Claroline\CoreBundle\Entity\Oauth\PendingFriend;
 use Claroline\CoreBundle\Persistence\ObjectManager;
 
 /**
@@ -27,13 +29,35 @@ class OauthManager extends ClientManager
     public $curlManager;
     /** @DI\Inject("claroline.persistence.object_manager") */
     public $om;
+    /** @DI\Inject("service_container") */
+    public $container;
 
     public function findAllClients()
     {
         return $this->repository->findAll();
     }
 
-    public function connect($host, $id, $secret)
+    public function findAllFriendRequests()
+    {
+        return $this->om->getRepository('ClarolineCoreBundle:Oauth\FriendRequest')->findAll();
+    }
+
+    public function findAllUnactivatedFriendRequests()
+    {
+        return $this->om->getRepository('ClarolineCoreBundle:Oauth\FriendRequest')->findBy(array('isActivated' => false));
+    }
+
+    public function findAllPendingFriends()
+    {
+        return $this->om->getRepository('ClarolineCoreBundle:Oauth\PendingFriend')->findAll();
+    }
+
+    public function findFriendRequestByName($name)
+    {
+        return $this->om->getRepository('ClarolineCoreBundle:Oauth\FriendRequest')->findOneBy(array('name' => $name));
+    }
+
+    public function connect($host, $id, $secret, FriendRequest $friendRequest = null)
     {
         $url = $host . '/oauth/v2/token?client_id=' .
             $id . '&client_secret=' .
@@ -43,17 +67,94 @@ public function connect($host, $id, $secret)
         $json = json_decode($serverOutput);
 
         if (property_exists($json, 'access_token')) {
-            $this->createAccess($id, $json->access_token);
-            return;
+            return $this->createAccess(
+                $id,
+                $secret,
+                $json->access_token,
+                $friendRequest
+            );
         }
 
         throw new \Exception('The oauth connection for id ' . $id . ' could not be initialized');
     }
 
+    public function createFriendRequest(FriendRequest $friend)
+    {
+        //$host = $this->container->get('request')->getSchemeAndHttpHost();
+        $host = $this->container->get('request')->getSchemeAndHttpHost() . $this->container->get('router')->getContext()->getBaseUrl();
+        $url = $friend->getHost() . '/admin/oauth/request/friend/name/' . $friend->getName() . '?host=' . urlencode($host);
+        $data = $this->curlManager->exec($url);
+
+        if ($data) {
+            $this->om->persist($friend);
+            $this->om->flush();
+        }
+
+        return $url;
+    }
+
+    public function removeFriendRequest(FriendRequest $friend)
+    {
+        $this->om->remove($friend);
+        $this->om->flush();
+    }
+
+    public function removePendingFriend(PendingFriend $friend)
+    {
+        $this->om->remove($friend);
+        $this->om->flush();
+    }
+
+    //@todo basic ip filter
+    public function addPendingFriendRequest($name, $host)
+    {
+        $ip = $_SERVER['REMOTE_ADDR'];
+        //basic ip protection goes here
+
+
+        //check the ip match the host aswell
+
+        //then wea ad
+        $pending = new PendingFriend();
+        $pending->setName($name);
+        $pending->setHost($host);
+        $pending->setIp($ip);
+        $this->om->persist($pending);
+        $this->om->flush();
+    }
+
+    public function acceptFriendAction(PendingFriend $friend)
+    {
+        $grantTypes = array(
+            'authorization_code',
+            'password',
+            'refresh_token',
+            'token',
+            'client_credentials'
+        );
+
+        $client = $this->createClient();
+        $client->setAllowedGrantTypes($grantTypes);
+        $client->setName($friend->getName());
+        $this->updateClient($client);
+        $url = $friend->getHost() . '/admin/oauth/id/' . $client->getId() . '_' . $client->getRandomId() .
+            '/secret/' . $client->getSecret() . '/name/' . $friend->getName();
+        $data = $this->curlManager->exec($url);
+
+        throw new \Exception($data);
+
+        if (!json_decode($data)) {
+            $this->om->remove($client);
+            $this->om->flush();
+        }
+
+        return $client;
+    }
+
     /**
      * Only 1 access per client !
      */
-    private function createAccess($randomId, $token)
+    private function createAccess($randomId, $secret, $token, FriendRequest $request = null)
     {
         //1st step, remove any existing access
         $access = $this->om->getRepository('Claroline\CoreBundle\Entity\Oauth\ClarolineAccess')
@@ -65,8 +166,18 @@ private function createAccess($randomId, $token)
         //2nd step, creates a new access
         $access = new ClarolineAccess();
         $access->setRandomId($randomId);
+        $access->setSecret($secret);
         $access->setAccessToken($token);
+
+        if ($request) {
+            $request->setIsActivated(true);
+            $access->setFriendRequest($request);
+            $this->om->persist($request);
+        }
+
         $this->om->persist($access);
         $this->om->flush();
+
+        return $access;
     }
 }
diff --git a/Migrations/pdo_mysql/Version20150727162008.php b/Migrations/pdo_mysql/Version20150727162008.php
deleted file mode 100644
index 11c84fd21..000000000
--- a/Migrations/pdo_mysql/Version20150727162008.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-namespace Claroline\CoreBundle\Migrations\pdo_mysql;
-
-use Doctrine\DBAL\Migrations\AbstractMigration;
-use Doctrine\DBAL\Schema\Schema;
-
-/**
- * Auto-generated migration based on mapping information: modify it with caution
- *
- * Generation date: 2015/07/27 04:20:09
- */
-class Version20150727162008 extends AbstractMigration
-{
-    public function up(Schema $schema)
-    {
-        $this->addSql("
-            CREATE TABLE claro_api_claroline_access (
-                id INT AUTO_INCREMENT NOT NULL, 
-                random_id VARCHAR(255) NOT NULL, 
-                access_token VARCHAR(255) NOT NULL, 
-                PRIMARY KEY(id)
-            ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
-        ");
-    }
-
-    public function down(Schema $schema)
-    {
-        $this->addSql("
-            DROP TABLE claro_api_claroline_access
-        ");
-    }
-}
\ No newline at end of file
diff --git a/Migrations/pdo_mysql/Version20150729155304.php b/Migrations/pdo_mysql/Version20150729155304.php
new file mode 100644
index 000000000..a872fbe78
--- /dev/null
+++ b/Migrations/pdo_mysql/Version20150729155304.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Claroline\CoreBundle\Migrations\pdo_mysql;
+
+use Doctrine\DBAL\Migrations\AbstractMigration;
+use Doctrine\DBAL\Schema\Schema;
+
+/**
+ * Auto-generated migration based on mapping information: modify it with caution
+ *
+ * Generation date: 2015/07/29 03:53:04
+ */
+class Version20150729155304 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        $this->addSql("
+            CREATE TABLE claro_pending_friend (
+                id INT AUTO_INCREMENT NOT NULL, 
+                ip VARCHAR(255) NOT NULL, 
+                host VARCHAR(255) NOT NULL, 
+                name VARCHAR(255) NOT NULL, 
+                PRIMARY KEY(id)
+            ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
+        ");
+        $this->addSql("
+            CREATE TABLE claro_friend_request (
+                id INT AUTO_INCREMENT NOT NULL, 
+                host VARCHAR(255) NOT NULL, 
+                name VARCHAR(255) NOT NULL, 
+                is_activated TINYINT(1) NOT NULL, 
+                PRIMARY KEY(id)
+            ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
+        ");
+        $this->addSql("
+            CREATE TABLE claro_api_claroline_access (
+                id INT AUTO_INCREMENT NOT NULL, 
+                friend_request_id INT DEFAULT NULL, 
+                random_id VARCHAR(255) NOT NULL, 
+                secret VARCHAR(255) NOT NULL, 
+                access_token VARCHAR(255) DEFAULT NULL, 
+                UNIQUE INDEX UNIQ_2B10E8B1EC394CA1 (friend_request_id), 
+                PRIMARY KEY(id)
+            ) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB
+        ");
+        $this->addSql("
+            ALTER TABLE claro_api_claroline_access 
+            ADD CONSTRAINT FK_2B10E8B1EC394CA1 FOREIGN KEY (friend_request_id) 
+            REFERENCES claro_friend_request (id) 
+            ON DELETE SET NULL
+        ");
+    }
+
+    public function down(Schema $schema)
+    {
+        $this->addSql("
+            ALTER TABLE claro_api_claroline_access 
+            DROP FOREIGN KEY FK_2B10E8B1EC394CA1
+        ");
+        $this->addSql("
+            DROP TABLE claro_pending_friend
+        ");
+        $this->addSql("
+            DROP TABLE claro_friend_request
+        ");
+        $this->addSql("
+            DROP TABLE claro_api_claroline_access
+        ");
+    }
+}
\ No newline at end of file
diff --git a/Resources/public/js/administration/oauth.js b/Resources/public/js/administration/oauth.js
index 07a2339b4..9ce602ae8 100644
--- a/Resources/public/js/administration/oauth.js
+++ b/Resources/public/js/administration/oauth.js
@@ -17,18 +17,42 @@
         window.location.reload();
     }
 
+    var addFriendRequest = function(data) {
+        window.location.reload();
+    }
+
     var removeClientRow = function (event, clientId) {
         $('#client-row-' + clientId).remove();
     };
 
+    var removeFriendRequestRow = function (event, requestid) {
+        $('#friend-request-row-' + requestid).remove();
+    };
+
+    var removeFriendPendingRow = function (event, requestid) {
+        $('#friend-pending-row-' + requestid).remove();
+    };
+
+    var confirmPendingFriend = function (event, friendid) {
+        window.location.reload();
+    }
+
+
     $('body')
         .on('click', '#add-client-btn', function(event) {
             var url = Routing.generate('claro_admin_oauth_form');
             modal.displayForm(url, addClient, function(){}, 'form_client_creation');
         })
+        .on('click', '#request-friend-btn', function(event) {
+            var url = Routing.generate('oauth_request_friend_form');
+            modal.displayForm(url, addFriendRequest, function(){}, 'form_request_friend');
+        })
         .on('click', '.show-client-btn', function(event) {
             modal.simpleContainer('', $(event.target).attr('data-client-id') + '_' + $(event.target).attr('data-client-random'));
         })
+        .on('click', '.show-client-access-btn', function(event) {
+            modal.simpleContainer('', $(event.target).attr('data-client-random'));
+        })
         .on('click', '.show-secret-btn', function(event) {
             modal.simpleContainer('', $(event.target).attr('data-secret'));
         })
@@ -48,5 +72,48 @@
                 Translator.trans('delete_client_message', {}, 'platform'),
                 Translator.trans('delete_client', {}, 'platform')
             );
+        })
+        .on('click', '.delete-friend-request-btn', function(event) {
+            var requestid = $(event.target).attr('data-friend-request-id');
+
+            modal.confirmRequest(
+                Routing.generate(
+                    'oauth_request_friend_remove',
+                    {'friend': requestid}
+                ),
+                removeFriendRequestRow,
+                requestid,
+                Translator.trans('delete_friend_request_message', {}, 'platform'),
+                Translator.trans('delete_friend_request', {}, 'platform')
+            );
+        })
+        .on('click', '.delete-friend-pending-btn', function(event) {
+            var friendid = $(event.target).attr('data-friend-pending-id');
+
+            modal.confirmRequest(
+                Routing.generate(
+                    'oauth_pending_friend_remove',
+                    {'friend': friendid}
+                ),
+                removeFriendPendingRow,
+                friendid,
+                Translator.trans('delete_friend_pending_message', {}, 'platform'),
+                Translator.trans('delete_friend_pending', {}, 'platform')
+            );
+        })
+        .on('click', '.add-friend-pending-btn', function(event) {
+            var friendid = $(event.target).attr('data-friend-pending-id');
+            console.debug(friendid);
+
+            modal.confirmRequest(
+                Routing.generate(
+                    'oauth_friends_accept',
+                    {'friend': friendid}
+                ),
+                confirmPendingFriend,
+                friendid,
+                Translator.trans('add_friend_confirm_message', {}, 'platform'),
+                Translator.trans('add_pending', {}, 'platform')
+            );
         });
 }) ();
diff --git a/Resources/views/Administration/Oauth/list.html.twig b/Resources/views/Administration/Oauth/list.html.twig
index c808d9312..ab62ff511 100644
--- a/Resources/views/Administration/Oauth/list.html.twig
+++ b/Resources/views/Administration/Oauth/list.html.twig
@@ -27,73 +27,199 @@
 {% endblock %}
 
 {% block section_content %}
-    <div class="panel-heading">
-        <h3 class="panel-title">{{ 'claroline'|trans({}, 'platform') }}</h3>
-    </div>
-
-    <div class="panel-body">
-        <div class="table-responsive">
-            <table class="table table-striped table-bordered table-condensed">
-                <thead>
-                    <tr>
-                        <th> {{ 'id'|trans({}, 'platform') }} </th>
-                        <th> {{ 'redirect_uri'|trans({}, 'platform') }} </th>
-                        <th> {{ 'grant_type'|trans({}, 'platform') }} </th>
-                        <th> {{ 'client_name'|trans({}, 'platform')}} </th>
-                        <th> </th>
-                    </tr>
-                </thead>
-                <tbody id="user-table-body">
-                    {% for client in clients %}
-                        <tr id="client-row-{{ client.getId() }}" data-client-id="{{ client.getId() }}">
-                            <th> {{ client.getId() }} </th>
-                            <th>
-                                {% for uris in client.getRedirectUris() %}
-                                    {{ uris }}
-                                {% endfor %}
-                            </th>
-                            <th>
-                                {% for grantType in client.getAllowedGrantTypes() %}
-                                    {{ grantType }}
-                                {% endfor %}
-                            </th>
-                            <th> {{ client.getName() }} </th>
-                            <th>
-                                <div class="btn-group">
-                                    <button class="btn btn-default show-client-btn"
-                                            data-client-id="{{ client.getId() }}"
-                                            data-client-random="{{ client.getRandomId() }}"
-                                    >
-                                        <i class="fa fa-info"></i>
-                                    </button>
-                                    <button class="btn btn-default show-secret-btn"
-                                            data-secret="{{ client.getSecret() }}"
-                                    >
-                                        <i class="fa fa-key"></i>
-                                    </button>
-                                    <button class="btn btn-default show-refresh-btn"
-                                        data-url="/oauth/v2/auth?client_id={{ client.getId() }}_{{ client.getRandomId() }}&redirect_uri={% for uris in client.getRedirectUris() %}{{ uris }}{% endfor %}&response_type=token"
-                                    >
-                                        <i class="fa fa-refresh"></i>
-                                    </button>
-                                    <button class="btn btn-danger delete-client-btn"
-                                            data-client-id="{{ client.getId() }}"
-                                    >
-                                        <i class="fa fa-trash"></i>
-                                    </button>
-                                </div>
-                            </th>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
+    <div class="panel">
+        <div class="panel-body">
+            <div class="panel-group">
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" href="#client-list">
+                                <b>{{ 'client_list'|trans({}, 'platform') }}</b>
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="client-list" class="panel-collapse collapse">
+                        <div class="panel-body">
+                            <div class="table-responsive">
+                                <table class="table table-striped table-bordered table-condensed">
+                                    <thead>
+                                        <tr>
+                                            <th> {{ 'id'|trans({}, 'platform') }} </th>
+                                            <th> {{ 'redirect_uri'|trans({}, 'platform') }} </th>
+                                            <th> {{ 'grant_type'|trans({}, 'platform') }} </th>
+                                            <th> {{ 'client_name'|trans({}, 'platform')}} </th>
+                                            <th> </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {% for client in clients %}
+                                            <tr id="client-row-{{ client.getId() }}" data-client-id="{{ client.getId() }}">
+                                                <th> {{ client.getId() }} </th>
+                                                <th>
+                                                    {% for uris in client.getRedirectUris() %}
+                                                        {{ uris }}
+                                                    {% endfor %}
+                                                </th>
+                                                <th>
+                                                    {% for grantType in client.getAllowedGrantTypes() %}
+                                                        {{ grantType }}
+                                                    {% endfor %}
+                                                </th>
+                                                <th> {{ client.getName() }} </th>
+                                                <th>
+                                                    <div class="btn-group">
+                                                        <button class="btn btn-default show-client-btn"
+                                                                data-client-id="{{ client.getId() }}"
+                                                                data-client-random="{{ client.getRandomId() }}"
+                                                        >
+                                                            <i class="fa fa-info"
+                                                                data-client-id="{{ client.getId() }}"
+                                                                data-client-random="{{ client.getRandomId() }}">
+                                                            </i>
+                                                        </button>
+                                                        <button class="btn btn-default show-secret-btn"
+                                                                data-secret="{{ client.getSecret() }}"
+                                                        >
+                                                            <i class="fa fa-key" data-secret="{{ client.getSecret() }}"></i>
+                                                        </button>
+                                                        <button class="btn btn-danger delete-client-btn"
+                                                                data-client-id="{{ client.getId() }}"
+                                                        >
+                                                            <i class="fa fa-trash" data-client-id="{{ client.getId() }}"></i>
+                                                        </button>
+                                                    </div>
+                                                </th>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                            <button id="add-client-btn"
+                                    type="submit"
+                                    class="btn btn-primary">
+                                {{ 'add'|trans({}, 'platform') }}
+                            </button>
+                            <button id="request-friend-btn"
+                                    type="submit"
+                                    class="btn btn-primary">
+                                {{ 'request_friend'|trans({}, 'platform') }}
+                            </button>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" href="#friend-request-list">
+                                <b>{{ 'friend_request'|trans({}, 'platform') }}</b>
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="friend-request-list" class="panel-collapse collapse">
+                        <div class="panel-body">
+                            <div class="table-responsive">
+                                <table class="table table-striped table-bordered table-condensed">
+                                    <thead>
+                                        <tr>
+                                            <th> </th>
+                                            <th> {{ 'host'|trans({}, 'platform') }} </th>
+                                            <th> {{ 'name'|trans({}, 'platform') }} </th>
+                                            <th></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {% for request in friendRequests %}
+                                            <tr id="friend-request-row-{{ request.getId() }}">
+                                                <th>
+                                                    {% if request.isActivated() %}
+                                                        activated
+                                                    {% else %}
+                                                        not activated
+                                                    {% endif %}
+                                                </th>
+                                                <th> {{ request.getHost() }} </th>
+                                                <th> {{ request.getName() }} </th>
+                                                <th>
+                                                    <div class="btn-group">
+                                                        <button class="btn btn-danger delete-friend-request-btn"
+                                                                data-friend-request-id="{{ request.getId() }}"
+                                                        >
+                                                            <i class="fa fa-trash" data-friend-request-id="{{ request.getId() }}"></i>
+                                                        </button>
+                                                        {% if request.isActivated() and request.getClarolineAccess() != null %}
+                                                            <button class="btn btn-default show-client-access-btn"
+                                                                    data-client-random="{{ request.getClarolineAccess().getRandomId() }}"
+                                                            >
+                                                                <i class="fa fa-info"
+                                                                    data-client-random="{{ request.getClarolineAccess().getRandomId() }}">
+                                                                </i>
+                                                            </button>
+                                                            <button class="btn btn-default show-secret-btn"
+                                                                    data-secret="{{ request.getClarolineAccess().getSecret() }}"
+                                                            >
+                                                                <i class="fa fa-key" data-secret="{{ request.getClarolineAccess().getSecret() }}"></i>
+                                                            </button>
+                                                        {% endif %}
+                                                    </div>
+                                                </th>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" href="#pending-friend-list">
+                                <b>{{ 'pending_friend'|trans({}, 'platform') }}</b>
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="pending-friend-list" class="panel-collapse collapse">
+                        <div class="panel-body">
+                            <div class="table-responsive">
+                                <table class="table table-striped table-bordered table-condensed">
+                                    <thead>
+                                        <tr>
+                                            <th> {{ 'host'|trans({}, 'platform') }} </th>
+                                            <th> {{ 'ip'|trans({}, 'platform') }} </th>
+                                            <th> </th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        {% for pendingFriend in pendingFriends %}
+                                            <tr id="friend-pending-row-{{ pendingFriend.getId() }}">
+                                                <th> {{ pendingFriend.getHost() }} </th>
+                                                <th> {{ pendingFriend.getName() }} </th>
+                                                <th>
+                                                    <div class="btn-group">
+                                                        <button class="btn btn-success add-friend-pending-btn"
+                                                                data-friend-pending-id="{{ pendingFriend.getId() }}"
+                                                        >
+                                                            <i class="fa fa-check" data-friend-pending-id="{{ pendingFriend.getId() }}"></i>
+                                                        </button>
+                                                        <button class="btn btn-danger delete-friend-pending-btn"
+                                                                data-friend-pending-id="{{ pendingFriend.getId() }}"
+                                                        >
+                                                            <i class="fa fa-trash" data-friend-pending-id="{{ pendingFriend.getId() }}"></i>
+                                                        </button>
+                                                    </div>
+                                                </th>
+                                            </tr>
+                                        {% endfor %}
+                                    </tbody>
+                                </table>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
         </div>
-        <button id="add-client-btn"
-                type="submit"
-                class="btn btn-primary">
-            {{ 'add'|trans({}, 'platform') }}
-        </button>
     </div>
+
 {% endblock %}
 
 {% block javascripts %}
diff --git a/Resources/views/Administration/Oauth/requestFriendForm.html.twig b/Resources/views/Administration/Oauth/requestFriendForm.html.twig
new file mode 100644
index 000000000..02e88ccbd
--- /dev/null
+++ b/Resources/views/Administration/Oauth/requestFriendForm.html.twig
@@ -0,0 +1,22 @@
+{% extends "ClarolineCoreBundle:Administration\\Oauth:clientModalForm.html.twig" %}
+
+{% block header %}
+    {{ 'request_friend'|trans({}, 'platform') }}
+{% endblock %}
+
+{% block form %}
+    <form role="form"
+        class="form-horizontal"
+        action="{{ path('oauth_request_friend_submit') }}"
+        method="post" {{ form_enctype(form) }}
+        id="form_request_friend"
+    >
+        <div class="modal-body">
+            {{ form_widget(form) }}
+        </div>
+        <div class="modal-footer">
+            <button type="submit" id="submit-panel-creation-form" class="btn btn-primary" aria-hidden="true">{{ 'create'|trans({}, 'platform') }}</button>
+            <div class="btn btn-default" data-dismiss="modal" aria-hidden="true">{{ 'cancel'|trans({}, 'platform') }}</div>
+        </div>
+    </form>
+{% endblock %}

From 8530ab6d10a4cdb636d596ded99573a00e5c4ff9 Mon Sep 17 00:00:00 2001
From: ngodfraind <nicolas.godfraind@gmail.com>
Date: Wed, 29 Jul 2015 15:58:54 +0200
Subject: [PATCH 24/24] removing useless exception

---
 Manager/OauthManager.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Manager/OauthManager.php b/Manager/OauthManager.php
index 44584c5c8..20d9c5a77 100644
--- a/Manager/OauthManager.php
+++ b/Manager/OauthManager.php
@@ -141,13 +141,14 @@ public function acceptFriendAction(PendingFriend $friend)
             '/secret/' . $client->getSecret() . '/name/' . $friend->getName();
         $data = $this->curlManager->exec($url);
 
-        throw new \Exception($data);
-
         if (!json_decode($data)) {
             $this->om->remove($client);
-            $this->om->flush();
+        } else {
+            $this->om->remove($friend);
         }
 
+        $this->om->flush();
+
         return $client;
     }