Merge branch 'MAGETWO-92721' into 2.1.15-bugfixes-120718

Author: Dmytro Voskoboinikov

app/code/Magento/User/Controller/Adminhtml/User/Save.php

@@ -6,6 +6,7 @@
 namespace Magento\User\Controller\Adminhtml\User;
 
 use Magento\Framework\Exception\AuthenticationException;
+use Magento\Framework\Exception\MailException;
 use Magento\Framework\Exception\State\UserLockedException;
 use Magento\Security\Model\SecurityCookie;
 
@@ -83,17 +84,19 @@ public function execute()
             $currentUser->performIdentityCheck($data[$currentUserPasswordField]);
             $model->save();
 
-            $model->sendNotificationEmailsIfRequired();
-
             $this->messageManager->addSuccess(__('You saved the user.'));
             $this->_getSession()->setUserData(false);
             $this->_redirect('adminhtml/*/');
+
+            $model->sendNotificationEmailsIfRequired();
         } catch (UserLockedException $e) {
             $this->_auth->logout();
             $this->getSecurityCookie()->setLogoutReasonCookie(
                 \Magento\Security\Model\AdminSessionsManager::LOGOUT_REASON_USER_LOCKED
             );
             $this->_redirect('adminhtml/*/');
+        } catch (MailException $exception) {
+            $this->messageManager->addErrorMessage($exception->getMessage());
         } catch (\Magento\Framework\Exception\AuthenticationException $e) {
             $this->messageManager->addError(__('You have entered an invalid password for current user.'));
             $this->redirectToEdit($model, $data);

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

@@ -11,6 +11,9 @@
 use Magento\Framework\Exception\AuthenticationException;
 use Magento\Store\Model\Store;
 use Magento\User\Api\Data\UserInterface;
+use Magento\Framework\App\DeploymentConfig;
+use Magento\Framework\Exception\MailException;
+use Magento\Framework\App\ObjectManager;
 
 /**
  * Admin user model
@@ -113,6 +116,11 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      */
     protected $validationRules;
 
+    /**
+     * @var DeploymentConfig
+     */
+    private $deploymentConfig;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -126,6 +134,7 @@ class User extends AbstractModel implements StorageInterface, UserInterface
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
      * @param UserValidationRules $validationRules
      * @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
+     * @param DeploymentConfig|null $deploymentConfig
      * @param array $data
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -142,7 +151,8 @@ public function __construct(
         UserValidationRules $validationRules,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        DeploymentConfig $deploymentConfig = null
     ) {
         $this->_encryptor = $encryptor;
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);
@@ -153,6 +163,8 @@ public function __construct(
         $this->_transportBuilder = $transportBuilder;
         $this->_storeManager = $storeManager;
         $this->validationRules = $validationRules;
+        $this->deploymentConfig = $deploymentConfig
+            ?: ObjectManager::getInstance()->get(DeploymentConfig::class);
     }
 
     /**
@@ -382,23 +394,59 @@ public function roleUserExists()
         return is_array($result) && count($result) > 0 ? true : false;
     }
 
+    /**
+     * Send a notification to an admin.
+     *
+     * @param string $templateConfigId
+     * @param array $templateVars
+     * @param string|null $toEmail
+     * @param string|null $toName
+     * @throws MailException
+     *
+     * @return void
+     */
+    private function sendNotification(
+        $templateConfigId,
+        array $templateVars,
+        $toEmail = null,
+        $toName = null
+    ) {
+        $toEmail = $toEmail ?: $this->getEmail();
+        $toName = $toName ?: $this->getName();
+        $this->_transportBuilder
+            ->setTemplateIdentifier($this->_config->getValue($templateConfigId))
+            ->setTemplateModel(\Magento\Email\Model\BackendTemplate::class)
+            ->setTemplateOptions([
+                'area' => FrontNameResolver::AREA_CODE,
+                'store' => Store::DEFAULT_STORE_ID
+            ])
+            ->setTemplateVars($templateVars)
+            ->setFrom(
+                $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY)
+            )
+            ->addTo($toEmail, $toName)
+            ->getTransport()
+            ->sendMessage();
+    }
+
     /**
      * Send email with reset password confirmation link
      *
+     * @throws MailException
      * @return $this
      */
     public function sendPasswordResetConfirmationEmail()
     {
-        $templateId = $this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_TEMPLATE);
-        $transport = $this->_transportBuilder->setTemplateIdentifier($templateId)
-            ->setTemplateModel('Magento\Email\Model\BackendTemplate')
-            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
-            ->setTemplateVars(['user' => $this, 'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID)])
-            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
-            ->addTo($this->getEmail(), $this->getName())
-            ->getTransport();
+        $this->sendNotification(
+            self::XML_PATH_FORGOT_EMAIL_TEMPLATE,
+            [
+                'user' => $this,
+                'store' => $this->_storeManager->getStore(
+                    Store::DEFAULT_STORE_ID
+                )
+            ]
+        );
 
-        $transport->sendMessage();
         return $this;
     }
 
@@ -414,20 +462,59 @@ public function sendPasswordResetNotificationEmail()
         return $this;
     }
 
+    /**
+     * Send notification about a new user created.
+     *
+     * @throws MailException
+     * @return void
+     */
+    private function sendNewUserNotificationEmail()
+    {
+        $toEmails = [];
+        $generalEmail = $this->_config->getValue(
+            'trans_email/ident_general/email'
+        );
+        if ($generalEmail) {
+            $toEmails[] = $generalEmail;
+        }
+        if ($adminEmail = $this->deploymentConfig->get('user_admin_email')) {
+            $toEmails[] = $adminEmail;
+        }
+
+        foreach ($toEmails as $toEmail) {
+            $this->sendNotification(
+                'admin/emails/new_user_notification_template',
+                [
+                    'user'  => $this,
+                    'store' => $this->_storeManager->getStore(
+                        Store::DEFAULT_STORE_ID
+                    )
+                ],
+                $toEmail,
+                __('Administrator')->render()
+            );
+        }
+    }
+
     /**
      * Check changes and send notification emails
      *
+     * @throws MailException
      * @return $this
      */
     public function sendNotificationEmailsIfRequired()
     {
-        $changes = $this->createChangesDescriptionString();
-
-        if ($changes) {
-            if ($this->getEmail() != $this->getOrigData('email') && $this->getOrigData('email')) {
-                $this->sendUserNotificationEmail($changes, $this->getOrigData('email'));
+        if ($this->isObjectNew()) {
+            //Notification about a new user
+            $this->sendNewUserNotificationEmail();
+        } elseif ($changes = $this->createChangesDescriptionString()) {
+            $email = $this->getEmail();
+            if ($this->getEmail() != $this->getOrigData('email')
+                && $this->getOrigData('email')
+            ) {
+                $email = $this->getOrigData('email');
             }
-            $this->sendUserNotificationEmail($changes);
+            $this->sendUserNotificationEmail($changes, $email);
         }
 
         return $this;
@@ -464,30 +551,23 @@ protected function createChangesDescriptionString()
      *
      * @param string $changes
      * @param string $email
+     * @throws MailException
      * @return $this
      */
     protected function sendUserNotificationEmail($changes, $email = null)
     {
-        if ($email === null) {
-            $email = $this->getEmail();
-        }
-
-        $transport = $this->_transportBuilder
-            ->setTemplateIdentifier($this->_config->getValue(self::XML_PATH_USER_NOTIFICATION_TEMPLATE))
-            ->setTemplateModel('Magento\Email\Model\BackendTemplate')
-            ->setTemplateOptions(['area' => FrontNameResolver::AREA_CODE, 'store' => Store::DEFAULT_STORE_ID])
-            ->setTemplateVars(
-                [
-                    'user' => $this,
-                    'store' => $this->_storeManager->getStore(Store::DEFAULT_STORE_ID),
-                    'changes' => $changes
-                ]
-            )
-            ->setFrom($this->_config->getValue(self::XML_PATH_FORGOT_EMAIL_IDENTITY))
-            ->addTo($email, $this->getName())
-            ->getTransport();
+        $this->sendNotification(
+            self::XML_PATH_USER_NOTIFICATION_TEMPLATE,
+            [
+                'user' => $this,
+                'store' => $this->_storeManager->getStore(
+                    Store::DEFAULT_STORE_ID
+                ),
+                'changes' => $changes
+            ],
+            $email
+        );
 
-        $transport->sendMessage();
         return $this;
     }