Merge remote-tracking branch 'api/MAGETWO-51753-Setup-Credentials-Validation' into MAGETWO-53121-502-Bad-Gateway

Author: Cari Spruiell

setup/config/di.config.php

@@ -21,6 +21,7 @@
             'Magento\Setup\Controller\Environment',
             'Magento\Setup\Controller\DependencyCheck',
             'Magento\Setup\Controller\DatabaseCheck',
+            'Magento\Setup\Controller\ValidateAdminCredentials',
             'Magento\Setup\Controller\AddDatabase',
             'Magento\Setup\Controller\WebConfiguration',
             'Magento\Setup\Controller\CustomizeYourStore',

setup/pub/magento/setup/create-admin-account.js

@@ -5,14 +5,14 @@
 
 'use strict';
 angular.module('create-admin-account', ['ngStorage'])
-    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', function ($scope, $state, $localStorage) {
+    .controller('createAdminAccountController', ['$scope', '$state', '$localStorage', '$http', function ($scope, $state, $localStorage, $http) {
         $scope.admin = {
             'passwordStatus': {
                 class: 'none',
                 label: 'None'
             }
         };
-        
+
         $scope.passwordStatusChange = function () {
             if (angular.isUndefined($scope.admin.password)) {
                 return;
@@ -41,6 +41,25 @@ angular.module('create-admin-account', ['ngStorage'])
             $scope.admin = $localStorage.admin;
         }
 
+        $scope.validateCredentials = function () {
+            var data = {
+                'db': $localStorage.db,
+                'admin': $localStorage.admin,
+                'store': $localStorage.store,
+                'config': $localStorage.config
+            };
+            $http.post('index.php/validate-admin-credentials', data)
+                .success(function (data) {
+                    $scope.validateCredentials.result = data;
+                    if ($scope.validateCredentials.result.success) {
+                        $scope.nextState();
+                    }
+                })
+                .error(function (data) {
+                    $scope.validateCredentials.failed = data;
+                });
+        };
+
         $scope.$on('nextState', function () {
             $localStorage.admin = $scope.admin;
         });

setup/src/Magento/Setup/Controller/Install.php

@@ -6,21 +6,18 @@
 
 namespace Magento\Setup\Controller;
 
-use Magento\Setup\Model\AdminAccount;
+use Magento\Framework\App\DeploymentConfig;
 use Magento\Framework\Config\ConfigOptionsListConstants as SetupConfigOptionsList;
-use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
+use Magento\SampleData;
 use Magento\Setup\Model\Installer;
 use Magento\Setup\Model\Installer\ProgressFactory;
 use Magento\Setup\Model\InstallerFactory;
-use Magento\Setup\Model\StoreConfigurationDataMapper as UserConfig;
+use Magento\Setup\Model\RequestDataConverter;
 use Magento\Setup\Model\WebLogger;
 use Zend\Json\Json;
 use Zend\Mvc\Controller\AbstractActionController;
 use Zend\View\Model\JsonModel;
 use Zend\View\Model\ViewModel;
-use Magento\Setup\Console\Command\InstallCommand;
-use Magento\SampleData;
-use Magento\Framework\App\DeploymentConfig;
 
 /**
  * Install controller
@@ -54,6 +51,11 @@ class Install extends AbstractActionController
      */
     private $deploymentConfig;
 
+    /**
+     * @var RequestDataConverter
+     */
+    private $requestDataConverter;
+
     /**
      * Default Constructor
      *
@@ -62,19 +64,22 @@ class Install extends AbstractActionController
      * @param ProgressFactory $progressFactory
      * @param \Magento\Framework\Setup\SampleData\State $sampleDataState
      * @param \Magento\Framework\App\DeploymentConfig $deploymentConfig
+     * @param RequestDataConverter $requestDataConverter
      */
     public function __construct(
         WebLogger $logger,
         InstallerFactory $installerFactory,
         ProgressFactory $progressFactory,
         \Magento\Framework\Setup\SampleData\State $sampleDataState,
-        DeploymentConfig $deploymentConfig
+        DeploymentConfig $deploymentConfig,
+        RequestDataConverter $requestDataConverter
     ) {
         $this->log = $logger;
         $this->installer = $installerFactory->create($logger);
         $this->progressFactory = $progressFactory;
         $this->sampleDataState = $sampleDataState;
         $this->deploymentConfig = $deploymentConfig;
+        $this->requestDataConverter = $requestDataConverter;
     }
 
     /**
@@ -91,19 +96,16 @@ public function indexAction()
      * Index Action
      *
      * @return JsonModel
-     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function startAction()
     {
         $this->log->clear();
         $json = new JsonModel;
         try {
             $this->checkForPriorInstall();
-            $data = array_merge(
-                $this->importDeploymentConfigForm(),
-                $this->importUserConfigForm(),
-                $this->importAdminUserForm()
-            );
+            $content = $this->getRequest()->getContent();
+            $source = $content ? $source = Json::decode($content, Json::TYPE_ARRAY) : [];
+            $data = $this->requestDataConverter->convert($source);
             $this->installer->install($data);
             $json->setVariable(
                 'key',
@@ -168,102 +170,4 @@ private function checkForPriorInstall()
             throw new \Magento\Setup\Exception('Magento application is already installed.');
         }
     }
-
-    /**
-     * Maps data from request to format of deployment config model
-     *
-     * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private function importDeploymentConfigForm()
-    {
-        $content = $this->getRequest()->getContent();
-        $source = [];
-        if ($content) {
-            $source = Json::decode($content, Json::TYPE_ARRAY);
-        }
-
-        $result = [];
-        $result[SetupConfigOptionsList::INPUT_KEY_DB_HOST] = isset($source['db']['host']) ? $source['db']['host'] : '';
-        $result[SetupConfigOptionsList::INPUT_KEY_DB_NAME] = isset($source['db']['name']) ? $source['db']['name'] : '';
-        $result[SetupConfigOptionsList::INPUT_KEY_DB_USER] = isset($source['db']['user']) ? $source['db']['user'] :'';
-        $result[SetupConfigOptionsList::INPUT_KEY_DB_PASSWORD] =
-            isset($source['db']['password']) ? $source['db']['password'] : '';
-        $result[SetupConfigOptionsList::INPUT_KEY_DB_PREFIX] =
-            isset($source['db']['tablePrefix']) ? $source['db']['tablePrefix'] : '';
-        $result[BackendConfigOptionsList::INPUT_KEY_BACKEND_FRONTNAME] = isset($source['config']['address']['admin'])
-            ? $source['config']['address']['admin'] : '';
-        $result[SetupConfigOptionsList::INPUT_KEY_ENCRYPTION_KEY] = isset($source['config']['encrypt']['key'])
-            ? $source['config']['encrypt']['key'] : null;
-        $result[SetupConfigOptionsList::INPUT_KEY_SESSION_SAVE] = isset($source['config']['sessionSave']['type'])
-            ? $source['config']['sessionSave']['type'] : SetupConfigOptionsList::SESSION_SAVE_FILES;
-        $result[Installer::ENABLE_MODULES] = isset($source['store']['selectedModules'])
-            ? implode(',', $source['store']['selectedModules']) : '';
-        $result[Installer::DISABLE_MODULES] = isset($source['store']['allModules'])
-            ? implode(',', array_diff($source['store']['allModules'], $source['store']['selectedModules'])) : '';
-        return $result;
-    }
-
-    /**
-     * Maps data from request to format of user config model
-     *
-     * @return array
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private function importUserConfigForm()
-    {
-        $result = [];
-        $source = [];
-        $content = $this->getRequest()->getContent();
-        if ($content) {
-            $source = Json::decode($content, Json::TYPE_ARRAY);
-        }
-        if (isset($source['config']['address']['base_url']) && !empty($source['config']['address']['base_url'])) {
-            $result[UserConfig::KEY_BASE_URL] = $source['config']['address']['base_url'];
-        }
-        $result[UserConfig::KEY_USE_SEF_URL] = isset($source['config']['rewrites']['allowed'])
-            ? $source['config']['rewrites']['allowed'] : '';
-        $result[UserConfig::KEY_IS_SECURE] = isset($source['config']['https']['front'])
-            ? $source['config']['https']['front'] : '';
-        $result[UserConfig::KEY_IS_SECURE_ADMIN] = isset($source['config']['https']['admin'])
-            ? $source['config']['https']['admin'] : '';
-        $result[UserConfig::KEY_BASE_URL_SECURE] = (isset($source['config']['https']['front'])
-            || isset($source['config']['https']['admin']))
-            ? $source['config']['https']['text'] : '';
-        $result[UserConfig::KEY_LANGUAGE] = isset($source['store']['language'])
-            ? $source['store']['language'] : '';
-        $result[UserConfig::KEY_TIMEZONE] = isset($source['store']['timezone'])
-            ? $source['store']['timezone'] : '';
-        $result[UserConfig::KEY_CURRENCY] = isset($source['store']['currency'])
-            ? $source['store']['currency'] : '';
-        $result[InstallCommand::INPUT_KEY_USE_SAMPLE_DATA] = isset($source['store']['useSampleData'])
-            ? $source['store']['useSampleData'] : '';
-        $result[InstallCommand::INPUT_KEY_CLEANUP_DB] = isset($source['store']['cleanUpDatabase'])
-            ? $source['store']['cleanUpDatabase'] : '';
-        return $result;
-    }
-
-    /**
-     * Maps data from request to format of admin account model
-     *
-     * @return array
-     * @SuppressWarnings(PHPMD.NPathComplexity)
-     */
-    private function importAdminUserForm()
-    {
-        $result = [];
-        $source = [];
-        $content = $this->getRequest()->getContent();
-        if ($content) {
-            $source = Json::decode($content, Json::TYPE_ARRAY);
-        }
-        $result[AdminAccount::KEY_USER] = isset($source['admin']['username']) ? $source['admin']['username'] : '';
-        $result[AdminAccount::KEY_PASSWORD] = isset($source['admin']['password']) ? $source['admin']['password'] : '';
-        $result[AdminAccount::KEY_EMAIL] = isset($source['admin']['email']) ? $source['admin']['email'] : '';
-        $result[AdminAccount::KEY_FIRST_NAME] = $result[AdminAccount::KEY_USER];
-        $result[AdminAccount::KEY_LAST_NAME] = $result[AdminAccount::KEY_USER];
-        return $result;
-    }
 }

setup/src/Magento/Setup/Controller/ValidateAdminCredentials.php

@@ -0,0 +1,61 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Setup\Controller;
+
+use Magento\Setup\Model\Installer;
+use Magento\Setup\Model\RequestDataConverter;
+use Magento\Setup\Validator\AdminCredentialsValidator;
+use Zend\Json\Json;
+use Zend\Mvc\Controller\AbstractActionController;
+use Zend\View\Model\JsonModel;
+
+/**
+ * Controller for admin credentials validation
+ */
+class ValidateAdminCredentials extends AbstractActionController
+{
+    /**
+     * @var AdminCredentialsValidator
+     */
+    private $adminCredentialsValidator;
+
+    /**
+     * @var RequestDataConverter
+     */
+    private $requestDataConverter;
+
+    /**
+     * Initialize dependencies.
+     *
+     * @param AdminCredentialsValidator $adminCredentialsValidator
+     * @param RequestDataConverter $requestDataConverter
+     */
+    public function __construct(
+        AdminCredentialsValidator $adminCredentialsValidator,
+        RequestDataConverter $requestDataConverter
+    ) {
+        $this->adminCredentialsValidator = $adminCredentialsValidator;
+        $this->requestDataConverter = $requestDataConverter;
+    }
+
+    /**
+     * Validate admin credentials.
+     *
+     * @return JsonModel
+     */
+    public function indexAction()
+    {
+        try {
+            $content = $this->getRequest()->getContent();
+            $source = $content ? $source = Json::decode($content, Json::TYPE_ARRAY) : [];
+            $data = $this->requestDataConverter->convert($source);
+            $this->adminCredentialsValidator->validate($data);
+            return new JsonModel(['success' => true]);
+        } catch (\Exception $e) {
+            return new JsonModel(['success' => false, 'error' => $e->getMessage()]);
+        }
+    }
+}

setup/src/Magento/Setup/Model/AdminAccount.php

@@ -137,22 +137,22 @@ private function saveAdminUser()
      * @return void
      * @throws \Exception If the username and email do not both match data provided to install
      */
-    private function validateUserMatches($username, $email)
+    public function validateUserMatches($username, $email)
     {
         if ((strcasecmp($email, $this->data[self::KEY_EMAIL]) == 0) &&
             (strcasecmp($username, $this->data[self::KEY_USER]) != 0)) {
             // email matched but username did not
             throw new \Exception(
-                'An existing user has the given email but different username. ' . self::KEY_USER .
-                ' and ' . self::KEY_EMAIL . ' both need to match an existing user or both be new.'
+                'An existing user has the given email but different username. '
+                . 'Username and email both need to match an existing user or both be new.'
             );
         }
         if ((strcasecmp($username, $this->data[self::KEY_USER]) == 0) &&
             (strcasecmp($email, $this->data[self::KEY_EMAIL]) != 0)) {
             // username matched but email did not
             throw new \Exception(
-                'An existing user has the given username but different email. ' . self::KEY_USER .
-                ' and ' . self::KEY_EMAIL . ' both need to match an existing user or both be new.'
+                'An existing user has the given username but different email. '
+                . 'Username and email both need to match an existing user or both be new.'
             );
         }
     }