refactor(wip): V5 auth policies

ushahidi · Nov 16, 2023 · 91dc7b7 · 91dc7b7
1 parent bebc3a3
commit 91dc7b7
Show file tree

Hide file tree

Showing 90 changed files with 529 additions and 1,466 deletions.
diff --git a/app/Console/Commands/UserCreateCommand.php b/app/Console/Commands/UserCreateCommand.php
@@ -11,7 +11,7 @@
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;
-use Ushahidi\Core\Facade\Feature;
+use Ushahidi\Core\Support\Facades\Feature;
 use Illuminate\Support\Facades\Validator;
 use Ushahidi\Core\Exception\ValidatorException;
 use Ushahidi\Core\Data\TosRepository;

diff --git a/app/Http/Middleware/CheckFeature.php b/app/Http/Middleware/CheckFeature.php
@@ -3,7 +3,7 @@
 namespace App\Http\Middleware;
 
 use Closure;
-use Ushahidi\Core\Facade\Feature;
+use Ushahidi\Core\Support\Facades\Feature;
 
 class CheckFeature
 {

diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
@@ -20,7 +20,6 @@
 
 use App\Bus\Query\QueryBus;
 use Illuminate\Support\ServiceProvider;
-use Ushahidi\Core\Data\Webhook as EntityWebhook;
 use Ushahidi\Modules\V5\Actions\CountryCode\Queries\FetchCountryCodeByIdQuery;
 use Ushahidi\Modules\V5\Actions\CountryCode\Queries\FetchCountryCodeQuery;
 use Ushahidi\Modules\V5\Actions\CountryCode\Handlers\FetchCountryCodeByIdQueryHandler;
@@ -488,7 +487,7 @@ private function registerQueries(): void
                 Survey\Queries\GetSurveyIdsWithPrivateLocationQuery::class,
                 Survey\Handlers\GetSurveyIdsWithPrivateLocationQueryHandler::class
             );
-            
+
 
 
             $queryBus->register(

diff --git a/composer.lock b/composer.lock
diff --git a/src/Ushahidi/Contracts/Repository/SearchRepository.php b/src/Ushahidi/Contracts/Repository/SearchRepository.php
@@ -13,7 +13,7 @@
 
 use Ushahidi\Contracts\Search;
 
-interface SearchRepository extends EntityGet
+interface SearchRepository extends EntityGet, EntityExists
 {
     /**
      * Get fields that can be used for searches.

diff --git a/src/Ushahidi/Contracts/Repository/UpdateRepository.php b/src/Ushahidi/Contracts/Repository/UpdateRepository.php
@@ -13,7 +13,7 @@
 
 use Ushahidi\Contracts\Entity;
 
-interface UpdateRepository
+interface UpdateRepository extends EntityGet, EntityExists
 {
     /**
      * @param array|\Ushahidi\Contracts\Entity $entity

diff --git a/src/Ushahidi/Core/Data/ConfigRepository.php b/src/Ushahidi/Core/Data/ConfigRepository.php
@@ -11,15 +11,16 @@
 
 namespace Ushahidi\Core\Data;
 
+use Ushahidi\Contracts\Repository\ReadRepository;
+use Ushahidi\Contracts\Repository\UpdateRepository;
+use Ushahidi\Contracts\Repository\DeleteRepository;
+
 /**
  * @method array groups()
  * @method array all(array $groups = null)
  *
- * @implements \Ushahidi\Contracts\Repository\ReadRepository
- * @implements \Ushahidi\Contracts\Repository\UpdateRepository
- * @implements \Ushahidi\Contracts\Repository\DeleteRepository
  */
-interface ConfigRepository
+interface ConfigRepository extends ReadRepository, UpdateRepository, DeleteRepository
 {
 
 }
diff --git a/src/Ushahidi/Core/Data/ExportJobEntity.php b/src/Ushahidi/Core/Data/ExportJobEntity.php
@@ -16,4 +16,10 @@ interface ExportJobEntity extends Entity
     const STATUS_EXPORTED_TO_CDN = 'EXPORTED_TO_CDN';
 
     const STATUS_PENDING_HDX = 'PENDING_HDX';
+
+    const DEFAULT_INCLUDE_HXL = 0;
+
+    const DEFAULT_SEND_TO_BROWSER = 0;
+
+    const DEFAULT_SEND_TO_HDX = 0;
 }
diff --git a/src/Ushahidi/Core/Data/RoleRepository.php b/src/Ushahidi/Core/Data/RoleRepository.php
@@ -20,7 +20,7 @@ interface RoleRepository extends
 {
     /**
      * @param string $value
-     * @return \Ushahidi\Core\Data\Role
+     * @return \Ushahidi\Core\Data\RoleEntity
      */
     public function getByName($value);
 }
diff --git a/src/Ushahidi/Core/Data/SetEntiity.php → src/Ushahidi/Core/Data/SetEntity.php b/src/Ushahidi/Core/Data/SetEntiity.php → src/Ushahidi/Core/Data/SetEntity.php
diff --git a/src/Ushahidi/Core/Data/WebhookEntity.php b/src/Ushahidi/Core/Data/WebhookEntity.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * Ushahidi Platform Tag Entity
+ *
+ * @author     Ushahidi Team <[email protected]>
+ * @package    Ushahidi\Platform
+ * @copyright  2014 Ushahidi
+ * @license    https://www.gnu.org/licenses/agpl-3.0.html GNU Affero General Public License Version 3 (AGPL3)
+ */
+
+namespace Ushahidi\Core\Data;
+
+use Ushahidi\Contracts\Entity;
+
+interface WebhookEntity extends Entity
+{
+
+}
diff --git a/src/Ushahidi/Core/Ohanzee/Entity/Notification.php b/src/Ushahidi/Core/Ohanzee/Entity/Notification.php
@@ -11,8 +11,8 @@
 
 namespace Ushahidi\Core\Ohanzee\Entity;
 
+use Ushahidi\Core\Data\NotificationEntity;
 use Ushahidi\Core\Ohanzee\StaticEntity;
-use Ushahidi\Core\Data\Notification as NotificationEntity;
 
 class Notification extends StaticEntity implements NotificationEntity
 {

diff --git a/src/Ushahidi/Core/Ohanzee/Entity/Set.php b/src/Ushahidi/Core/Ohanzee/Entity/Set.php
@@ -13,7 +13,7 @@
 
 use Illuminate\Support\Facades\Auth;
 use Ushahidi\Core\Ohanzee\StaticEntity;
-use \Ushahidi\Core\Data\SetEntity;
+use Ushahidi\Core\Data\SetEntity;
 
 class Set extends StaticEntity implements SetEntity
 {

diff --git a/src/Ushahidi/Core/Ohanzee/Entity/Webhook.php b/src/Ushahidi/Core/Ohanzee/Entity/Webhook.php
@@ -11,9 +11,10 @@
 
 namespace Ushahidi\Core\Ohanzee\Entity;
 
+use Ushahidi\Core\Data\WebhookEntity;
 use Ushahidi\Core\Ohanzee\StaticEntity;
 
-class Webhook extends StaticEntity
+class Webhook extends StaticEntity implements WebhookEntity
 {
     protected $id;
     protected $form_id;
@@ -43,21 +44,21 @@ protected function getDerived()
     protected function getDefinition()
     {
         return [
-            'id'                        => 'int',
-            'name'                            => 'string',
-            'url'                                   => 'string',
-            'shared_secret'             => 'string',
-            'webhook_uuid'              => 'string',
-            'event_type'                  => 'string',
-            'entity_type'                 => 'string',
+            'id'                      => 'int',
+            'name'                    => 'string',
+            'url'                     => 'string',
+            'shared_secret'           => 'string',
+            'webhook_uuid'            => 'string',
+            'event_type'              => 'string',
+            'entity_type'             => 'string',
             'source_field_key'        => 'string',
             'destination_field_key'   => 'string',
-            'user'                      => false,
-            'user_id'                   => 'int',
+            'user'                    => false,
+            'user_id'                 => 'int',
             'form'                    => false, /* alias */
             'form_id'                 => 'int',
-            'created'                   => 'int',
-            'updated'                   => 'int',
+            'created'                 => 'int',
+            'updated'                 => 'int',
         ];
     }
 

diff --git a/src/Ushahidi/Core/Ohanzee/Repository/ApiKeyRepository.php b/src/Ushahidi/Core/Ohanzee/Repository/ApiKeyRepository.php
@@ -1,7 +1,7 @@
 <?php
 
 /**
- * Ushahidi ApiKeyEntity Repository
+ * Ushahidi ApiKey Repository
  *
  * @author     Ushahidi Team <[email protected]>
  * @package    Ushahidi\Application
@@ -15,7 +15,7 @@
 use Ushahidi\Contracts\Entity;
 use Ushahidi\Core\Tool\SearchData;
 use Ushahidi\Core\Concerns\AdminAccess;
-use Ushahidi\Core\Ohanzee\Entity\ApiKeyEntity;
+use Ushahidi\Core\Ohanzee\Entity\ApiKey;
 use Ushahidi\Contracts\Repository\EntityExists;
 use Ushahidi\Contracts\Repository\CreateRepository;
 use Ushahidi\Core\Data\ApiKeyRepository as ApiKeyRepositoryContract;
@@ -31,7 +31,7 @@ protected function getTable()
 
     public function getEntity(array $data = null)
     {
-        return new ApiKeyEntity($data);
+        return new ApiKey($data);
     }
 
     // OhanzeeRepository

diff --git a/src/Ushahidi/Core/Ohanzee/Repository/Config/features.php b/src/Ushahidi/Core/Ohanzee/Repository/Config/features.php