update

Author: marc-farre

docs/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Unreleased
+--------------------
+- Fix: Don't add to group a user that is not active
+
 1.2.3 (February 20, 2023)
 --------------------
 - Fix: For some users, the corresponding user ID on Keycloak was not saved in `user_auth` table, which prevents group sync from working.

jobs/GroupsFullSync.php

@@ -15,6 +15,7 @@
 use humhub\modules\authKeycloak\models\GroupKeycloak;
 use humhub\modules\queue\ActiveJob;
 use humhub\modules\user\models\Auth;
+use humhub\modules\user\models\User;
 use Throwable;
 use Yii;
 use yii\base\InvalidConfigException;
@@ -215,9 +216,11 @@ protected function addHumhubGroupsToKeycloak()
     protected function initUsersKeycloakIdToHumhubId()
     {
         $auths = Auth::find()
-            ->orderBy(['id' => SORT_ASC]) // Get the latest if it has multiple
-            ->where(['source' => Keycloak::DEFAULT_NAME])
-            ->indexBy('user_id') // Remove duplicated
+            ->joinWith('user')
+            ->andWhere(['user.status' => User::STATUS_ENABLED])
+            ->andWhere(['user_auth.source' => Keycloak::DEFAULT_NAME])
+            ->orderBy(['user_auth.id' => SORT_ASC]) // Get the latest if it has multiple
+            ->indexBy('user_id') // Removes duplicated
             ->all();
         $this->usersKeycloakIdToHumhubId = ArrayHelper::map($auths, 'source_id', 'user_id');
     }
@@ -280,10 +283,10 @@ protected function addKeycloakUsersToHumhubGroups()
     {
         foreach ($this->keycloakGroupsMembers as $keycloakGroupId => $keycloakUserIds) {
             foreach ($keycloakUserIds as $keycloakUserId) {
-                $humhubUserId = $this->usersKeycloakIdToHumhubId[$keycloakUserId];
+                $humhubUserId = $this->getHumhubUserId($keycloakUserId);
                 $humhubGroup = $this->humhubGroupsByKeycloakId[$keycloakGroupId];
                 $humhubGroupMembers = $this->humhubGroupsMembers[$humhubGroup->id];
-                if (!in_array($humhubUserId, $humhubGroupMembers)) {
+                if ($humhubUserId !== null && !in_array($humhubUserId, $humhubGroupMembers)) {
                     $humhubGroup->addUser($humhubUserId);
                     $this->humhubGroupsMembers[$humhubGroup->id][] = $humhubUserId;
                 }

jobs/GroupsUserSync.php

@@ -13,6 +13,7 @@
 use humhub\modules\authKeycloak\models\ConfigureForm;
 use humhub\modules\authKeycloak\models\GroupKeycloak;
 use humhub\modules\queue\ActiveJob;
+use humhub\modules\user\models\User;
 use Throwable;
 use yii\base\InvalidConfigException;
 use yii\queue\RetryableJobInterface;
@@ -49,7 +50,8 @@ class GroupsUserSync extends ActiveJob implements RetryableJobInterface
      */
     public function run()
     {
-        if (!$this->userId) {
+        $user = User::find()->active()->andWhere(['id' => $this->userId])->one();
+        if ($user === null) {
             return;
         }
 
@@ -71,12 +73,12 @@ public function run()
             ->all();
 
         // Add Humhub user to Humhub groups
-        foreach ($this->keycloakApi->getUserGroups($this->userId) as $keycloakGroupId) {
+        foreach ($this->keycloakApi->getUserGroups($user->id) as $keycloakGroupId) {
             if (!array_key_exists($keycloakGroupId, $this->humhubGroupsByKeycloakId)) {
                 continue;
             }
             $humhubGroup = $this->humhubGroupsByKeycloakId[$keycloakGroupId];
-            $humhubGroup->addUser($this->userId);
+            $humhubGroup->addUser($user);
         }
     }