From bc78b31716e2cb8d742f3216c98ed0d4028c3978 Mon Sep 17 00:00:00 2001
From: "Carlos Alberto B. Carucce" <carloscarucce@gmail.com>
Date: Thu, 26 Dec 2024 10:49:42 -0300
Subject: [PATCH 1/2] Replacing generic exceptions

---
 src/Exception/InvalidAlgException.php      | 10 +++++++
 src/Exception/InvalidTokenException.php    | 10 +++++++
 src/Exception/TokenNotPresentException.php | 10 +++++++
 src/SignerFactory.php                      |  7 ++---
 src/Token.php                              | 34 +++++++++++++---------
 5 files changed, 53 insertions(+), 18 deletions(-)
 create mode 100644 src/Exception/InvalidAlgException.php
 create mode 100644 src/Exception/InvalidTokenException.php
 create mode 100644 src/Exception/TokenNotPresentException.php

diff --git a/src/Exception/InvalidAlgException.php b/src/Exception/InvalidAlgException.php
new file mode 100644
index 0000000..7ee02e1
--- /dev/null
+++ b/src/Exception/InvalidAlgException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webdevcave\Jwt\Exception;
+
+use Exception;
+
+class InvalidAlgException extends Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Exception/InvalidTokenException.php b/src/Exception/InvalidTokenException.php
new file mode 100644
index 0000000..0b90a81
--- /dev/null
+++ b/src/Exception/InvalidTokenException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webdevcave\Jwt\Exception;
+
+use Exception;
+
+class InvalidTokenException extends Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/Exception/TokenNotPresentException.php b/src/Exception/TokenNotPresentException.php
new file mode 100644
index 0000000..1ae6df3
--- /dev/null
+++ b/src/Exception/TokenNotPresentException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Webdevcave\Jwt\Exception;
+
+use Exception;
+
+class TokenNotPresentException extends Exception
+{
+
+}
\ No newline at end of file
diff --git a/src/SignerFactory.php b/src/SignerFactory.php
index 311e931..a1e25f9 100644
--- a/src/SignerFactory.php
+++ b/src/SignerFactory.php
@@ -2,7 +2,7 @@
 
 namespace Webdevcave\Jwt;
 
-use Exception;
+use Webdevcave\Jwt\Exception\InvalidAlgException;
 use Webdevcave\Jwt\Signer\Hs\Hs256Signer;
 use Webdevcave\Jwt\Signer\Hs\Hs384Signer;
 use Webdevcave\Jwt\Signer\Hs\Hs512Signer;
@@ -39,14 +39,13 @@ public static function assign(string $algorithm, string $className): void
     /**
      * @param string $algorithm
      *
-     * @throws Exception
-     *
+     * @throws InvalidAlgException
      * @return Signer
      */
     public static function build(string $algorithm): Signer
     {
         if (!isset(self::$algorithmMap[$algorithm])) {
-            throw new Exception("Algorithm not assigned: $algorithm. See SignerFactory::assign()");
+            throw new InvalidAlgException("Algorithm not assigned: $algorithm. See SignerFactory::assign()");
         }
 
         $className = self::$algorithmMap[$algorithm];
diff --git a/src/Token.php b/src/Token.php
index fe3b1ed..8556918 100644
--- a/src/Token.php
+++ b/src/Token.php
@@ -2,7 +2,9 @@
 
 namespace Webdevcave\Jwt;
 
-use Exception;
+use Webdevcave\Jwt\Exception\InvalidAlgException;
+use Webdevcave\Jwt\Exception\InvalidTokenException;
+use Webdevcave\Jwt\Exception\TokenNotPresentException;
 use Webdevcave\Jwt\Secrets\Secret;
 use Webdevcave\Jwt\Signer\Hs\Hs256Signer;
 use Webdevcave\Jwt\Signer\Signer;
@@ -87,8 +89,9 @@ private static function getDefaultSigner(): Signer
     }
 
     /**
-     * @throws Exception
-     *
+     * @throws InvalidAlgException
+     * @throws InvalidTokenException
+     * @throws TokenNotPresentException
      * @return Token
      */
     public static function fromAuthorizationBearer(): Token
@@ -117,12 +120,12 @@ public static function fromAuthorizationBearer(): Token
         }
 
         if (!$authorizationHeader) {
-            throw new Exception('Authorization header is not set');
+            throw new TokenNotPresentException('Authorization header is not set');
         }
 
         $matches = [];
         if (!preg_match('/Bearer\s((.*)\.(.*)\.(.*))/', $authorizationHeader, $matches)) {
-            throw new Exception('Invalid "Authorization" header value');
+            throw new InvalidTokenException('Invalid "Authorization" header value');
         }
 
         return static::fromString($matches[1]);
@@ -131,8 +134,8 @@ public static function fromAuthorizationBearer(): Token
     /**
      * @param string $token
      *
-     * @throws Exception
-     *
+     * @throws InvalidAlgException
+     * @throws InvalidTokenException
      * @return Token
      */
     public static function fromString(string $token): Token
@@ -140,7 +143,7 @@ public static function fromString(string $token): Token
         $parts = explode('.', $token);
 
         if (count($parts) != 3) {
-            throw new Exception('Invalid token: JWT token must have 3 sections separated by "."');
+            throw new InvalidTokenException('Invalid token: JWT token must have 3 sections separated by "."');
         }
 
         $headers = json_decode(self::decodeSection($parts[0]), true) ?: [];
@@ -148,7 +151,7 @@ public static function fromString(string $token): Token
         $signature = self::decodeSection($parts[2]) ?: '';
 
         if (empty($headers['alg'])) {
-            throw new Exception('"alg" JWT header must not be empty');
+            throw new InvalidTokenException('"alg" JWT header must not be empty');
         }
 
         return static::create()
@@ -214,15 +217,18 @@ public static function create(): Token
     }
 
     /**
-     * @param $param
-     *
-     * @throws Exception
+     * @param string $param
      *
+     * @throws TokenNotPresentException
      * @return Token
      */
-    public static function fromQueryString($param = 'token'): Token
+    public static function fromQueryString(string $param = 'token'): Token
     {
-        $token = isset($_GET[$param]) ? $_GET[$param] : null;
+        $token = $_GET[$param] ?? null;
+
+        if (is_null($token)) {
+            throw new TokenNotPresentException('Token parameter is not set');
+        }
 
         return static::fromString($token);
     }

From 87bad7e890f6a46b62affb9ca0353adb83993958 Mon Sep 17 00:00:00 2001
From: "Carlos Alberto B. Carucce" <carloscarucce@gmail.com>
Date: Thu, 26 Dec 2024 10:58:09 -0300
Subject: [PATCH 2/2] Style fixes from StyleCI

---
 src/Exception/InvalidAlgException.php      | 3 +--
 src/Exception/InvalidTokenException.php    | 3 +--
 src/Exception/TokenNotPresentException.php | 3 +--
 src/SignerFactory.php                      | 1 +
 src/Token.php                              | 3 +++
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Exception/InvalidAlgException.php b/src/Exception/InvalidAlgException.php
index 7ee02e1..0acbcc6 100644
--- a/src/Exception/InvalidAlgException.php
+++ b/src/Exception/InvalidAlgException.php
@@ -6,5 +6,4 @@
 
 class InvalidAlgException extends Exception
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/Exception/InvalidTokenException.php b/src/Exception/InvalidTokenException.php
index 0b90a81..97fa793 100644
--- a/src/Exception/InvalidTokenException.php
+++ b/src/Exception/InvalidTokenException.php
@@ -6,5 +6,4 @@
 
 class InvalidTokenException extends Exception
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/Exception/TokenNotPresentException.php b/src/Exception/TokenNotPresentException.php
index 1ae6df3..367f764 100644
--- a/src/Exception/TokenNotPresentException.php
+++ b/src/Exception/TokenNotPresentException.php
@@ -6,5 +6,4 @@
 
 class TokenNotPresentException extends Exception
 {
-
-}
\ No newline at end of file
+}
diff --git a/src/SignerFactory.php b/src/SignerFactory.php
index a1e25f9..437626d 100644
--- a/src/SignerFactory.php
+++ b/src/SignerFactory.php
@@ -40,6 +40,7 @@ public static function assign(string $algorithm, string $className): void
      * @param string $algorithm
      *
      * @throws InvalidAlgException
+     *
      * @return Signer
      */
     public static function build(string $algorithm): Signer
diff --git a/src/Token.php b/src/Token.php
index 8556918..cbf0c51 100644
--- a/src/Token.php
+++ b/src/Token.php
@@ -92,6 +92,7 @@ private static function getDefaultSigner(): Signer
      * @throws InvalidAlgException
      * @throws InvalidTokenException
      * @throws TokenNotPresentException
+     *
      * @return Token
      */
     public static function fromAuthorizationBearer(): Token
@@ -136,6 +137,7 @@ public static function fromAuthorizationBearer(): Token
      *
      * @throws InvalidAlgException
      * @throws InvalidTokenException
+     *
      * @return Token
      */
     public static function fromString(string $token): Token
@@ -220,6 +222,7 @@ public static function create(): Token
      * @param string $param
      *
      * @throws TokenNotPresentException
+     *
      * @return Token
      */
     public static function fromQueryString(string $param = 'token'): Token