ACP2E-3208: [Cloud] Users with a specific role cannot login

Author: o-iegorov

app/code/Magento/Config/Block/System/Config/Edit.php

@@ -75,29 +75,27 @@ protected function _prepareLayout()
     {
         /** @var $section \Magento\Config\Model\Config\Structure\Element\Section */
         $section = $this->_configStructure->getElement($this->getRequest()->getParam('section'));
-        if ($section !== null) {
-            $this->_formBlockName = $section->getFrontendModel();
-            if (empty($this->_formBlockName)) {
-                $this->_formBlockName = self::DEFAULT_SECTION_BLOCK;
-            }
-            $this->setTitle($section->getLabel());
-            $this->setHeaderCss($section->getHeaderCss());
+        $this->_formBlockName = $section->getFrontendModel();
+        if (empty($this->_formBlockName)) {
+            $this->_formBlockName = self::DEFAULT_SECTION_BLOCK;
+        }
+        $this->setTitle($section->getLabel());
+        $this->setHeaderCss($section->getHeaderCss());
 
-            $this->getToolbar()->addChild(
-                'save_button',
-                \Magento\Backend\Block\Widget\Button::class,
-                [
-                    'id' => 'save',
-                    'label' => __('Save Config'),
-                    'class' => 'save primary',
-                    'data_attribute' => [
-                        'mage-init' => ['button' => ['event' => 'save', 'target' => '#config-edit-form']],
-                    ]
+        $this->getToolbar()->addChild(
+            'save_button',
+            \Magento\Backend\Block\Widget\Button::class,
+            [
+                'id' => 'save',
+                'label' => __('Save Config'),
+                'class' => 'save primary',
+                'data_attribute' => [
+                    'mage-init' => ['button' => ['event' => 'save', 'target' => '#config-edit-form']],
                 ]
-            );
-            $block = $this->getLayout()->createBlock($this->_formBlockName);
-            $this->setChild('form', $block);
-        }
+            ]
+        );
+        $block = $this->getLayout()->createBlock($this->_formBlockName);
+        $this->setChild('form', $block);
         return parent::_prepareLayout();
     }
 

app/code/Magento/Config/Model/Config/Structure.php

@@ -228,9 +228,6 @@ public function getFirstSection()
      */
     public function getElementByPathParts(array $pathParts)
     {
-        if (empty($pathParts)) {
-            return null;
-        }
         $path = implode('_', $pathParts);
         if (isset($this->_elements[$path])) {
             return $this->_elements[$path];

app/code/Magento/Paypal/Model/Config/StructurePlugin.php

@@ -100,7 +100,7 @@ public static function getPaypalConfigCountries($addOther = false)
      */
     public function aroundGetElementByPathParts(Structure $subject, \Closure $proceed, array $pathParts)
     {
-        $isSectionChanged = !empty($pathParts[0]) && $pathParts[0] === 'payment';
+        $isSectionChanged = $pathParts[0] == 'payment';
 
         if ($isSectionChanged) {
             $requestedCountrySection = 'payment_' . strtolower($this->backendHelper->getConfigurationCountryCode());