MC-40099: Changing groupId functionality on createAccount()

Author: Mark Berube

app/code/Magento/Customer/Model/AccountManagement.php

@@ -423,7 +423,6 @@ class AccountManagement implements AccountManagementInterface
      * @param GetCustomerByToken|null $getByToken
      * @param AllowedCountries|null $allowedCountriesReader
      * @param SessionCleanerInterface|null $sessionCleaner
-     * @param AuthorizationInterface|null $authorization
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      * @SuppressWarnings(PHPMD.NPathComplexity)
@@ -464,8 +463,7 @@ public function __construct(
         AddressRegistry $addressRegistry = null,
         GetCustomerByToken $getByToken = null,
         AllowedCountries $allowedCountriesReader = null,
-        SessionCleanerInterface $sessionCleaner = null,
-        AuthorizationInterface $authorization = null
+        SessionCleanerInterface $sessionCleaner = null
     ) {
         $this->customerFactory = $customerFactory;
         $this->eventManager = $eventManager;
@@ -505,7 +503,6 @@ public function __construct(
         $this->allowedCountriesReader = $allowedCountriesReader
             ?: $objectManager->get(AllowedCountries::class);
         $this->sessionCleaner = $sessionCleaner ?? $objectManager->get(SessionCleanerInterface::class);
-        $this->authorization = $authorization ?? $objectManager->get(AuthorizationInterface::class);
     }
 
     /**
@@ -524,6 +521,22 @@ private function getAuthentication()
         }
     }
 
+    /**
+     * Get authorization
+     *
+     * @return AuthorizationInterface
+     */
+    private function getAuthorization()
+    {
+        if (!($this->authorization instanceof AuthorizationInterface)) {
+            $this->authorization = \Magento\Framework\App\ObjectManager::getInstance()->get(
+                AuthorizationInterface::class
+            );
+        }
+
+        return $this->authorization;
+    }
+
     /**
      * @inheritdoc
      */
@@ -849,8 +862,9 @@ public function getConfirmationStatus($customerId)
      */
     public function createAccount(CustomerInterface $customer, $password = null, $redirectUrl = '')
     {
+        $auth = $this->getAuthorization();
         $groupId = $customer->getGroupId();
-        if (isset($groupId) && !$this->authorization->isAllowed(self::ADMIN_RESOURCE)) {
+        if (isset($groupId) && !$auth->isAllowed(self::ADMIN_RESOURCE)) {
             $customer->setGroupId(null);
         }