refactor: remove Symfony* Cas classes

We use PSR requests directly in Controllers now.
ecphp · May 8, 2023 · 13e30e6 · 13e30e6
1 parent fa17ff4
commit 13e30e6
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 326 deletions.
diff --git a/src/Cas/SymfonyCas.php b/src/Cas/SymfonyCas.php
diff --git a/src/Cas/SymfonyCasInterface.php b/src/Cas/SymfonyCasInterface.php
diff --git a/src/Cas/SymfonyCasResponseBuilder.php b/src/Cas/SymfonyCasResponseBuilder.php
diff --git a/src/Cas/SymfonyCasResponseBuilderInterface.php b/src/Cas/SymfonyCasResponseBuilderInterface.php
diff --git a/src/Controller/Login.php b/src/Controller/Login.php
@@ -11,33 +11,20 @@
 
 namespace EcPhp\CasBundle\Controller;
 
-use EcPhp\CasBundle\Cas\SymfonyCasInterface;
+use EcPhp\CasLib\Contract\CasInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Security\Core\Security;
 use Throwable;
 
-/**
- * @deprecated Use a security entry point, see https://symfony.com/doc/current/security/entry_point.html
- */
 final class Login
 {
     public function __invoke(
-        Request $request,
-        SymfonyCasInterface $cas,
-        Security $security
+        ServerRequestInterface $request,
+        CasInterface $cas
     ): RedirectResponse|ResponseInterface {
-        $parameters = $request->query->all() + [
-            'renew' => null !== $security->getUser(),
-        ];
-
         try {
-            $response = $cas
-                ->login(
-                    $request,
-                    $parameters
-                );
+            $response = $cas->login($request);
         } catch (Throwable) {
             // TODO: Should we log the error ?
             // If yes, we need to inject the LoggerInterface and require it

diff --git a/src/Controller/Logout.php b/src/Controller/Logout.php
@@ -11,28 +11,24 @@
 
 namespace EcPhp\CasBundle\Controller;
 
-use EcPhp\CasBundle\Cas\SymfonyCasInterface;
+use EcPhp\CasLib\Contract\CasInterface;
 use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
 use Throwable;
 
 final class Logout
 {
     public function __invoke(
-        Request $request,
-        SymfonyCasInterface $cas,
+        ServerRequestInterface $request,
+        CasInterface $cas,
         Security $security,
         TokenStorageInterface $tokenStorage
     ): ResponseInterface|RedirectResponse {
         try {
-            $response = $cas
-                ->logout(
-                    $request,
-                    $request->query->all()
-                );
+            $response = $cas->logout($request);
         } catch (Throwable) {
             // TODO: Should we log the error ?
             // If yes, we need to inject the LoggerInterface and require it

diff --git a/src/Controller/ProxyCallback.php b/src/Controller/ProxyCallback.php
@@ -11,24 +11,20 @@
 
 namespace EcPhp\CasBundle\Controller;
 
-use EcPhp\CasBundle\Cas\SymfonyCasInterface;
+use EcPhp\CasLib\Contract\CasInterface;
 use Psr\Http\Message\ResponseInterface;
-use Symfony\Component\HttpFoundation\Request;
+use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Throwable;
 
 final class ProxyCallback
 {
     public function __invoke(
-        Request $request,
-        SymfonyCasInterface $cas
+        ServerRequestInterface $request,
+        CasInterface $cas
     ): ResponseInterface|Response {
         try {
-            $response = $cas
-                ->handleProxyCallback(
-                    $request,
-                    $request->query->all()
-                );
+            $response = $cas->handleProxyCallback($request);
         } catch (Throwable) {
             return new Response('', 500);
         }