diff --git a/Module.php b/Module.php index f7e9e3a..54b0084 100644 --- a/Module.php +++ b/Module.php @@ -8,9 +8,7 @@ namespace humhub\modules\rest; use humhub\components\bootstrap\ModuleAutoLoader; -use \humhub\components\Module as BaseModule; -use humhub\modules\user\models\User as UserModel; -use humhub\modules\rest\components\User as UserComponent; +use humhub\components\Module as BaseModule; use Yii; use yii\helpers\Url; @@ -32,16 +30,6 @@ class Module extends BaseModule */ public $resourcesPath = 'resources'; - public function init() - { - Yii::$app->set('user', [ - 'class' => UserComponent::class, - 'identityClass' => UserModel::class, - ]); - - parent::init(); - } - /** * @inheritdoc */ diff --git a/components/BaseController.php b/components/BaseController.php index 7c64741..634ece8 100644 --- a/components/BaseController.php +++ b/components/BaseController.php @@ -7,7 +7,15 @@ namespace humhub\modules\rest\components; +use humhub\components\access\ControllerAccess; +use humhub\components\Controller; +use humhub\modules\content\models\Content; use humhub\modules\rest\components\auth\ImpersonateAuth; +use humhub\modules\rest\components\User as UserComponent; +use humhub\modules\rest\components\auth\JwtAuth; +use humhub\modules\rest\controllers\auth\AuthController; +use humhub\modules\rest\models\ConfigureForm; +use humhub\modules\user\models\User; use Yii; use yii\data\Pagination; use yii\db\ActiveQuery; @@ -17,14 +25,6 @@ use yii\filters\auth\QueryParamAuth; use yii\helpers\ArrayHelper; use yii\web\JsonParser; -use Firebase\JWT\JWT; -use humhub\components\access\ControllerAccess; -use humhub\components\Controller; -use humhub\modules\content\models\Content; -use humhub\modules\rest\components\auth\JwtAuth; -use humhub\modules\rest\controllers\auth\AuthController; -use humhub\modules\rest\models\ConfigureForm; -use humhub\modules\user\models\User; /** * Class BaseController @@ -89,6 +89,11 @@ public function behaviors() */ public function beforeAction($action) { + Yii::$app->set('user', [ + 'class' => UserComponent::class, + 'identityClass' => User::class, + ]); + Yii::$app->response->format = 'json'; Yii::$app->request->setBodyParams(null); diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md index 0d70b99..fcbdf5f 100644 --- a/docs/CHANGELOG.md +++ b/docs/CHANGELOG.md @@ -1,6 +1,10 @@ Changelog ========= +0.9.1 (Unreleased) +-------------------- +- Fix #126: Fix user component initialization + 0.9.0 (May 17, 2023) -------------------- - Fix #110: Fix PHP Error in UserDefinition diff --git a/module.json b/module.json index 3d55ed3..f8fe7c8 100644 --- a/module.json +++ b/module.json @@ -5,7 +5,7 @@ "keywords": [ "api", "rest" ], - "version": "0.9.0", + "version": "0.9.1", "homepage": "https://github.com/humhub/rest", "humhub": { "minVersion": "1.14"