From 37dd778f86f5d66fc846960c234114107f7e0aee Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Tue, 3 Aug 2021 16:34:29 +0300 Subject: [PATCH] Removed Rule and Permissions models --- src/Appwrite/Utopia/Response.php | 9 +- .../Utopia/Response/Model/Permissions.php | 49 ---------- src/Appwrite/Utopia/Response/Model/Rule.php | 89 ------------------- 3 files changed, 4 insertions(+), 143 deletions(-) delete mode 100644 src/Appwrite/Utopia/Response/Model/Permissions.php delete mode 100644 src/Appwrite/Utopia/Response/Model/Rule.php diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php index c56bfe2b87..3cd25b6032 100644 --- a/src/Appwrite/Utopia/Response.php +++ b/src/Appwrite/Utopia/Response.php @@ -39,7 +39,6 @@ use Appwrite\Utopia\Response\Model\Platform; use Appwrite\Utopia\Response\Model\Project; use Appwrite\Utopia\Response\Model\Rule; use Appwrite\Utopia\Response\Model\Tag; -use Appwrite\Utopia\Response\Model\Task; use Appwrite\Utopia\Response\Model\Token; use Appwrite\Utopia\Response\Model\Webhook; use Appwrite\Utopia\Response\Model\Preferences; @@ -59,7 +58,6 @@ class Response extends SwooleResponse const MODEL_ERROR = 'error'; const MODEL_ERROR_DEV = 'errorDev'; const MODEL_BASE_LIST = 'baseList'; - const MODEL_PERMISSIONS = 'permissions'; // Database const MODEL_COLLECTION = 'collection'; @@ -68,7 +66,6 @@ class Response extends SwooleResponse const MODEL_ATTRIBUTE_LIST = 'attributeList'; const MODEL_INDEX = 'index'; const MODEL_INDEX_LIST = 'indexList'; - const MODEL_RULE = 'rule'; const MODEL_DOCUMENT = 'document'; const MODEL_DOCUMENT_LIST = 'documentList'; @@ -125,6 +122,10 @@ class Response extends SwooleResponse const MODEL_DOMAIN = 'domain'; const MODEL_DOMAIN_LIST = 'domainList'; + // Deprecated + const MODEL_PERMISSIONS = 'permissions'; + const MODEL_RULE = 'rule'; + // Tests (keep last) const MODEL_MOCK = 'mock'; @@ -176,12 +177,10 @@ class Response extends SwooleResponse ->setModel(new BaseList('Currencies List', self::MODEL_CURRENCY_LIST, 'currencies', self::MODEL_CURRENCY)) ->setModel(new BaseList('Phones List', self::MODEL_PHONE_LIST, 'phones', self::MODEL_PHONE)) // Entities - ->setModel(new Permissions()) ->setModel(new Collection()) ->setModel(new Attribute()) ->setModel(new Index()) ->setModel(new ModelDocument()) - ->setModel(new Rule()) ->setModel(new Log()) ->setModel(new User()) ->setModel(new Preferences()) diff --git a/src/Appwrite/Utopia/Response/Model/Permissions.php b/src/Appwrite/Utopia/Response/Model/Permissions.php deleted file mode 100644 index 3dc389e850..0000000000 --- a/src/Appwrite/Utopia/Response/Model/Permissions.php +++ /dev/null @@ -1,49 +0,0 @@ -addRule('read', [ - 'type' => self::TYPE_STRING, - 'description' => 'Read permissions.', - 'default' => [], - 'example' => 'user:5e5ea5c16897e', - 'array' => true, - ]) - ->addRule('write', [ - 'type' => self::TYPE_STRING, - 'description' => 'Write permissions.', - 'default' => [], - 'example' => 'user:5e5ea5c16897e', - 'array' => true, - ]) - ; - } - - /** - * Get Name - * - * @return string - */ - public function getName():string - { - return 'Permissions'; - } - - /** - * Get Collection - * - * @return string - */ - public function getType():string - { - return Response::MODEL_PERMISSIONS; - } -} \ No newline at end of file diff --git a/src/Appwrite/Utopia/Response/Model/Rule.php b/src/Appwrite/Utopia/Response/Model/Rule.php deleted file mode 100644 index a98fb77a34..0000000000 --- a/src/Appwrite/Utopia/Response/Model/Rule.php +++ /dev/null @@ -1,89 +0,0 @@ -addRule('$id', [ - 'type' => self::TYPE_STRING, - 'description' => 'Rule ID.', - 'default' => '', - 'example' => '5e5ea5c16897e', - ]) - ->addRule('$collection', [ // TODO remove this from public response - 'type' => self::TYPE_STRING, - 'description' => 'Rule Collection.', - 'example' => '5e5e66c16897e', - ]) - ->addRule('type', [ - 'type' => self::TYPE_STRING, - 'description' => 'Rule type. Possible values: ', - 'default' => '', - 'example' => 'title', - ]) - ->addRule('key', [ - 'type' => self::TYPE_STRING, - 'description' => 'Rule key.', - 'default' => '', - 'example' => 'title', - ]) - ->addRule('label', [ - 'type' => self::TYPE_STRING, - 'description' => 'Rule label.', - 'default' => '', - 'example' => 'Title', - ]) - ->addRule('default', [ // TODO should be of mixed types - 'type' => self::TYPE_STRING, - 'description' => 'Rule default value.', - 'default' => '', - 'example' => 'Movie Name', - ]) - ->addRule('array', [ - 'type' => self::TYPE_BOOLEAN, - 'description' => 'Is array?', - 'default' => false, - 'example' => false, - ]) - ->addRule('required', [ - 'type' => self::TYPE_BOOLEAN, - 'description' => 'Is required?', - 'default' => false, - 'example' => true, - ]) - ->addRule('list', [ - 'type' => self::TYPE_STRING, - 'description' => 'List of allowed values', - 'array' => true, - 'default' => [], - 'example' => '5e5ea5c168099', - ]) - ; - } - - /** - * Get Name - * - * @return string - */ - public function getName():string - { - return 'Rule'; - } - - /** - * Get Collection - * - * @return string - */ - public function getType():string - { - return Response::MODEL_RULE; - } -} \ No newline at end of file