added TokenValidator class

descope · Jan 2, 2025 · a117f32 · a117f32
1 parent 134de0e
commit a117f32
Show file tree

Hide file tree

Showing 4 changed files with 112 additions and 54 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -14,7 +14,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [8.1, 7.3]
+        php-version: [8.1, 7.4]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/composer.lock b/composer.lock
diff --git a/src/SDK/DescopeSDK.php b/src/SDK/DescopeSDK.php
@@ -14,6 +14,7 @@
 use Descope\SDK\EndpointsV1;
 use Descope\SDK\EndpointsV2;
 use Descope\SDK\Exception\AuthException;
+use Descope\SDK\Exception\ValidateException;
 
 use Descope\SDK\Management\MgmtV1;
 
@@ -66,7 +67,7 @@ public function verify($sessionToken = null): bool
         $sessionToken = $sessionToken ?? $_COOKIE[EndpointsV1::$SESSION_COOKIE_NAME] ?? null;
 
         if (!$sessionToken) {
-            throw new \InvalidArgumentException('Session token cannot be null or empty.');
+            throw ValidationException::forMissingSessionToken();
         }
 
         $verifier = new Verifier($this->config, $this->api);
@@ -85,7 +86,7 @@ public function refreshSession($refreshToken = null): array
         $refreshToken = $refreshToken ?? $_COOKIE[EndpointsV1::$REFRESH_COOKIE_NAME] ?? null;
 
         if (empty($refreshToken)) {
-            throw new \InvalidArgumentException('Refresh token cannot be null or empty.');
+            throw ValidationException::forMissingRefreshToken();
         }
 
         try {
@@ -116,7 +117,7 @@ public function verifyAndRefreshSession($sessionToken = null, $refreshToken = nu
         $refreshToken = $refreshToken ?? $_COOKIE[EndpointsV1::$REFRESH_COOKIE_NAME] ?? null;
 
         if (empty($sessionToken) || empty($refreshToken)) {
-            throw new \InvalidArgumentException('Session or refresh token cannot be null or empty.');
+            throw new ValidateException('Session or refresh token cannot be null or empty.');
         }
 
         try {
@@ -139,7 +140,7 @@ public function getClaims($token = null): array
         $token = $token ?? $_COOKIE[EndpointsV1::$SESSION_COOKIE_NAME] ?? null;
 
         if (!$token) {
-            throw new \InvalidArgumentException('Session token cannot be null or empty.');
+            throw ValidationException::forMissingSessionToken();
         }
 
         $extractor = new Extractor($this->config);
@@ -158,7 +159,7 @@ public function getUserDetails(string $refreshToken = null): array
         $refreshToken = $refreshToken ?? $_COOKIE[EndpointsV1::$REFRESH_COOKIE_NAME] ?? null;
 
         if (!$refreshToken) {
-            throw new \InvalidArgumentException('Refresh token cannot be null or empty.');
+            throw ValidationException::forMissingRefreshToken();
         }
 
         try {
@@ -186,7 +187,7 @@ public function logout(string $refreshToken = null): void
         $refreshToken = $refreshToken ?? $_COOKIE[EndpointsV1::$REFRESH_COOKIE_NAME] ?? null;
 
         if (!$refreshToken) {
-            throw new \InvalidArgumentException('Refresh token cannot be null or empty.');
+            throw ValidationException::forMissingRefreshToken();
         }
 
         try {
@@ -216,7 +217,7 @@ public function logoutAll(string $refreshToken = null): void
         $refreshToken = $refreshToken ?? $_COOKIE[EndpointsV1::$REFRESH_COOKIE_NAME] ?? null;
 
         if (!$refreshToken) {
-            throw new \InvalidArgumentException('Refresh token cannot be null or empty.');
+            throw ValidationException::forMissingRefreshToken();
         }
 
         try {