refactoring and endpoint to check if logged in

Author: danielplan

lib/Controller/AuthController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace RexGraphQL\Controller;
+
+use GraphQL\Service\Auth\AuthService;
+use TheCodingMachine\GraphQLite\Annotations\Query;
+
+class AuthController
+{
+    private AuthService $service;
+    public function __construct()
+    {
+        $this->service = new AuthService();
+    }
+
+    #[Query]
+    public function isRedaxoLoggedIn(): bool
+    {
+        return $this->service->isRedaxoLoggedIn();
+    }
+
+}

lib/Endpoint.php

@@ -3,21 +3,20 @@
 namespace GraphQL;
 
 use GraphQL\Error\DebugFlag;
+use GraphQL\Service\Auth\AuthService;
 use GraphQL\Validator\DocumentValidator;
 use GraphQL\Validator\Rules\QueryDepth;
 use rex;
 use rex_extension;
 use rex_extension_point;
 use rex_response;
 use rex_var;
-use RexGraphQL\Auth\AuthService;
 use Symfony\Component\DependencyInjection\Container;
 use TheCodingMachine\GraphQLite\Context\Context;
 use TheCodingMachine\GraphQLite\Exceptions\WebonyxErrorHandler;
 use TheCodingMachine\GraphQLite\Schema;
 use TheCodingMachine\GraphQLite\SchemaFactory;
 use Yiisoft\Cache\ArrayCache;
-
 use function is_array;
 
 class Endpoint

lib/Extensions.php

@@ -2,8 +2,8 @@
 
 namespace GraphQL;
 
-use RexGraphQL\Auth\AuthService;
-use RexGraphQL\Auth\JwtService;
+use GraphQL\Service\Auth\AuthService;
+use GraphQL\Service\Auth\JwtService;
 use RexGraphQL\Connector\Connector;
 use RexGraphQL\RexGraphQL;
 

lib/Auth/AuthService.php lib/Service/Auth/AuthService.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace RexGraphQL\Auth;
+namespace GraphQL\Service\Auth;
 use TheCodingMachine\GraphQLite\Security\AuthenticationServiceInterface;
 
+
 class AuthService implements AuthenticationServiceInterface
 {
 
@@ -19,11 +20,11 @@ public function __construct()
     public function isLogged(): bool
     {
         $secret = \rex_addon::get('graphql')->getConfig(self::SHARED_SECRET_CONFIG_KEY);
-        $bearerToken = static::parseBearerToken();
+        $bearerToken = static::getBearerToken();
         if(!$bearerToken && $secret) {
             return false;
         }
-        if(($bearerToken && $this->jwtService->validateToken($bearerToken)) || !$secret) {
+        if($this->isRedaxoLoggedIn() || !$secret) {
             return true;
         }
         return $bearerToken === $secret;
@@ -34,7 +35,13 @@ public function getUser(): ?object
         return null;
     }
 
-    private static function parseBearerToken(): ?string
+    public function isRedaxoLoggedIn(): bool
+    {
+        $bearerToken = self::getBearerToken();
+        return $bearerToken && $this->jwtService->validateToken($bearerToken);
+    }
+
+    public static function getBearerToken(): ?string
     {
         $authHeader = $_SERVER['HTTP_AUTHORIZATION'] ?? null;
         if (null === $authHeader) {

lib/Auth/JwtService.php lib/Service/Auth/JwtService.php

@@ -1,9 +1,10 @@
 <?php
 
-namespace RexGraphQL\Auth;
+namespace GraphQL\Service\Auth;
 
 use Firebase\JWT\JWT;
 use Firebase\JWT\Key;
+use PHPMailer\PHPMailer\Exception;
 
 class JwtService
 {
@@ -16,12 +17,17 @@ public function validateToken(string $token): bool
             return false;
         }
         $key = new Key($key, self::KEY_ALGORITHM);
-        $token = JWT::decode($token, $key);
-        if($token->userId > 0) {
-            $user = \rex_user::get($token->userId);
-            \rex::setProperty('user', $user);
-            return true;
+        try {
+            $token = JWT::decode($token, $key);
+            if($token->userId > 0) {
+                $user = \rex_user::get($token->userId);
+                \rex::setProperty('user', $user);
+                return true;
+            }
+        } catch (\DomainException|\UnexpectedValueException $exception) {
+            return false;
         }
+
         return false;
     }
 
@@ -35,7 +41,7 @@ public function generateToken(): ?string {
         $key = $this->getKey();
         if($user && $key) {
             $payload = [
-                'userId' => $user->getId()
+                'userId' => $user->getId(),
             ];
             return JWT::encode($payload, $key, self::KEY_ALGORITHM);
         }

pages/index.php

@@ -1,7 +1,7 @@
 <?php
 
-use RexGraphQL\Auth\AuthService;
-use RexGraphQL\Auth\JwtService;
+use GraphQL\Service\Auth\AuthService;
+use GraphQL\Service\Auth\JwtService;
 use RexGraphQL\RexGraphQL;
 
 echo rex_view::title($this->getProperty('page')['title']);