ENGCOM-5640: Fixes #23824: User data serialised multiple times on save when loaded… #23827

Author: sidolov

app/code/Magento/User/Model/User.php

@@ -665,6 +665,10 @@ public function loadByUsername($username)
     {
         $data = $this->getResource()->loadByUsername($username);
         if ($data !== false) {
+            if (is_string($data['extra'])) {
+                $data['extra'] = $this->serializer->unserialize($data['extra']);
+            }
+
             $this->setData($data);
             $this->setOrigData();
         }

dev/tests/integration/testsuite/Magento/User/Model/UserTest.php

@@ -6,7 +6,6 @@
 
 namespace Magento\User\Model;
 
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\Encryption\Encryptor;
 
 /**
@@ -29,11 +28,6 @@ class UserTest extends \PHPUnit\Framework\TestCase
      */
     protected static $_newRole;
 
-    /**
-     * @var Json
-     */
-    private $serializer;
-
     /**
      * @var Encryptor
      */
@@ -47,9 +41,6 @@ protected function setUp()
         $this->_dateTime = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             \Magento\Framework\Stdlib\DateTime::class
         );
-        $this->serializer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            Json::class
-        );
         $this->encryptor = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
             Encryptor::class
         );
@@ -133,7 +124,7 @@ public function testSaveExtra()
         $this->_model->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
         $this->_model->saveExtra(['test' => 'val']);
         $this->_model->loadByUsername(\Magento\TestFramework\Bootstrap::ADMIN_NAME);
-        $extra = $this->serializer->unserialize($this->_model->getExtra());
+        $extra = $this->_model->getExtra();
         $this->assertEquals($extra['test'], 'val');
     }