Deprecate AssertPermissionTrait

flarum · Jul 10, 2020 · 95623ea · 95623ea
1 parent 32cf35d
commit 95623ea
Show file tree

Hide file tree

Showing 36 changed files with 103 additions and 133 deletions.
diff --git a/src/Admin/Middleware/RequireAdministrateAbility.php b/src/Admin/Middleware/RequireAdministrateAbility.php
@@ -9,19 +9,16 @@
 
 namespace Flarum\Admin\Middleware;
 
-use Flarum\User\AssertPermissionTrait;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Http\Server\MiddlewareInterface as Middleware;
 use Psr\Http\Server\RequestHandlerInterface as Handler;
 
 class RequireAdministrateAbility implements Middleware
 {
-    use AssertPermissionTrait;
-
     public function process(Request $request, Handler $handler): Response
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         return $handler->handle($request);
     }

diff --git a/src/Api/Controller/ClearCacheController.php b/src/Api/Controller/ClearCacheController.php
@@ -10,16 +10,13 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Foundation\Console\CacheClearCommand;
-use Flarum\User\AssertPermissionTrait;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ServerRequestInterface;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\NullOutput;
 
 class ClearCacheController extends AbstractDeleteController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var CacheClearCommand
      */
@@ -38,7 +35,7 @@ public function __construct(CacheClearCommand $command)
      */
     protected function delete(ServerRequestInterface $request)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $this->command->run(
             new ArrayInput([]),

diff --git a/src/Api/Controller/DeleteFaviconController.php b/src/Api/Controller/DeleteFaviconController.php
@@ -10,15 +10,12 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Laminas\Diactoros\Response\EmptyResponse;
 use League\Flysystem\FilesystemInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class DeleteFaviconController extends AbstractDeleteController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var SettingsRepositoryInterface
      */
@@ -44,7 +41,7 @@ public function __construct(SettingsRepositoryInterface $settings, FilesystemInt
      */
     protected function delete(ServerRequestInterface $request)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $path = $this->settings->get('favicon_path');
 

diff --git a/src/Api/Controller/DeleteLogoController.php b/src/Api/Controller/DeleteLogoController.php
@@ -10,15 +10,12 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Laminas\Diactoros\Response\EmptyResponse;
 use League\Flysystem\FilesystemInterface;
 use Psr\Http\Message\ServerRequestInterface;
 
 class DeleteLogoController extends AbstractDeleteController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var SettingsRepositoryInterface
      */
@@ -44,7 +41,7 @@ public function __construct(SettingsRepositoryInterface $settings, FilesystemInt
      */
     protected function delete(ServerRequestInterface $request)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $path = $this->settings->get('logo_path');
 

diff --git a/src/Api/Controller/ListNotificationsController.php b/src/Api/Controller/ListNotificationsController.php
@@ -13,14 +13,11 @@
 use Flarum\Discussion\Discussion;
 use Flarum\Http\UrlGenerator;
 use Flarum\Notification\NotificationRepository;
-use Flarum\User\AssertPermissionTrait;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
 class ListNotificationsController extends AbstractListController
 {
-    use AssertPermissionTrait;
-
     /**
      * {@inheritdoc}
      */
@@ -67,7 +64,7 @@ protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
 
-        $this->assertRegistered($actor);
+        $actor->assertRegistered();
 
         $actor->markNotificationsAsRead()->save();
 

diff --git a/src/Api/Controller/ListUsersController.php b/src/Api/Controller/ListUsersController.php
@@ -12,16 +12,13 @@
 use Flarum\Api\Serializer\UserSerializer;
 use Flarum\Http\UrlGenerator;
 use Flarum\Search\SearchCriteria;
-use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Search\UserSearcher;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
 class ListUsersController extends AbstractListController
 {
-    use AssertPermissionTrait;
-
     /**
      * {@inheritdoc}
      */
@@ -70,7 +67,7 @@ protected function data(ServerRequestInterface $request, Document $document)
     {
         $actor = $request->getAttribute('actor');
 
-        $this->assertCan($actor, 'viewUserList');
+        $actor->assertCan('viewUserList');
 
         $query = Arr::get($this->extractFilter($request), 'q');
         $sort = $this->extractSort($request);

diff --git a/src/Api/Controller/SendConfirmationEmailController.php b/src/Api/Controller/SendConfirmationEmailController.php
@@ -12,7 +12,6 @@
 use Flarum\Http\UrlGenerator;
 use Flarum\Mail\Job\SendRawEmailJob;
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Flarum\User\EmailToken;
 use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Queue\Queue;
@@ -25,8 +24,6 @@
 
 class SendConfirmationEmailController implements RequestHandlerInterface
 {
-    use AssertPermissionTrait;
-
     /**
      * @var SettingsRepositoryInterface
      */
@@ -69,7 +66,7 @@ public function handle(ServerRequestInterface $request): ResponseInterface
         $id = Arr::get($request->getQueryParams(), 'id');
         $actor = $request->getAttribute('actor');
 
-        $this->assertRegistered($actor);
+        $actor->assertRegistered();
 
         if ($actor->id != $id || $actor->is_email_confirmed) {
             throw new PermissionDeniedException;

diff --git a/src/Api/Controller/SendTestMailController.php b/src/Api/Controller/SendTestMailController.php
@@ -39,7 +39,7 @@ public function __construct(Container $container, Mailer $mailer, TranslatorInte
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
         $actor = $request->getAttribute('actor');
-        $this->assertAdmin($actor);
+        $actor->assertAdmin($actor);
 
         $body = $this->translator->trans('core.email.send_test.body', ['{username}' => $actor->username]);
 

diff --git a/src/Api/Controller/SetPermissionController.php b/src/Api/Controller/SetPermissionController.php
@@ -10,7 +10,6 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Group\Permission;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
@@ -19,14 +18,12 @@
 
 class SetPermissionController implements RequestHandlerInterface
 {
-    use AssertPermissionTrait;
-
     /**
      * {@inheritdoc}
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $body = $request->getParsedBody();
         $permission = Arr::get($body, 'permission');

diff --git a/src/Api/Controller/SetSettingsController.php b/src/Api/Controller/SetSettingsController.php
@@ -11,7 +11,6 @@
 
 use Flarum\Settings\Event;
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Contracts\Events\Dispatcher;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
@@ -20,8 +19,6 @@
 
 class SetSettingsController implements RequestHandlerInterface
 {
-    use AssertPermissionTrait;
-
     /**
      * @var \Flarum\Settings\SettingsRepositoryInterface
      */
@@ -46,7 +43,7 @@ public function __construct(SettingsRepositoryInterface $settings, Dispatcher $d
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $settings = $request->getParsedBody();
 

diff --git a/src/Api/Controller/ShowMailSettingsController.php b/src/Api/Controller/ShowMailSettingsController.php
@@ -10,16 +10,12 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Api\Serializer\MailSettingsSerializer;
-use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Contracts\Validation\Factory;
 use Psr\Http\Message\ServerRequestInterface;
 use Tobscure\JsonApi\Document;
 
 class ShowMailSettingsController extends AbstractShowController
 {
-    use AssertPermissionTrait;
-
     /**
      * {@inheritdoc}
      */
@@ -30,7 +26,7 @@ class ShowMailSettingsController extends AbstractShowController
      */
     protected function data(ServerRequestInterface $request, Document $document)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $drivers = array_map(function ($driver) {
             return self::$container->make($driver);

diff --git a/src/Api/Controller/UninstallExtensionController.php b/src/Api/Controller/UninstallExtensionController.php
@@ -10,14 +10,11 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface;
 
 class UninstallExtensionController extends AbstractDeleteController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var ExtensionManager
      */
@@ -33,7 +30,7 @@ public function __construct(ExtensionManager $extensions)
 
     protected function delete(ServerRequestInterface $request)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $name = Arr::get($request->getQueryParams(), 'name');
 

diff --git a/src/Api/Controller/UpdateExtensionController.php b/src/Api/Controller/UpdateExtensionController.php
@@ -10,7 +10,6 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Extension\ExtensionManager;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
 use Laminas\Diactoros\Response\EmptyResponse;
 use Psr\Http\Message\ResponseInterface;
@@ -19,8 +18,6 @@
 
 class UpdateExtensionController implements RequestHandlerInterface
 {
-    use AssertPermissionTrait;
-
     /**
      * @var ExtensionManager
      */
@@ -39,7 +36,7 @@ public function __construct(ExtensionManager $extensions)
      */
     public function handle(ServerRequestInterface $request): ResponseInterface
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $enabled = Arr::get($request->getParsedBody(), 'enabled');
         $name = Arr::get($request->getQueryParams(), 'name');

diff --git a/src/Api/Controller/UploadFaviconController.php b/src/Api/Controller/UploadFaviconController.php
@@ -10,7 +10,6 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManager;
@@ -20,8 +19,6 @@
 
 class UploadFaviconController extends ShowForumController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var SettingsRepositoryInterface
      */
@@ -47,7 +44,7 @@ public function __construct(SettingsRepositoryInterface $settings, FilesystemInt
      */
     public function data(ServerRequestInterface $request, Document $document)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $file = Arr::get($request->getUploadedFiles(), 'favicon');
         $extension = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION);

diff --git a/src/Api/Controller/UploadLogoController.php b/src/Api/Controller/UploadLogoController.php
@@ -10,7 +10,6 @@
 namespace Flarum\Api\Controller;
 
 use Flarum\Settings\SettingsRepositoryInterface;
-use Flarum\User\AssertPermissionTrait;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Intervention\Image\ImageManager;
@@ -20,8 +19,6 @@
 
 class UploadLogoController extends ShowForumController
 {
-    use AssertPermissionTrait;
-
     /**
      * @var SettingsRepositoryInterface
      */
@@ -47,7 +44,7 @@ public function __construct(SettingsRepositoryInterface $settings, FilesystemInt
      */
     public function data(ServerRequestInterface $request, Document $document)
     {
-        $this->assertAdmin($request->getAttribute('actor'));
+        $request->getAttribute('actor')->assertAdmin();
 
         $file = Arr::get($request->getUploadedFiles(), 'logo');
 

diff --git a/src/Discussion/Command/DeleteDiscussionHandler.php b/src/Discussion/Command/DeleteDiscussionHandler.php
@@ -12,14 +12,12 @@
 use Flarum\Discussion\DiscussionRepository;
 use Flarum\Discussion\Event\Deleting;
 use Flarum\Foundation\DispatchEventsTrait;
-use Flarum\User\AssertPermissionTrait;
 use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Events\Dispatcher;
 
 class DeleteDiscussionHandler
 {
     use DispatchEventsTrait;
-    use AssertPermissionTrait;
 
     /**
      * @var \Flarum\Discussion\DiscussionRepository
@@ -47,7 +45,7 @@ public function handle(DeleteDiscussion $command)
 
         $discussion = $this->discussions->findOrFail($command->discussionId, $actor);
 
-        $this->assertCan($actor, 'delete', $discussion);
+        $actor->assertCan('delete', $discussion);
 
         $this->events->dispatch(
             new Deleting($discussion, $actor, $command->data)