Fixed auto mapping user (#7024)

* Fixed auto mapping user * Update CHANGELOG.md
humhub · May 23, 2024 · 8162865 · 8162865
1 parent ef41e8a
commit 8162865
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@ HumHub Changelog
 
 1.15.6 (TBA)
 ------------
-- Fix #7013: Opening more auth clients 
+- Fix #7013: Opening more auth clients
+- Fix #7024: Automatic mapping of existing AuthClient users failed 
 
 1.15.5 (May 8, 2024)
 --------------------

diff --git a/protected/humhub/modules/user/controllers/AuthController.php b/protected/humhub/modules/user/controllers/AuthController.php
@@ -155,6 +155,7 @@ public function onAuthSuccess(BaseClient $authClient)
         }
 
         $authClientService = new AuthClientService($authClient);
+        $authClientService->autoMapToExistingUser();
 
         $user = $authClientService->getUser();
 
@@ -163,7 +164,6 @@ public function onAuthSuccess(BaseClient $authClient)
             return $this->redirect(['/user/auth/login']);
         }
 
-        $authClientService->autoMapToExistingUser();
 
         if ($user !== null) {
             return $this->login($user, $authClient);