authx - The "already logged in" check should be less sensitive to int…

…-vs-string for user/contact ID
civicrm · Feb 26, 2021 · 385091b · 385091b
1 parent 234721a
commit 385091b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/ext/authx/Civi/Authx/Authenticator.php b/ext/authx/Civi/Authx/Authenticator.php
@@ -102,9 +102,12 @@ public function auth($e, $cred, $useSession = FALSE) {
    */
   protected function login($contactId, $userId, bool $useSession) {
     $authxUf = _authx_uf();
+    $isSameValue = function($a, $b) {
+      return !empty($a) && (string) $a === (string) $b;
+    };
 
     if (\CRM_Core_Session::getLoggedInContactID() || $authxUf->getCurrentUserId()) {
-      if (\CRM_Core_Session::getLoggedInContactID() === $contactId && $authxUf->getCurrentUserId() === $userId) {
+      if ($isSameValue(\CRM_Core_Session::getLoggedInContactID(), $contactId)  && $isSameValue($authxUf->getCurrentUserId(), $userId)) {
         return;
       }
       else {