From 63d8b402aa0811cefa40a0be3e3a15b457efc42c Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 3 Aug 2020 14:47:32 +0300
Subject: [PATCH] Updated webhook event label name

---
 app/app.php                      | 26 +++++++++++++++++++++-----
 app/controllers/api/account.php  | 20 ++++++++++----------
 app/controllers/api/database.php | 12 ++++++------
 app/controllers/api/storage.php  |  6 +++---
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/app/app.php b/app/app.php
index 90a2580e87..5d28266f1e 100644
--- a/app/app.php
+++ b/app/app.php
@@ -21,7 +21,7 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $webhooks, $audits, $usage, $clients) {
+App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $webhooks, $audits, $usage, $functions, $clients) {
     /** @var Appwrite\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $console */
@@ -31,6 +31,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     /** @var Appwrite\Event\Event $webhooks */
     /** @var Appwrite\Event\Event $audits */
     /** @var Appwrite\Event\Event $usage */
+    /** @var Appwrite\Event\Event $functions */
     /** @var bool $mode */
     /** @var array $clients */
     
@@ -217,9 +218,19 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
     /*
      * Background Jobs
      */
+    $functions
+        ->setParam('projectId', $project->getId())
+        ->setParam('event', $route->getLabel('events', ''))
+        ->setParam('payload', [])
+        ->setParam('functionId', null)
+        ->setParam('executionId', null)
+        ->setParam('functionTag', null)
+        ->setParam('functionTrigger', 'event')
+    ;
+
     $webhooks
         ->setParam('projectId', $project->getId())
-        ->setParam('event', $route->getLabel('webhook', ''))
+        ->setParam('event', $route->getLabel('events', ''))
         ->setParam('payload', [])
     ;
 
@@ -242,9 +253,9 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo
         ->setParam('networkResponseSize', 0)
         ->setParam('storage', 0)
     ;
-}, ['utopia', 'request', 'response', 'console', 'project', 'user', 'locale', 'webhooks', 'audits', 'usage', 'clients']);
+}, ['utopia', 'request', 'response', 'console', 'project', 'user', 'locale', 'webhooks', 'audits', 'usage', 'functions', 'clients']);
 
-App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audits, $usage, $deletes, $mode) {
+App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audits, $usage, $deletes, $functions, $mode) {
     /** @var Utopia\App $utopia */
     /** @var Utopia\Request $request */
     /** @var Utopia\Response $response */
@@ -253,8 +264,13 @@ App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audi
     /** @var Appwrite\Event\Event $audits */
     /** @var Appwrite\Event\Event $usage */
     /** @var Appwrite\Event\Event $deletes */
+    /** @var Appwrite\Event\Event $functions */
     /** @var bool $mode */
 
+    if (!empty($functions->getParam('event'))) {
+        $functions->trigger();
+    }
+
     if (!empty($webhooks->getParam('event'))) {
         $webhooks->trigger();
     }
@@ -279,7 +295,7 @@ App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audi
             ->trigger()
         ;
     }
-}, ['utopia', 'request', 'response', 'project', 'webhooks', 'audits', 'usage', 'deletes', 'mode']);
+}, ['utopia', 'request', 'response', 'project', 'webhooks', 'audits', 'usage', 'deletes', 'functions', 'mode']);
 
 App::options(function ($request, $response) {
     /** @var Appwrite\Swoole\Request $request */
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 48ad948263..b651a1f5cd 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -44,7 +44,7 @@ App::init(function() use (&$oauth2Keys) {
 App::post('/v1/account')
     ->desc('Create Account')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.create')
+    ->label('event', 'account.create')
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -149,7 +149,7 @@ App::post('/v1/account')
 App::post('/v1/account/sessions')
     ->desc('Create Account Session')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.sessions.create')
+    ->label('event', 'account.sessions.create')
     ->label('scope', 'public')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -348,7 +348,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
     ->desc('OAuth2 Redirect')
     ->groups(['api', 'account'])
     ->label('error', __DIR__.'/../../views/general/error.phtml')
-    ->label('webhook', 'account.sessions.create')
+    ->label('event', 'account.sessions.create')
     ->label('scope', 'public')
     ->label('abuse-limit', 50)
     ->label('abuse-key', 'ip:{ip}')
@@ -732,7 +732,7 @@ App::get('/v1/account/logs')
 App::patch('/v1/account/name')
     ->desc('Update Account Name')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.update.name')
+    ->label('event', 'account.update.name')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -773,7 +773,7 @@ App::patch('/v1/account/name')
 App::patch('/v1/account/password')
     ->desc('Update Account Password')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.update.password')
+    ->label('event', 'account.update.password')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -819,7 +819,7 @@ App::patch('/v1/account/password')
 App::patch('/v1/account/email')
     ->desc('Update Account Email')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.update.email')
+    ->label('event', 'account.update.email')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -880,7 +880,7 @@ App::patch('/v1/account/email')
 App::patch('/v1/account/prefs')
     ->desc('Update Account Preferences')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.update.prefs')
+    ->label('event', 'account.update.prefs')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -924,7 +924,7 @@ App::patch('/v1/account/prefs')
 App::delete('/v1/account')
     ->desc('Delete Account')
     ->groups(['api', 'account'])
-    ->label('webhook', 'account.delete')
+    ->label('event', 'account.delete')
     ->label('scope', 'account')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
@@ -986,7 +986,7 @@ App::delete('/v1/account/sessions/:sessionId')
     ->desc('Delete Account Session')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
-    ->label('webhook', 'account.sessions.delete')
+    ->label('event', 'account.sessions.delete')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'deleteSession')
@@ -1051,7 +1051,7 @@ App::delete('/v1/account/sessions')
     ->desc('Delete All Account Sessions')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
-    ->label('webhook', 'account.sessions.delete')
+    ->label('event', 'account.sessions.delete')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT])
     ->label('sdk.namespace', 'account')
     ->label('sdk.method', 'deleteSessions')
diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index eb1a750e70..28ad50de4c 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -24,7 +24,7 @@ use Appwrite\Database\Exception\Structure as StructureException;
 App::post('/v1/database/collections')
     ->desc('Create Collection')
     ->groups(['api', 'database'])
-    ->label('webhook', 'database.collections.create')
+    ->label('event', 'database.collections.create')
     ->label('scope', 'collections.write')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
@@ -220,7 +220,7 @@ App::put('/v1/database/collections/:collectionId')
     ->desc('Update Collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
-    ->label('webhook', 'database.collections.update')
+    ->label('event', 'database.collections.update')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.method', 'updateCollection')
@@ -296,7 +296,7 @@ App::delete('/v1/database/collections/:collectionId')
     ->desc('Delete Collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
-    ->label('webhook', 'database.collections.delete')
+    ->label('event', 'database.collections.delete')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_SERVER])
     ->label('sdk.method', 'deleteCollection')
@@ -336,7 +336,7 @@ App::delete('/v1/database/collections/:collectionId')
 App::post('/v1/database/collections/:collectionId/documents')
     ->desc('Create Document')
     ->groups(['api', 'database'])
-    ->label('webhook', 'database.documents.create')
+    ->label('event', 'database.documents.create')
     ->label('scope', 'documents.write')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
@@ -568,7 +568,7 @@ App::get('/v1/database/collections/:collectionId/documents/:documentId')
 App::patch('/v1/database/collections/:collectionId/documents/:documentId')
     ->desc('Update Document')
     ->groups(['api', 'database'])
-    ->label('webhook', 'database.documents.update')
+    ->label('event', 'database.documents.update')
     ->label('scope', 'documents.write')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
@@ -652,7 +652,7 @@ App::delete('/v1/database/collections/:collectionId/documents/:documentId')
     ->desc('Delete Document')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.write')
-    ->label('webhook', 'database.documents.delete')
+    ->label('event', 'database.documents.delete')
     ->label('sdk.namespace', 'database')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.method', 'deleteDocument')
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 2b9ebfe7eb..960ec5341a 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -26,7 +26,7 @@ App::post('/v1/storage/files')
     ->desc('Create File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('webhook', 'storage.files.create')
+    ->label('event', 'storage.files.create')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'createFile')
@@ -474,7 +474,7 @@ App::put('/v1/storage/files/:fileId')
     ->desc('Update File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('webhook', 'storage.files.update')
+    ->label('event', 'storage.files.update')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'updateFile')
@@ -522,7 +522,7 @@ App::delete('/v1/storage/files/:fileId')
     ->desc('Delete File')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
-    ->label('webhook', 'storage.files.delete')
+    ->label('event', 'storage.files.delete')
     ->label('sdk.platform', [APP_PLATFORM_CLIENT, APP_PLATFORM_SERVER])
     ->label('sdk.namespace', 'storage')
     ->label('sdk.method', 'deleteFile')