From d5604efef8cea5bacedc542bcbf38be01735a468 Mon Sep 17 00:00:00 2001
From: Bradley Schofield <ionicisere@gmail.com>
Date: Fri, 17 Jan 2025 13:38:38 +0900
Subject: [PATCH] Fix actions

---
 app/controllers/api/vcs.php | 1 -
 app/controllers/general.php | 7 ++++++-
 app/http.php                | 9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php
index e64a2f895b..7c31d93df5 100644
--- a/app/controllers/api/vcs.php
+++ b/app/controllers/api/vcs.php
@@ -272,7 +272,6 @@ App::get('/v1/vcs/github/authorize')
     ->desc('Install GitHub app')
     ->groups(['api', 'vcs'])
     ->label('scope', 'vcs.read')
-    ->label('sdk.namespace', 'vcs')
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('sdk', new Method(
         namespace: 'vcs',
diff --git a/app/controllers/general.php b/app/controllers/general.php
index f6a584b69e..aedecf8a9c 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -931,7 +931,12 @@ App::error()
             $log->addExtra('trace', $error->getTraceAsString());
             $log->addExtra('roles', Authorization::getRoles());
 
-            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
+            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
+            if (!empty($sdk)) {
+                /** @var Appwrite\SDK\Method $sdk */
+                $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
+            }
+
             $log->setAction($action);
             $log->addTag('service', $action);
 
diff --git a/app/http.php b/app/http.php
index 3a7562ffd1..e85120a894 100644
--- a/app/http.php
+++ b/app/http.php
@@ -386,7 +386,14 @@ $http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, Swool
             $log->addExtra('trace', $th->getTraceAsString());
             $log->addExtra('roles', Authorization::getRoles());
 
-            $action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
+            $sdk = $route->getLabel("sdk", false);
+
+            $action = 'UNKNOWN_NAMESPACE.UNKNOWN.METHOD';
+            if (!empty($sdk)) {
+                /** @var Appwrite\SDK\Method $sdk */
+                $action = $sdk->getNamespace() . '.' . $sdk->getMethodName();
+            }
+
             $log->setAction($action);
             $log->addTag('service', $action);