AC-2653: Fix an admin custom URL functionality

Author: arhiopterecs

app/code/Magento/Config/Model/Config/Backend/Admin/Custom.php

@@ -119,18 +119,16 @@ public function afterSave()
         }
 
         if ($useCustomUrl == 1) {
-            $this->_configWriter->save(
+            $paths = [
                 self::XML_PATH_SECURE_BASE_URL,
-                $value,
-                self::CONFIG_SCOPE,
-                self::CONFIG_SCOPE_ID
-            );
-            $this->_configWriter->save(
                 self::XML_PATH_UNSECURE_BASE_URL,
-                $value,
-                self::CONFIG_SCOPE,
-                self::CONFIG_SCOPE_ID
-            );
+                self::XML_PATH_SECURE_BASE_LINK_URL,
+                self::XML_PATH_UNSECURE_BASE_LINK_URL,
+            ];
+
+            foreach ($paths as $path) {
+                $this->_configWriter->save($path, $value, self::CONFIG_SCOPE, self::CONFIG_SCOPE_ID);
+            }
         }
 
         return parent::afterSave();

app/code/Magento/Config/Model/Config/Backend/Admin/Usecustom.php

@@ -78,16 +78,16 @@ public function afterSave()
         $value = $this->getValue();
 
         if (!$value) {
-            $this->_configWriter->delete(
+            $paths = [
                 Custom::XML_PATH_SECURE_BASE_URL,
-                Custom::CONFIG_SCOPE,
-                Custom::CONFIG_SCOPE_ID
-            );
-            $this->_configWriter->delete(
                 Custom::XML_PATH_UNSECURE_BASE_URL,
-                Custom::CONFIG_SCOPE,
-                Custom::CONFIG_SCOPE_ID
-            );
+                Custom::XML_PATH_SECURE_BASE_LINK_URL,
+                Custom::XML_PATH_UNSECURE_BASE_LINK_URL,
+            ];
+
+            foreach ($paths as $path) {
+                $this->_configWriter->delete($path, Custom::CONFIG_SCOPE, Custom::CONFIG_SCOPE_ID);
+            }
         }
 
         return parent::afterSave();

app/code/Magento/Security/Model/AdminSessionsManager.php

@@ -7,6 +7,8 @@
 
 namespace Magento\Security\Model;
 
+use Exception;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\HTTP\PhpEnvironment\RemoteAddress;
 use Magento\Security\Model\ResourceModel\AdminSessionInfo\CollectionFactory;
 
@@ -152,6 +154,7 @@ public function processProlong()
      * Handle logout process
      *
      * @return $this
+     * @throws Exception
      * @since 100.1.0
      */
     public function processLogout()
@@ -294,15 +297,22 @@ public function cleanExpiredSessions()
      * Create new record
      *
      * @return $this
+     * @throws Exception
      * @since 100.1.0
      */
     protected function createNewSession()
     {
+        $user = $this->authSession->getUser();
+        if (null === $user) {
+           $this->processLogout();
+           throw new LocalizedException(__('User is not found'));
+        }
+
         $adminSessionInfo = $this->adminSessionInfoFactory
             ->create()
             ->setData(
                 [
-                    'user_id' => $this->authSession->getUser()->getId(),
+                    'user_id' => $user->getId(),
                     'ip' => $this->remoteAddress->getRemoteAddress(),
                     'status' => AdminSessionInfo::LOGGED_IN
                 ]