Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller

app/config/collections.php

@@ -1862,7 +1862,7 @@ $commonCollections = [
                 'filters' => [],
             ],
             [
-                '$id' => ID::custom('providerType'),
+                '$id' => ID::custom('provider'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
                 'size' => Database::LENGTH_KEY,
@@ -1870,13 +1870,13 @@ $commonCollections = [
                 'required' => false,
                 'default' => null,
                 'array' => false,
-                'filters' => ['subQueryProviderType'],
+                'filters' => ['subQueryProvider'],
             ],
             [
                 '$id' => ID::custom('identifier'),
                 'type' => Database::VAR_STRING,
                 'format' => '',
-                'size' => 2048,
+                'size' => Database::LENGTH_KEY,
                 'signed' => true,
                 'required' => true,
                 'default' => null,

app/config/roles.php

@@ -23,12 +23,6 @@ $member = [
     'execution.write',
     'targets.read',
     'targets.write',
-    'providers.write',
-    'providers.read',
-    'messages.write',
-    'messages.read',
-    'topics.write',
-    'topics.read',
     'subscribers.write',
     'subscribers.read'
 ];
@@ -76,6 +70,16 @@ $admins = [
     'vcs.read',
     'vcs.write',
     'assistant.read',
+    'targets.read',
+    'targets.write',
+    'providers.write',
+    'providers.read',
+    'messages.write',
+    'messages.read',
+    'topics.write',
+    'topics.read',
+    'subscribers.write',
+    'subscribers.read'
 ];
 
 return [

app/init.php

@@ -546,7 +546,7 @@ Database::addFilter(
 );
 
 Database::addFilter(
-    'subQueryProviderType',
+    'subQueryProvider',
     function (mixed $value) {
         return null;
     },
@@ -555,16 +555,14 @@ Database::addFilter(
             ->getDocument(
                 'providers',
                 $document->getAttribute('providerId'),
-                [Query::select(['type'])]
             ));
-        if ($provider) {
-            return $provider->getAttribute('type');
+        if (!$provider->isEmpty()) {
+            return $provider;
         }
         return null;
     }
 );
 
-
 Database::addFilter(
     'subQueryTopicTargets',
     function (mixed $value) {