Merge pull request civicrm#20498 from seamuslee001/fix_authx_drupal89

[REF] Fix Authx tests on Druapl 8/9 by ensuring that we only return a…
totten · Jun 4, 2021 · 94ef389 · 94ef389
2 parents c1f3628 + ea69a89
commit 94ef389
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/authx/Civi/Authx/Drupal8.php b/ext/authx/Civi/Authx/Drupal8.php
@@ -54,7 +54,7 @@ public function loginStateless($userId) {
    */
   public function getCurrentUserId() {
     $user = \Drupal::currentUser();
-    return $user ? $user->getAccount()->id() : NULL;
+    return $user && $user->getAccount()->id() ? $user->getAccount()->id() : NULL;
   }
 
 }