Merge pull request #70 from bkrajendra/main

Fix: replaced tymon/jwt-auth with php-open-source-saver/jwt-auth
rluders · Mar 29, 2023 · e4c95ea · e4c95ea
2 parents a6ca1e2 + 094dc56
commit e4c95ea
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 13 deletions.
diff --git a/.codecov.yml b/.codecov.yml
@@ -0,0 +1 @@
+comment: off
diff --git a/.gitignore b/.gitignore
@@ -79,3 +79,4 @@ $RECYCLE.BIN/
 
 
 # End of https://www.gitignore.io/api/osx,linux,windows,composer
+composer.lock
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="https://octobercms.com/storage/app/uploads/public/58b/8a6/0b5/58b8a60b50133737978501.png" style="border:1px solid #ddd;width:auto;">
+  <img src="jwt.png" style="border:1px solid #ddd;width:auto;">
 </p>
 
 <p align="center">

diff --git a/classes/AuthAdapter.php b/classes/AuthAdapter.php
@@ -4,7 +4,7 @@
 
 use Winter\Storm\Auth\AuthException;
 use RLuders\JWTAuth\Classes\AuthManager;
-use Tymon\JWTAuth\Contracts\Providers\Auth as AuthInterface;
+use PHPOpenSourceSaver\JWTAuth\Contracts\Providers\Auth as AuthInterface;
 
 /**
  * {@inheritDoc}

diff --git a/classes/JWTAuth.php b/classes/JWTAuth.php
@@ -2,7 +2,7 @@
 
 namespace RLuders\JWTAuth\Classes;
 
-use Tymon\JWTAuth\JWTAuth as BaseJWTAuth;
+use PHPOpenSourceSaver\JWTAuth\JWTAuth as BaseJWTAuth;
 
 class JWTAuth extends BaseJWTAuth
 {

diff --git a/composer.json b/composer.json
@@ -31,8 +31,13 @@
         "php": ">=7.0",
         "composer/installers": "~1.0",
         "winter/wn-user-plugin": "^2.0",
-        "tymon/jwt-auth": "~0.5|^1.0"
+        "php-open-source-saver/jwt-auth": "^2.1"
     },
     "minimum-stability": "dev",
-    "prefer-stable": true
-}
+    "prefer-stable": true,
+    "config": {
+        "allow-plugins": {
+            "composer/installers": true
+        }
+    }
+}
diff --git a/config/jwt.php b/config/jwt.php
@@ -22,7 +22,7 @@
         |
         */
 
-        'jwt' => Tymon\JWTAuth\Providers\JWT\Namshi::class,
+        'jwt' => PHPOpenSourceSaver\JWTAuth\Providers\JWT\Namshi::class,
 
         /*
         |--------------------------------------------------------------------------
@@ -44,7 +44,7 @@
         |
         */
 
-        'storage' => Tymon\JWTAuth\Providers\Storage\Illuminate::class,
+        'storage' => PHPOpenSourceSaver\JWTAuth\Providers\Storage\Illuminate::class,
 
     ],
 

diff --git a/exceptions/JsonValidationException.php b/exceptions/JsonValidationException.php
@@ -21,7 +21,7 @@ public function getHeaders(): array
         ];
     }
 
-    public function toArray()
+    public function toArray(): array
     {
         return ['errors' => $this->getErrors()];
     }

diff --git a/http/controllers/LoginController.php b/http/controllers/LoginController.php
@@ -6,7 +6,7 @@
 use Illuminate\Http\Response;
 use Illuminate\Routing\Controller;
 use RLuders\JWTAuth\Classes\JWTAuth;
-use Tymon\JWTAuth\Exceptions\JWTException;
+use PHPOpenSourceSaver\JWTAuth\Exceptions\JWTException;
 use RLuders\JWTAuth\Http\Requests\LoginRequest;
 
 class LoginController extends Controller

diff --git a/http/controllers/RefreshTokenController.php b/http/controllers/RefreshTokenController.php
@@ -6,7 +6,7 @@
 use Illuminate\Routing\Controller;
 use RLuders\JWTAuth\Classes\JWTAuth;
 use RLuders\JWTAuth\Http\Requests\TokenRequest;
-use Tymon\JWTAuth\Exceptions\TokenBlacklistedException;
+use PHPOpenSourceSaver\JWTAuth\Exceptions\TokenBlacklistedException;
 
 class RefreshTokenController extends Controller
 {

diff --git a/jwt.png b/jwt.png
diff --git a/models/User.php b/models/User.php
@@ -2,7 +2,7 @@
 
 namespace RLuders\JWTAuth\Models;
 
-use Tymon\JWTAuth\Contracts\JWTSubject;
+use PHPOpenSourceSaver\JWTAuth\Contracts\JWTSubject;
 use Winter\User\Models\User as BaseUser;
 
 class User extends BaseUser implements JWTSubject

diff --git a/providers/AuthServiceProvider.php b/providers/AuthServiceProvider.php
@@ -5,7 +5,7 @@
 use Config;
 use Response;
 use Winter\User\Models\User;
-use Tymon\JWTAuth\Providers\AbstractServiceProvider;
+use PHPOpenSourceSaver\JWTAuth\Providers\AbstractServiceProvider;
 use RLuders\JWTAuth\Models\Settings as PluginSettings;
 use RLuders\JWTAuth\Exceptions\JsonValidationException;
 

diff --git a/updates/version.yaml b/updates/version.yaml
@@ -60,3 +60,6 @@
     - Updates dependencies
     - Fix language support
     - Adds French language support
+1.4.5:
+    - Updates dependencies - replaced tymon/jwt-auth with php-open-source-saver/jwt-auth
+    - Adds jwt-auth related refactoring
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,3 +79,4 @@ $RECYCLE.BIN/


		# End of https://www.gitignore.io/api/osx,linux,windows,composer
		composer.lock
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ public function getHeaders(): array @@
             ];
         }
-        public function toArray()
+        public function toArray(): array
         {
             return ['errors' => $this->getErrors()];
         }
@@ Expand Down @@