Merge branch 'feat-messages-event-config' of https://github.com/appwrite/appwrite into feat-mailgun-provider
This commit is contained in:
commit
778056d8e0
8 changed files with 26 additions and 62 deletions
|
@ -1427,6 +1427,17 @@ $commonCollections = [
|
|||
'default' => false,
|
||||
'array' => false,
|
||||
],
|
||||
[
|
||||
'$id' => ID::custom('enabled'),
|
||||
'type' => Database::VAR_BOOLEAN,
|
||||
'signed' => true,
|
||||
'size' => 0,
|
||||
'format' => '',
|
||||
'filters' => [],
|
||||
'required' => true,
|
||||
'default' => true,
|
||||
'array' => false,
|
||||
],
|
||||
[
|
||||
'$id' => ID::custom('credentials'),
|
||||
'type' => Database::VAR_STRING,
|
||||
|
@ -1861,17 +1872,6 @@ $commonCollections = [
|
|||
'array' => false,
|
||||
'filters' => [],
|
||||
],
|
||||
[
|
||||
'$id' => ID::custom('provider'),
|
||||
'type' => Database::VAR_STRING,
|
||||
'format' => '',
|
||||
'size' => Database::LENGTH_KEY,
|
||||
'signed' => true,
|
||||
'required' => false,
|
||||
'default' => null,
|
||||
'array' => false,
|
||||
'filters' => ['subQueryProvider'],
|
||||
],
|
||||
[
|
||||
'$id' => ID::custom('identifier'),
|
||||
'type' => Database::VAR_STRING,
|
||||
|
|
18
app/init.php
18
app/init.php
|
@ -544,24 +544,6 @@ Database::addFilter(
|
|||
}
|
||||
);
|
||||
|
||||
Database::addFilter(
|
||||
'subQueryProvider',
|
||||
function (mixed $value) {
|
||||
return null;
|
||||
},
|
||||
function (mixed $value, Document $document, Database $database) {
|
||||
$provider = Authorization::skip(fn () => $database
|
||||
->getDocument(
|
||||
'providers',
|
||||
$document->getAttribute('providerId'),
|
||||
));
|
||||
if (!$provider->isEmpty()) {
|
||||
return $provider;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
);
|
||||
|
||||
Database::addFilter(
|
||||
'subQueryTopicTargets',
|
||||
function (mixed $value) {
|
||||
|
|
|
@ -24,7 +24,7 @@ class Message extends Any
|
|||
])
|
||||
->addRule('providerId', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'Provider Id for the message.',
|
||||
'description' => 'Provider ID for the message.',
|
||||
'default' => '',
|
||||
'example' => '5e5ea5c16897e',
|
||||
])
|
||||
|
@ -40,26 +40,26 @@ class Message extends Any
|
|||
'description' => 'Recipient of message.',
|
||||
'required' => false,
|
||||
'default' => DateTime::now(),
|
||||
'example' => DateTime::now(),
|
||||
'example' => self::TYPE_DATETIME_EXAMPLE,
|
||||
])
|
||||
->addRule('deliveryError', [
|
||||
->addRule('deliveryErrors', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'Delivery error if any.',
|
||||
'description' => 'Delivery errors if any.',
|
||||
'required' => false,
|
||||
'default' => '',
|
||||
'array' => true,
|
||||
'example' => 'Provider not valid.',
|
||||
'example' => 'Credentials not valid.',
|
||||
])
|
||||
->addRule('deliveredTo', [
|
||||
'type' => self::TYPE_INTEGER,
|
||||
'description' => 'Number of recipients the message was delivered to.',
|
||||
'default' => '',
|
||||
'default' => 0,
|
||||
'example' => 1,
|
||||
])
|
||||
->addRule('delivered', [
|
||||
'type' => self::TYPE_BOOLEAN,
|
||||
'description' => 'Status of delivery.',
|
||||
'default' => '',
|
||||
'default' => false,
|
||||
'example' => true,
|
||||
]);
|
||||
}
|
||||
|
|
|
@ -348,7 +348,7 @@ class Project extends Model
|
|||
]);
|
||||
}
|
||||
|
||||
$document->setAttribute("authProviders", $projectProviders);
|
||||
$document->setAttribute('authProviders', $projectProviders);
|
||||
|
||||
return $document;
|
||||
}
|
||||
|
|
|
@ -7,9 +7,6 @@ use Appwrite\Utopia\Response\Model;
|
|||
|
||||
class Provider extends Model
|
||||
{
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected bool $public = false;
|
||||
|
||||
public function __construct()
|
||||
|
@ -36,7 +33,13 @@ class Provider extends Model
|
|||
->addRule('default', [
|
||||
'type' => self::TYPE_BOOLEAN,
|
||||
'description' => 'Is this a pre-configured provider instance?',
|
||||
'default' => '',
|
||||
'default' => false,
|
||||
'example' => true,
|
||||
])
|
||||
->addRule('enabled', [
|
||||
'type' => self::TYPE_BOOLEAN,
|
||||
'description' => 'Is provider enabled?',
|
||||
'default' => true,
|
||||
'example' => true,
|
||||
])
|
||||
->addRule('type', [
|
||||
|
|
|
@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
|
|||
|
||||
class Subscriber extends Model
|
||||
{
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected bool $public = false;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this
|
||||
|
|
|
@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
|
|||
|
||||
class Target extends Model
|
||||
{
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected bool $public = false;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this
|
||||
|
@ -34,12 +29,6 @@ class Target extends Model
|
|||
'default' => '',
|
||||
'example' => '259125845563242502',
|
||||
])
|
||||
->addRule('providerType', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'The type of provider supported by this target.',
|
||||
'default' => '',
|
||||
'example' => 'sms',
|
||||
])
|
||||
->addRule('identifier', [
|
||||
'type' => self::TYPE_STRING,
|
||||
'description' => 'The target identifier.',
|
||||
|
|
|
@ -7,11 +7,6 @@ use Appwrite\Utopia\Response\Model;
|
|||
|
||||
class Topic extends Model
|
||||
{
|
||||
/**
|
||||
* @var bool
|
||||
*/
|
||||
protected bool $public = false;
|
||||
|
||||
public function __construct()
|
||||
{
|
||||
$this
|
||||
|
|
Loading…
Reference in a new issue