Merge pull request #1 from Fooriva/master

Symfony 4 migration
KleeGroup · May 25, 2018 · 3399794 · 3399794
2 parents 581fba7 + b892f95
commit 3399794
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 33 deletions.
diff --git a/Controller/FranceConnectController.php b/Controller/FranceConnectController.php
@@ -3,7 +3,9 @@
 namespace KleeGroup\FranceConnectBundle\Controller;
 
 use KleeGroup\FranceConnectBundle\Manager\ContextService;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use KleeGroup\FranceConnectBundle\Manager\ContextServiceInterface;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -16,21 +18,16 @@
  */
 class FranceConnectController extends Controller
 {
-
-    /**
-     * @return object|\Symfony\Bridge\Monolog\Logger
-     */
-    private function getLogger()
-    {
-        return $this->get('logger');
-    }
-
-    /**
-     * @return ContextService|object
-     */
-    private function getFCService()
+    /** @var LoggerInterface */
+    private $logger;
+
+    /** @var ContextServiceInterface */
+    private $contextService;
+
+    public function __construct(LoggerInterface $logger, ContextServiceInterface $contextService)
     {
-        return $this->get('france_connect.service.context');
+        $this->logger = $logger;
+        $this->contextService = $contextService;
     }
 
     /**
@@ -39,9 +36,8 @@ private function getFCService()
      */
     public function loginAction( )
     {
-        $logger = $this->getLogger();
-        $logger->debug('Generating a URL to get the authorization code.');
-        $url = $this->getFCService()->generateAuthorizationURL();
+        $this->logger->debug('Generating a URL to get the authorization code.');
+        $url = $this->contextService->generateAuthorizationURL();
 
         return $this->redirect($url);
     }
@@ -54,10 +50,9 @@ public function loginAction( )
      */
     public function checkAction(Request $request)
     {
-        $logger = $this->getLogger();
-        $logger->debug('Callback intercept.');
+        $this->logger->debug('Callback intercept.');
         $getParams = $request->query->all();
-        $this->getFCService()->getUserInfo($getParams);
+        $this->contextService->getUserInfo($getParams);
 
         switch ($this->getParameter('france_connect.result_type')) {
             case 'route' :
@@ -77,9 +72,8 @@ public function checkAction(Request $request)
      */
     public function logoutAction()
     {
-        $logger = $this->getLogger();
-        $logger->debug('Get Logout URL.');
-        $url = $this->getFCService()->generateLogoutURL();
+        $this->logger->debug('Get Logout URL.');
+        $url = $this->contextService->generateLogoutURL();
 
         return $this->redirect($url);
     }

diff --git a/Manager/ContextService.php b/Manager/ContextService.php
@@ -152,7 +152,7 @@ public function __construct(
                     break;
             }
         } catch (RouteNotFoundException $e) {
-            throw new Exception("Callback route name is invalid", $e);
+            throw new Exception("Callback route name is invalid", 500, $e);
         }
 
         //  Logout URL
@@ -166,7 +166,7 @@ public function __construct(
                     break;
             }
         } catch (RouteNotFoundException $e) {
-            throw new Exception("Logout route name is invalid", $e);
+            throw new Exception("Logout route name is invalid", 500, $e);
         }
 
         $this->proxyPort = $proxyPort;

diff --git a/Resources/config/services.xml b/Resources/config/services.xml
@@ -5,6 +5,7 @@
            xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
 
     <services>
+        <defaults autowire="true" autoconfigure="true" public="false" />
 
         <service
                 id="security.access.fc_authenticated_voter"
@@ -37,6 +38,13 @@
             <argument id="providersKeys">%france_connect.providers_keys%</argument>
         </service>
 
+        <service id="KleeGroup\FranceConnectBundle\Manager\ContextServiceInterface" alias="france_connect.service.context">
+        </service>
+
+        <prototype namespace="KleeGroup\FranceConnectBundle\Controller\" resource="../../Controller">
+            <tag name="controller.service_arguments" />
+        </prototype>
+
     </services>
 
 

diff --git a/Resources/doc/configuration.md b/Resources/doc/configuration.md
@@ -31,8 +31,8 @@ france_connect:
 * *client_id*: identifier provided by FranceConnect
 * *client_secret*: secret identifier provided by FranceConnect
 * *provider_base_url*: FranceConnect API URL. <strong>Must be change in production environment </b>
-* *post_logout_route*: Route for redirecting user after logout
-* *result_route*: Route for redirecting user after login on FranceConnect
+* *logout_value*: Route for redirecting user after logout
+* *result_value*: Route for redirecting user after login on FranceConnect
 * *scopes*: scopes  requested from FranceConnect. (Cf [documentation FranceConnect](https://franceconnect.gouv.fr/fournisseur-service#identite-pivot))
 * *providers_keys* list of firewalls names. The token will be injected on these firewall
 

diff --git a/Tests/DependencyInjection/ConfigurationTest.php b/Tests/DependencyInjection/ConfigurationTest.php
@@ -10,10 +10,11 @@
 
 
 use KleeGroup\FranceConnectBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\Definition\Processor;
 
-class ConfigurationTest extends \PHPUnit_Framework_TestCase
+class ConfigurationTest extends TestCase
 {
     /**
      * @test

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "kleegroup/franceconnect-bundle",
   "type": "symfony-bundle",
-  "description": "Symfony3 OpenID security extension franceconnect",
+  "description": "Symfony4 OpenID security extension franceconnect",
   "keywords": ["Security", "OpenId", "Authentication"],
   "homepage": "https://github.com/KleeGroup/FranceConnect-Symfony",
   "license": "MIT",
@@ -12,13 +12,13 @@
     }
   ],
   "require": {
-    "php": ">=5.6.0",
-    "symfony/symfony": "3.*",
+    "php": "^7.1.3",
+    "symfony/framework-bundle": "^4",
     "namshi/jose": "7.2.*",
     "mashape/unirest-php": "3.*"
   },
   "require-dev": {
-    "phpunit/phpunit": "~5.4"
+    "phpunit/phpunit": "~7.1"
   },
   "autoload": {
     "psr-0": { "KleeGroup\\FranceConnectBundle": "" }