Merge branch 'master' into develop

humhub · May 24, 2024 · 36989ea · 36989ea
2 parents 5bbda9e + 8162865
commit 36989ea
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 HumHub Changelog
 ================
 
+1.15.6 (TBA)
+------------
+- Fix #7013: Opening more auth clients
+- Fix #7024: Automatic mapping of existing AuthClient users failed 
+
 1.15.5 (May 8, 2024)
 --------------------
 - Enh #6899: Fix a missed module config file

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

diff --git a/protected/humhub/modules/user/widgets/AuthChoice.php b/protected/humhub/modules/user/widgets/AuthChoice.php
@@ -154,10 +154,10 @@ protected function renderMainContent()
             $i++;
             if ($i == $this->maxShowClients + 1) {
                 // Add more button
-                echo Html::a('<i class="fa fa-angle-double-down" aria-hidden="true"></i>', '#', ['class' => 'btn btn-default pull-right btn-sxm', 'id' => 'btnAuthChoiceMore']);
+                echo Html::a('<i class="fa fa-angle-double-down" aria-hidden="true"></i>', '#', ['class' => 'btn btn-default pull-right btn-sxm btn-auth-choice-more']);
 
                 // Div contains more auth clients
-                echo Html::beginTag('div', ['class' => 'authChoiceMore']);
+                echo Html::beginTag('div', ['class' => 'auth-choice-more-buttons']);
                 $extraCssClass = 'btn-sm'; // further buttons small
             }
             $this->clientLink($client, null, ['class' => $extraCssClass]);

diff --git a/static/resources/user/authChoice.css b/static/resources/user/authChoice.css
@@ -25,20 +25,20 @@
     background-color: #FFF;
 }
 
-.authChoiceMore {
+.auth-choice-more-buttons {
     display:none;
     padding-top:6px;
 }
 
-.authChoiceMore a {
+.auth-choice-more-buttons a {
     margin-top:6px !important;
 } 
 
 .authChoice i {
     padding-right:7px;
 }
 
-#btnAuthChoiceMore i {
+.btn-auth-choice-more i {
     padding-right:0px;
 }
 

diff --git a/static/resources/user/authChoice.js b/static/resources/user/authChoice.js
@@ -1,4 +1,4 @@
-$("#btnAuthChoiceMore").click(function () {
-    $("#btnAuthChoiceMore").hide();
-    $(".authChoiceMore").show();
-});
+$(document).on('click', '.btn-auth-choice-more', function () {
+    $('.btn-auth-choice-more').hide();
+    $('.auth-choice-more-buttons').show();
+});