diff --git a/src/Api/Controllers/CreateDoorkeyController.php b/src/Api/Controllers/CreateDoorkeyController.php index 9cef267..3baeb9d 100644 --- a/src/Api/Controllers/CreateDoorkeyController.php +++ b/src/Api/Controllers/CreateDoorkeyController.php @@ -14,6 +14,7 @@ namespace FoF\Doorman\Api\Controllers; use Flarum\Api\Controller\AbstractCreateController; +use Flarum\Http\RequestUtil; use FoF\Doorman\Api\Serializers\DoorkeySerializer; use FoF\Doorman\Commands\CreateDoorkey; use Illuminate\Contracts\Bus\Dispatcher; @@ -46,8 +47,10 @@ public function __construct(Dispatcher $bus) */ protected function data(ServerRequestInterface $request, Document $document) { + $actor = RequestUtil::getActor($request); + return $this->bus->dispatch( - new CreateDoorkey($request->getAttribute('actor'), Arr::get($request->getParsedBody(), 'data', [])) + new CreateDoorkey($actor, Arr::get($request->getParsedBody(), 'data', [])) ); } } diff --git a/src/Api/Controllers/DeleteDoorkeyController.php b/src/Api/Controllers/DeleteDoorkeyController.php index cd97b54..8c45d01 100644 --- a/src/Api/Controllers/DeleteDoorkeyController.php +++ b/src/Api/Controllers/DeleteDoorkeyController.php @@ -14,6 +14,7 @@ namespace FoF\Doorman\Api\Controllers; use Flarum\Api\Controller\AbstractDeleteController; +use Flarum\Http\RequestUtil; use FoF\Doorman\Commands\DeleteDoorkey; use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Support\Arr; @@ -39,8 +40,10 @@ public function __construct(Dispatcher $bus) */ protected function delete(ServerRequestInterface $request) { + $actor = RequestUtil::getActor($request); + $this->bus->dispatch( - new DeleteDoorkey(Arr::get($request->getQueryParams(), 'id'), $request->getAttribute('actor')) + new DeleteDoorkey(Arr::get($request->getQueryParams(), 'id'), $actor) ); } } diff --git a/src/Api/Controllers/UpdateDoorkeyController.php b/src/Api/Controllers/UpdateDoorkeyController.php index 2c93b20..0983f07 100644 --- a/src/Api/Controllers/UpdateDoorkeyController.php +++ b/src/Api/Controllers/UpdateDoorkeyController.php @@ -14,6 +14,7 @@ namespace FoF\Doorman\Api\Controllers; use Flarum\Api\Controller\AbstractShowController; +use Flarum\Http\RequestUtil; use FoF\Doorman\Api\Serializers\DoorkeySerializer; use FoF\Doorman\Commands\EditDoorkey; use Illuminate\Contracts\Bus\Dispatcher; @@ -46,8 +47,10 @@ public function __construct(Dispatcher $bus) */ protected function data(ServerRequestInterface $request, Document $document) { + $actor = RequestUtil::getActor($request); + return $this->bus->dispatch( - new EditDoorkey(Arr::get($request->getQueryParams(), 'id'), $request->getAttribute('actor'), Arr::get($request->getParsedBody(), 'data', [])) + new EditDoorkey(Arr::get($request->getQueryParams(), 'id'), $actor, Arr::get($request->getParsedBody(), 'data', [])) ); } }