From cc87ef4b6696362d6f90bbea47306141e5a4085f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cshraddha?= <“shraddha_s@techjoomla.com”>
Date: Thu, 18 Apr 2019 12:59:50 +0530
Subject: [PATCH 1/3] Task #143449 chore: support HTTP_IDENTIFIER in get
 request of user API

---
 src/users/user.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/users/user.php b/src/users/user.php
index d0795e9..9b0eb0f 100644
--- a/src/users/user.php
+++ b/src/users/user.php
@@ -156,6 +156,7 @@ public function get()
 	{
 		$input = JFactory::getApplication()->input;
 		$id = $input->get('id', 0, 'int');
+		$xidentifier	= $input->server->get('HTTP_IDENTIFIER', '', 'String');
 
 		/*
 		 * If we have an id try to fetch the user
@@ -163,7 +164,15 @@ public function get()
 		 */
 		if ($id)
 		{
-			$user = JUser::getInstance($id);
+			if ($xidentifier)
+			{
+				// Get a user object
+				$user = $this->retriveUser($xidentifier, $id);
+			}
+			else
+			{
+				$user = JUser::getInstance($id);
+			}
 
 			if (! $user->id)
 			{

From accb88e435639574cb3a63b839d0b2420c4cef54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cshraddha?= <“shraddha_s@techjoomla.com”>
Date: Thu, 18 Apr 2019 14:40:48 +0530
Subject: [PATCH 2/3] Task #143449 chore: Update HTTP_IDENTIFER to
 HTTP_X_IDENTIFIER

---
 src/users/user.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/users/user.php b/src/users/user.php
index 9b0eb0f..a795bdc 100644
--- a/src/users/user.php
+++ b/src/users/user.php
@@ -34,7 +34,7 @@ public function post()
 		$params = JComponentHelper::getParams("com_users");
 		$response = new stdClass;
 
-		$xidentifier = $app->input->server->get('HTTP_IDENTIFIER');
+		$xidentifier = $app->input->server->get('HTTP_X_IDENTIFIER');
 		$fidentifier = $app->input->server->get('HTTP_FORCECREATE');
 
 		if ($formData['username'] == '' || $formData['name'] == '' || $formData['email'] == '')
@@ -156,7 +156,7 @@ public function get()
 	{
 		$input = JFactory::getApplication()->input;
 		$id = $input->get('id', 0, 'int');
-		$xidentifier	= $input->server->get('HTTP_IDENTIFIER', '', 'String');
+		$xidentifier	= $input->server->get('HTTP_X_IDENTIFIER', '', 'String');
 
 		/*
 		 * If we have an id try to fetch the user
@@ -271,7 +271,7 @@ public function delete()
 	{
 		$app = JFactory::getApplication();
 		$userIdentifier = $app->input->get('id', 0, 'STRING');
-		$xidentifier = $app->input->server->get('HTTP_IDENTIFIER');
+		$xidentifier = $app->input->server->get('HTTP_X_IDENTIFIER', '', 'String');
 
 		$loggedUser = JFactory::getUser();
 

From c1c8b004184203397600240cb51267d98e407ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cshraddha?= <“shraddha_s@techjoomla.com”>
Date: Thu, 18 Apr 2019 16:57:12 +0530
Subject: [PATCH 3/3] Task #143449 chore: support HTTP_IDENTIFIER in get
 request of users API

---
 src/users/user.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/users/user.php b/src/users/user.php
index a795bdc..bee8825 100644
--- a/src/users/user.php
+++ b/src/users/user.php
@@ -164,15 +164,8 @@ public function get()
 		 */
 		if ($id)
 		{
-			if ($xidentifier)
-			{
-				// Get a user object
-				$user = $this->retriveUser($xidentifier, $id);
-			}
-			else
-			{
-				$user = JUser::getInstance($id);
-			}
+			// Get a user object
+			$user = $this->retriveUser($xidentifier, $id);
 
 			if (! $user->id)
 			{