From e334037e24bcdb44a87689950b323a5178c34614 Mon Sep 17 00:00:00 2001
From: Mario Shtika <marioshtika@gmail.com>
Date: Fri, 14 Oct 2022 11:18:22 +0300
Subject: [PATCH 1/2] Create a unique namespace to load the JWT & Key classes
 of this plugin

---
 includes/class-jwt-auth.php      |  6 ++++++
 includes/extend-classes.php      | 11 +++++++++++
 public/class-jwt-auth-public.php |  4 ++--
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 includes/extend-classes.php
 mode change 100755 => 100644 public/class-jwt-auth-public.php

diff --git a/includes/class-jwt-auth.php b/includes/class-jwt-auth.php
index ea74e94..7212ddf 100755
--- a/includes/class-jwt-auth.php
+++ b/includes/class-jwt-auth.php
@@ -104,6 +104,12 @@ private function load_dependencies() {
 		 */
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-jwt-auth-i18n.php';
 
+		/**
+		 * The class responsible for creating a unique namespace to load the JWT & Key 
+		 * classes of this plugin
+		 */
+		require_once plugin_dir_path(dirname(__FILE__)) . 'includes/extend-classes.php';
+
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
 		 * side of the site.
diff --git a/includes/extend-classes.php b/includes/extend-classes.php
new file mode 100644
index 0000000..82f7b6e
--- /dev/null
+++ b/includes/extend-classes.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Tmeister\Firebase\JWT;
+
+class JWT extends \Firebase\JWT\JWT
+{
+}
+
+class Key extends \Firebase\JWT\Key
+{
+}
diff --git a/public/class-jwt-auth-public.php b/public/class-jwt-auth-public.php
old mode 100755
new mode 100644
index 21a3084..430ecaa
--- a/public/class-jwt-auth-public.php
+++ b/public/class-jwt-auth-public.php
@@ -1,8 +1,8 @@
 <?php
 
 /** Require the JWT library. */
-use Firebase\JWT\JWT;
-use Firebase\JWT\Key;
+use Tmeister\Firebase\JWT\JWT;
+use Tmeister\Firebase\JWT\Key;
 
 /**
  * The public-facing functionality of the plugin.

From e386725776302b1df00906d75d4d0019a388ad19 Mon Sep 17 00:00:00 2001
From: Tmeister <noone@tmeister.net>
Date: Fri, 14 Oct 2022 13:14:52 -0500
Subject: [PATCH 2/2] Add a wrapper namespace to prevent conflicts with other
 plugins using the same JWT library

---
 includes/class-jwt-auth.php              |  7 ++++---
 includes/class-jwt-namespace-wrapper.php | 18 ++++++++++++++++++
 includes/extend-classes.php              | 11 -----------
 jwt-auth.php                             |  2 +-
 readme.txt                               |  5 ++++-
 5 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 includes/class-jwt-namespace-wrapper.php
 delete mode 100644 includes/extend-classes.php

diff --git a/includes/class-jwt-auth.php b/includes/class-jwt-auth.php
index 7212ddf..cb1f9d2 100755
--- a/includes/class-jwt-auth.php
+++ b/includes/class-jwt-auth.php
@@ -105,10 +105,11 @@ private function load_dependencies() {
 		require_once plugin_dir_path( dirname( __FILE__ ) ) . 'includes/class-jwt-auth-i18n.php';
 
 		/**
-		 * The class responsible for creating a unique namespace to load the JWT & Key 
-		 * classes of this plugin
+		 * Class responsible for creating a `wrapper namespace` to load the Firebase's JWT & Key
+		 * classes and prevent conflicts with other plugins using the same library
+		 * with different versions.
 		 */
-		require_once plugin_dir_path(dirname(__FILE__)) . 'includes/extend-classes.php';
+		require_once plugin_dir_path(dirname(__FILE__)) . 'includes/class-jwt-namespace-wrapper.php';
 
 		/**
 		 * The class responsible for defining all actions that occur in the public-facing
diff --git a/includes/class-jwt-namespace-wrapper.php b/includes/class-jwt-namespace-wrapper.php
new file mode 100644
index 0000000..befcf08
--- /dev/null
+++ b/includes/class-jwt-namespace-wrapper.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Define a `wrapper namespace` to load the Firebase's JWT & Key classes
+ * and prevent conflicts with other plugins using the same library
+ * with different versions.
+ *
+ * @link       https://enriquechavez.co
+ * @since      1.3.2
+ * @author     marioshtika https://github.com/marioshtika
+ */
+
+namespace Tmeister\Firebase\JWT;
+
+class JWT extends \Firebase\JWT\JWT {
+}
+
+class Key extends \Firebase\JWT\Key {
+}
diff --git a/includes/extend-classes.php b/includes/extend-classes.php
deleted file mode 100644
index 82f7b6e..0000000
--- a/includes/extend-classes.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace Tmeister\Firebase\JWT;
-
-class JWT extends \Firebase\JWT\JWT
-{
-}
-
-class Key extends \Firebase\JWT\Key
-{
-}
diff --git a/jwt-auth.php b/jwt-auth.php
index 3117b3b..4a05ebf 100755
--- a/jwt-auth.php
+++ b/jwt-auth.php
@@ -15,7 +15,7 @@
  * Plugin Name:       JWT Authentication for WP-API
  * Plugin URI:        https://enriquechavez.co
  * Description:       Extends the WP REST API using JSON Web Tokens Authentication as an authentication method.
- * Version:           1.3.1
+ * Version:           1.3.2
  * Author:            Enrique Chavez
  * Author URI:        https://enriquechavez.co
  * License:           GPL-2.0+
diff --git a/readme.txt b/readme.txt
index 574cdf8..2a1ee32 100755
--- a/readme.txt
+++ b/readme.txt
@@ -6,7 +6,7 @@ Tags: wp-json, jwt, json web authentication, wp-api
 Requires at least: 4.2
 Tested up to: 6.0.2
 Requires PHP: 7.4.0
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -365,6 +365,9 @@ I've created a small app to test the basic functionality of the plugin; you can
 ###Please read how to configured the plugin https://wordpress.org/plugins/jwt-authentication-for-wp-rest-api/
 
 == Changelog ==
+= 1.3.2 =
+* Fix conflicts with other plugins using the same JWT library adding a wrapper namespace to the JWT class.
+
 = 1.3.1 =
 * Updating the minimum version of PHP to 7.4
 * Validate the signing algorithm against the supported algorithms @see https://www.rfc-editor.org/rfc/rfc7518#section-3