Merge pull request #171 from humhub/enh/user-pending-invite

Endpoint for pending invites
humhub · Jul 31, 2024 · be52e1e · be52e1e
2 parents 05e9426 + 24fd47a
commit be52e1e
Show file tree

Hide file tree

Showing 6 changed files with 76 additions and 5 deletions.
diff --git a/controllers/user/InviteController.php b/controllers/user/InviteController.php
@@ -8,7 +8,7 @@
 namespace humhub\modules\rest\controllers\user;
 
 use humhub\modules\rest\components\BaseController;
-use humhub\modules\user\models\Invite;
+use humhub\modules\rest\models\Invite;
 use humhub\modules\rest\definitions\InviteDefinitions;
 use humhub\modules\user\models\User;
 use Yii;
@@ -57,7 +57,9 @@ public function actionIndex()
 
     public function actionList()
     {
-        $query = Invite::find()->where(['source' => Invite::SOURCE_INVITE]);
+        $query = Invite::find()
+            ->where(['source' => Invite::SOURCE_INVITE])
+            ->with(['space', 'originator', 'createdBy', 'updatedBy']);
 
         $pagination = $this->handlePagination($query, 10);
 

diff --git a/definitions/InviteDefinitions.php b/definitions/InviteDefinitions.php
@@ -2,7 +2,7 @@
 
 namespace humhub\modules\rest\definitions;
 
-use humhub\modules\user\models\Invite;
+use humhub\modules\rest\models\Invite;
 
 class InviteDefinitions
 {
@@ -11,6 +11,15 @@ public static function getInvite(Invite $invite)
         return [
             'id' => $invite->id,
             'email' => $invite->email,
+            'firstname' => $invite->firstname,
+            'lastname' => $invite->lastname,
+            'language' => $invite->language,
+            'space' => $invite->space ? SpaceDefinitions::getSpaceShort($invite->space) : null,
+            'originator' => $invite->originator ? UserDefinitions::getUserShort($invite->originator) : null,
+            'createdBy' => $invite->createdBy ? UserDefinitions::getUserShort($invite->createdBy) : null,
+            'updatedBy' => $invite->updatedBy ? UserDefinitions::getUserShort($invite->updatedBy) : null,
+            'createdAt' => $invite->created_at,
+            'updatedAt' => $invite->updated_at,
         ];
     }
 }
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -11,6 +11,7 @@ Changelog
 - Enh #155: Add `requirements.php`
 - Fix #164: Disable `mustChangePassword` check for impersonated access tokens
 - Enh #170: Added new endpoint `GET /user/invite` for user pending invites
+- Enh #171: Extended invite information in response of `GET /user/invite` endpoint
 
 0.9.3 (December 8, 2023)
 ------------------------