Merge branch 'master' into enh/endpoint-get-user-by-source

Events.php

@@ -84,6 +84,8 @@ public static function onBeforeRequest($event)
             // User: Invite Controller
             ['pattern' => 'user/invite', 'route' => 'rest/user/invite/index', 'verb' => 'POST'],
             ['pattern' => 'user/invite', 'route' => 'rest/user/invite/list', 'verb' => 'GET'],
+            ['pattern' => 'user/invite/<id:\d+>', 'route' => 'rest/user/invite/cancel', 'verb' => 'DELETE'],
+            ['pattern' => 'user/invite/<id:\d+>', 'route' => 'rest/user/invite/resend', 'verb' => 'PATCH'],
 
             // User: Session Controller
             ['pattern' => 'user/session/all/<id:\d+>', 'route' => 'rest/user/session/delete-from-user', 'verb' => 'DELETE'],

controllers/user/InviteController.php

@@ -30,7 +30,7 @@ protected function getAccessRules()
 
     public function actionIndex()
     {
-        $emails = (array)Yii::$app->request->post('emails');
+        $emails = (array) Yii::$app->request->post('emails');
         if (!$emails) {
             return $this->returnError(404, 'Please provide an array of emails in the json format');
         }
@@ -70,6 +70,33 @@ public function actionList()
         return $this->returnPagination($query, $pagination, $results);
     }
 
+    public function actionResend($id)
+    {
+        $userInvite = Invite::find()->where(['id' => $id, 'source' => Invite::SOURCE_INVITE])->one();
+
+        if (!$userInvite) {
+            return $this->returnError(404, 'Invite not found!');
+        }
+
+        $userInvite->save();
+        $userInvite->sendInviteMail();
+
+        return $this->returnSuccess('Invite has been resent.');
+    }
+
+    public function actionCancel($id)
+    {
+        $userInvite = Invite::find()->where(['id' => $id, 'source' => Invite::SOURCE_INVITE])->one();
+
+        if (!$userInvite) {
+            return $this->returnError(404, 'Invite not found!');
+        }
+
+        $userInvite->delete();
+
+        return $this->returnSuccess('Invite has been canceled.');
+    }
+
     protected function createInvite($email)
     {
         $userInvite = new Invite();

definitions/InviteDefinitions.php

@@ -3,6 +3,7 @@
 namespace humhub\modules\rest\definitions;
 
 use humhub\modules\rest\models\Invite;
+use yii\helpers\Url;
 
 class InviteDefinitions
 {
@@ -15,6 +16,7 @@ public static function getInvite(Invite $invite)
             'lastname' => $invite->lastname,
             'language' => $invite->language,
             'space' => $invite->space ? SpaceDefinitions::getSpaceShort($invite->space) : null,
+            'invitationUrl' => Url::to(['/user/registration', 'token' => $invite->token], true),
             'originator' => $invite->originator ? UserDefinitions::getUserShort($invite->originator) : null,
             'createdBy' => $invite->createdBy ? UserDefinitions::getUserShort($invite->createdBy) : null,
             'updatedBy' => $invite->updatedBy ? UserDefinitions::getUserShort($invite->updatedBy) : null,

definitions/UserDefinitions.php

@@ -16,6 +16,7 @@
 use humhub\modules\user\models\Group;
 use humhub\modules\user\models\Session;
 use humhub\modules\user\models\User;
+use yii\helpers\ArrayHelper;
 use yii\helpers\Url;
 
 /**
@@ -41,14 +42,26 @@ public static function getUser(User $user)
             'display_name' => $user->displayName,
             'url' => Url::to(['/', 'container' => $user], true),
             'account' => static::getAccount($user),
-            'profile' => static::getProfile($user->profile),
+            'profile' => static::getProfile($user),
         ];
     }
 
-    public static function getProfile(Profile $profile)
+    public static function getProfile(User $user)
     {
-        $attributes = $profile->attributes;
-        unset($attributes['user_id']);
+        $attributes = $user->profile->attributes;
+        ArrayHelper::remove($attributes, 'user_id');
+
+        ArrayHelper::setValue(
+            $attributes,
+            'image_url',
+            Url::to($user->profileImage->getUrl(), true),
+        );
+        ArrayHelper::setValue(
+            $attributes,
+            'banner_url',
+            Url::to($user->profileBannerImage->getUrl(), true),
+        );
+
         return $attributes;
     }
 

docs/CHANGELOG.md

@@ -1,9 +1,11 @@
 Changelog
 =========
 
-0.10.4 (Unreleased)
----------------------------
+0.10.4 (September 9, 2024)
+--------------------------
 - Enh #180: Improved `user/get-by-authclient` endpoint to support additional authentication clients.
+- Enh #181: Added user profile `image_url` and `banner_url`
+- Enh #179: Added new `resend` and `cancel` endpoints for user invite
 
 0.10.3 (September 13, 2024)
 ---------------------------

docs/swagger/user.yaml

@@ -516,6 +516,29 @@ paths:
                 type: array
                 items:
                   $ref: "user.yaml#/definitions/Invite"
+  '/user/invite/{id}':
+    patch:
+      tags:
+        - Invite
+      summary: Resend invite
+      description: Resends invitation email
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        '200':
+          description: Successful operation
+    delete:
+      tags:
+        - Invite
+      summary: Cancel invite
+      description: Cancels the invite, making the invitation URL no longer valid.
+      produces:
+        - application/json
+        - application/xml
+      responses:
+        '200':
+          description: Successful operation
 
   #-----------------------------------------------------------------------------------------------------------------------
   # Begin Session
@@ -720,6 +743,10 @@ definitions:
         type: string
       url_twitter:
         type: string
+      image_url:
+        type: string
+      banner_url:
+        type: string
     xml:
       name: Profile
 
@@ -789,6 +816,10 @@ definitions:
       space:
         readOnly: true
         $ref: "space.yaml#/definitions/SpaceShort"
+      invitationUrl:
+        type: string
+        readOnly: true
+        example: "http://example.com/user/registration?token=cK4FCaopFHNP"
       originator:
         readOnly: true
         $ref: "user.yaml#/definitions/UserShort"

messages/pt-BR/base.php

@@ -1,21 +1,21 @@
 <?php
 return array (
-  '<strong>REST</strong> Configuration' => '',
-  'Access Tokens' => '',
-  'Add Access Token' => '',
-  'Allow Bearer Authentication' => '',
-  'Allow HTTP Basic Authentication' => '',
-  'Allow JWT Authentication' => '',
-  'Allow Query Param Bearer Authentication' => '',
-  'Bearer Access Token Successfully Revoked' => '',
-  'Bearer Auth' => '',
+  '<strong>REST</strong> Configuration' => 'Configuração <strong>REST</strong>',
+  'Access Tokens' => 'Tokens de acesso',
+  'Add Access Token' => 'Adicionar Token de Acesso',
+  'Allow Bearer Authentication' => 'Permitir autenticação do portador',
+  'Allow HTTP Basic Authentication' => 'Permitir autenticação básica HTTP',
+  'Allow JWT Authentication' => 'Permitir autenticação JWT',
+  'Allow Query Param Bearer Authentication' => 'Permitir autenticação do portador do parâmetro de consulta',
+  'Bearer Access Token Successfully Revoked' => 'Token de acesso ao portador revogado com sucesso',
+  'Bearer Auth' => 'Autorização do Portador',
   'Enabled for all registered users' => 'Habilitado para todos os usuários registrados',
-  'Expiration' => '',
+  'Expiration' => 'Validade',
   'General' => 'Geral',
-  'JWT Auth' => '',
-  'JWT Key' => 'JWT Chave',
-  'JWT Token Expiration' => '',
-  'No enabled modules found with additional REST API endpoints.' => '',
-  'Token' => '',
-  'User' => 'Do utilizador',
+  'JWT Auth' => 'Autenticação JWT',
+  'JWT Key' => 'Chave JWT',
+  'JWT Token Expiration' => 'Validade do Token JWT',
+  'No enabled modules found with additional REST API endpoints.' => 'Nenhum módulo habilitado encontrado com endpoints de API REST adicionais.',
+  'Token' => 'Token',
+  'User' => 'Usuário',
 );