Merge remote-tracking branch 'origin/AC-10886' into spartans_pr_23122024

Author: glo60612

app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Backend\Controller\Adminhtml\System\Account;
 
@@ -11,9 +11,11 @@
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
+use Magento\User\Model\User;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
 {
@@ -25,8 +27,11 @@ class Save extends \Magento\Backend\Controller\Adminhtml\System\Account
     /**
      * Get security cookie
      *
+     * @deprecated 100.1.0 This method is deprecated because dependency injection should be used instead of
+     *                     directly accessing the SecurityCookie instance.
+     *                     Use dependency injection to get an instance of SecurityCookie.
+     * @see \Magento\Backend\Controller\Adminhtml\System\Account::__construct()
      * @return SecurityCookie
-     * @deprecated 100.1.0
      */
     private function getSecurityCookie()
     {
@@ -81,7 +86,29 @@ public function execute()
             } else {
                 $user->save();
                 $user->sendNotificationEmailsIfRequired();
-                $this->messageManager->addSuccessMessage(__('You saved the account.'));
+
+                $modifiedFields = $this->getModifiedFields($user);
+                if (!empty($modifiedFields)) {
+                    $countModifiedFields = count($modifiedFields);
+                    // validate how many fields were modified to display them correctly
+                    if ($countModifiedFields > 1) {
+                        $lastModifiedField = array_pop($modifiedFields);
+                        $modifiedFieldsText = implode(', ', $modifiedFields);
+                        $successMessage = __(
+                            'The %1 and %2 of this account have been modified successfully.',
+                            $modifiedFieldsText,
+                            $lastModifiedField
+                        );
+                    } else {
+                        $successMessage = __(
+                            'The %1 of this account has been modified successfully.',
+                            reset($modifiedFields)
+                        );
+                    }
+                    $this->messageManager->addSuccessMessage($successMessage);
+                } else {
+                    $this->messageManager->addSuccessMessage(__('You saved the account.'));
+                }
             }
         } catch (UserLockedException $e) {
             $this->_auth->logout();
@@ -103,4 +130,22 @@ public function execute()
         $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);
         return $resultRedirect->setPath("*/*/");
     }
+
+    /**
+     * Get user modified fields
+     *
+     * @param User $user
+     * @return array
+     */
+    private function getModifiedFields(User $user)
+    {
+        $modifiedFields = [];
+        $propertiesToCheck = ['password', 'username', 'firstname', 'lastname', 'email'];
+        foreach ($propertiesToCheck as $property) {
+            if ($user->getOrigData($property) !== $user->{'get' . ucfirst($property)}()) {
+                $modifiedFields[] = $property;
+            }
+        }
+        return $modifiedFields;
+    }
 }

app/code/Magento/Backend/Test/Unit/Controller/Adminhtml/System/Account/SaveTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2014 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -215,7 +215,8 @@ public function testSaveAction(): void
             Form::IDENTITY_VERIFICATION_PASSWORD_FIELD => 'current_password'
         ];
 
-        $testedMessage = 'You saved the account.';
+        $testedMessage = "The password, username, firstname, lastname and email of this account"
+            ." have been modified successfully.";
 
         $this->authSessionMock->expects($this->any())->method('getUser')->willReturn($this->userMock);
 

app/code/Magento/Security/Test/Mftf/ActionGroup/AdminResetPasswordActionGroup.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2022 Adobe
+ * All Rights Reserved.
+ */
 -->
 
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,7 +27,7 @@
         <fillField selector="{{AdminSystemAccountSection.passwordConfirmation}}" userInput="Admin@12345678" stepKey="confirmPassword1"/>
         <fillField selector="{{AdminSystemAccountSection.currentPassword}}" userInput="123123aaa" stepKey="fillCorrectPassword"/>
         <click selector="{{AdminMainActionsSection.save}}" stepKey="clickSaveUser2"/>
-        <see selector="{{AdminMessagesSection.success}}" userInput="You saved the account." stepKey="seeSuccessMessage"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="The password of this account has been modified successfully." stepKey="seeSuccessMessage"/>
 
     </actionGroup>
 </actionGroups>