Merge pull request civicrm#11381 from mydropwizard/crm-21526

CRM-21526: CRM_Utils_System_Drupal8::authenticate() should change the Drupal user
ixiam · Jan 10, 2018 · 73f86ce · 73f86ce
2 parents 8dc3fb6 + 0260ae7
commit 73f86ce
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/CRM/Utils/System/Drupal8.php b/CRM/Utils/System/Drupal8.php
@@ -365,9 +365,14 @@ public function authenticate($name, $password, $loadCMSBootstrap = FALSE, $realP
     $system->loadBootStrap(array(), FALSE);
 
     $uid = \Drupal::service('user.auth')->authenticate($name, $password);
-    $contact_id = CRM_Core_BAO_UFMatch::getContactId($uid);
+    if ($uid) {
+      if ($this->loadUser($name)) {
+        $contact_id = CRM_Core_BAO_UFMatch::getContactId($uid);
+        return array($contact_id, $uid, mt_rand());
+      }
+    }
 
-    return array($contact_id, $uid, mt_rand());
+    return FALSE;
   }
 
   /**
@@ -469,7 +474,7 @@ public function loadBootStrap($params = array(), $loadUser = TRUE, $throwError =
       if (!empty($params['uid']) && $username = \Drupal\user\Entity\User::load($uid)->getUsername()) {
         $this->loadUser($username);
       }
-      elseif (!empty($params['name']) && !empty($params['pass']) && $this->authenticate($params['name'], $params['pass'])) {
+      elseif (!empty($params['name']) && !empty($params['pass']) && \Drupal::service('user.auth')->authenticate($params['name'], $params['pass'])) {
         $this->loadUser($params['name']);
       }
     }