wip

ecphp · Nov 18, 2019 · fdccd59 · fdccd59
1 parent e180014
commit fdccd59
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 31 deletions.
diff --git a/composer.json b/composer.json
@@ -1,22 +1,27 @@
 {
     "name": "drupol/eulogin-bundle",
     "type": "symfony-bundle",
-    "description": "TODO",
+    "description": "A bundle for Symfony 4 providing authentication against European Commission authentication service.",
     "license": "MIT",
     "require": {
         "php": ">= 7.1.3",
+        "ext-json": "*",
         "ext-simplexml": "*",
         "drupol/cas-bundle": "dev-master",
         "nyholm/psr7": "^1",
         "symfony/framework-bundle": "^4",
-        "symfony/http-client": "^4",
-        "symfony/psr-http-message-bridge": "^1.2",
-        "symfony/security-bundle": "^4",
-        "ext-json": "*"
+        "symfony/security-bundle": "^4"
     },
     "require-dev": {
         "drupol/php-conventions": "^1"
     },
+    "suggest": {
+        "monolog/monolog": "For a logger implementation (PSR-3).",
+        "nyholm/psr7": "For a super lightweight PSR-7/17 implementation",
+        "nyholm/psr7-server": "For a PSR-7 implementation of Server Requests.",
+        "symfony/cache": "For a cache implementation (PSR-6).",
+        "symfony/http-client": "For an HTTP client implementation (PSR-18)."
+    },
     "autoload": {
         "psr-4": {
             "drupol\\EuloginBundle\\": "src/"

diff --git a/src/Protocol/Eulogin.php b/src/Protocol/Eulogin.php
@@ -36,7 +36,7 @@ final class Eulogin implements CasInterface
      * Eulogin constructor.
      *
      * @param \Psr\Http\Message\ServerRequestInterface $serverRequest
-     * @param array $properties
+     * @param \drupol\psrcas\Configuration\PropertiesInterface $properties
      * @param \Psr\Http\Client\ClientInterface $client
      * @param \Psr\Http\Message\UriFactoryInterface $uriFactory
      * @param \Psr\Http\Message\ResponseFactoryInterface $responseFactory
@@ -90,9 +90,20 @@ public function getProperties(): PropertiesInterface
     /**
      * {@inheritdoc}
      */
-    public function getUser(ResponseInterface $response): ?array
-    {
-        return $this->cas->getUser($response);
+    public function handleProxyCallback(
+        array $parameters = [],
+        ?ResponseInterface $response = null
+    ): ?ResponseInterface {
+        $body = '<?xml version="1.0" encoding="utf-8"?><proxySuccess xmlns="http://www.yale.edu/tp/casClient" />';
+
+        return $this
+            ->cas
+            ->handleProxyCallback($parameters, $response)
+            ->withBody(
+                $this
+                    ->streamFactory
+                    ->createStream($body)
+            );
     }
 
     /**
@@ -111,25 +122,6 @@ public function logout(array $parameters = []): ResponseInterface
         return $this->cas->logout($parameters);
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function handleProxyCallback(
-        array $parameters = [],
-        ?ResponseInterface $response = null
-    ): ?ResponseInterface {
-        $body = '<?xml version="1.0" encoding="utf-8"?><proxySuccess xmlns="http://www.yale.edu/tp/casClient" />';
-
-        return $this
-            ->cas
-            ->handleProxyCallback($parameters, $response)
-            ->withBody(
-                $this
-                    ->streamFactory
-                    ->createStream($body)
-            );
-    }
-
     /**
      * {@inheritdoc}
      */

diff --git a/src/Security/Core/User/EuloginUser.php b/src/Security/Core/User/EuloginUser.php
@@ -121,9 +121,6 @@ public function getPassword()
     {
     }
 
-    /**
-     *
-     */
     public function getPgt(): ?string
     {
         return $this->user->getPgt();
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,9 +121,6 @@ public function getPassword() @@
         {
         }
-        /**
-         *
-         */
         public function getPgt(): ?string
         {
             return $this->user->getPgt();
@@ Expand Down @@