From 819f1ff032c24411e9eee32be7c015ae90638d00 Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Fri, 3 Dec 2021 19:41:27 +0530
Subject: [PATCH 1/2] [Updated: Category locale request issue(using API,
 GraphQL) fixed.]

---
 .../src/Repositories/CategoryRepository.php   |  2 +-
 packages/Webkul/User/src/Models/Admin.php     | 23 ++++++++++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/Webkul/Category/src/Repositories/CategoryRepository.php b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
index 30e39d98f..533ef33ad 100755
--- a/packages/Webkul/Category/src/Repositories/CategoryRepository.php
+++ b/packages/Webkul/Category/src/Repositories/CategoryRepository.php
@@ -300,7 +300,7 @@ class CategoryRepository extends Repository
             foreach (core()->getAllLocales() as $locale) {
                 foreach ($model->translatedAttributes as $attribute) {
                     if ($attribute === $attributeName) {
-                        $data[$locale->code][$attribute] = $data[$requestedLocale][$attribute];
+                        $data[$locale->code][$attribute] = isset($data[$requestedLocale][$attribute]) ?: $data[$data['locale']][$attribute];
                     }
                 }
             }
diff --git a/packages/Webkul/User/src/Models/Admin.php b/packages/Webkul/User/src/Models/Admin.php
index 62cf2d6e2..00f0b76f6 100755
--- a/packages/Webkul/User/src/Models/Admin.php
+++ b/packages/Webkul/User/src/Models/Admin.php
@@ -8,8 +8,9 @@ use Illuminate\Notifications\Notifiable;
 use Webkul\User\Contracts\Admin as AdminContract;
 use Webkul\User\Database\Factories\AdminFactory;
 use Webkul\User\Notifications\AdminResetPassword;
+use Tymon\JWTAuth\Contracts\JWTSubject;
 
-class Admin extends Authenticatable implements AdminContract
+class Admin extends Authenticatable implements AdminContract, JWTSubject
 {
     use HasFactory, Notifiable;
 
@@ -83,4 +84,24 @@ class Admin extends Authenticatable implements AdminContract
     {
         return AdminFactory::new();
     }
+    
+    /**
+     * Get the identifier that will be stored in the subject claim of the JWT.
+     *
+     * @return mixed
+     */
+    public function getJWTIdentifier()
+    {
+        return $this->getKey();
+    }
+
+    /**
+     * Return a key value array, containing any custom claims to be added to the JWT.
+     *
+     * @return array
+     */
+    public function getJWTCustomClaims()
+    {
+        return [];
+    }
 }

From 01af2d1307333c8c62e0be2282090f196f267080 Mon Sep 17 00:00:00 2001
From: Vivek <viveksh047@webkul.com>
Date: Sat, 4 Dec 2021 11:28:16 +0530
Subject: [PATCH 2/2] [Updated: Tymon JWT namespace updated.]

---
 packages/Webkul/User/src/Models/Admin.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/Webkul/User/src/Models/Admin.php b/packages/Webkul/User/src/Models/Admin.php
index 00f0b76f6..50c414f04 100755
--- a/packages/Webkul/User/src/Models/Admin.php
+++ b/packages/Webkul/User/src/Models/Admin.php
@@ -8,7 +8,7 @@ use Illuminate\Notifications\Notifiable;
 use Webkul\User\Contracts\Admin as AdminContract;
 use Webkul\User\Database\Factories\AdminFactory;
 use Webkul\User\Notifications\AdminResetPassword;
-use Tymon\JWTAuth\Contracts\JWTSubject;
+use PHPOpenSourceSaver\JWTAuth\Contracts\JWTSubject;
 
 class Admin extends Authenticatable implements AdminContract, JWTSubject
 {
@@ -84,7 +84,7 @@ class Admin extends Authenticatable implements AdminContract, JWTSubject
     {
         return AdminFactory::new();
     }
-    
+
     /**
      * Get the identifier that will be stored in the subject claim of the JWT.
      *
@@ -100,7 +100,7 @@ class Admin extends Authenticatable implements AdminContract, JWTSubject
      *
      * @return array
      */
-    public function getJWTCustomClaims()
+    public function getJWTCustomClaims(): array
     {
         return [];
     }