From 89de835b7da8e8cd244852c001c8182876cd251a Mon Sep 17 00:00:00 2001
From: Ioannis Igoumenos <ioigoume@gmail.com>
Date: Sun, 27 Apr 2025 14:00:09 +0300
Subject: [PATCH] Renane callback uri field to redirect uri

---
 .../CoreServer/resources/locales/en_US/core_server.po      | 4 ++--
 .../CoreServer/src/Controller/Oauth2ServersController.php  | 5 ++---
 app/plugins/CoreServer/templates/Oauth2Servers/fields.inc  | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/app/plugins/CoreServer/resources/locales/en_US/core_server.po b/app/plugins/CoreServer/resources/locales/en_US/core_server.po
index c3452a102..6d70b81b4 100644
--- a/app/plugins/CoreServer/resources/locales/en_US/core_server.po
+++ b/app/plugins/CoreServer/resources/locales/en_US/core_server.po
@@ -103,8 +103,8 @@ msgstr "Access Token Grant Type"
 msgid "field.Oauth2Servers.url"
 msgstr "Server  URL"
 
-msgid "field.Oauth2Servers.callback_endpoint"
-msgstr "Callback  URI"
+msgid "field.Oauth2Servers.redirect_uri"
+msgstr "Redirect  URI"
 
 msgid "field.Oauth2Servers.scope"
 msgstr "Scopes"
diff --git a/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php b/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
index ad79b2886..28f949bff 100644
--- a/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
+++ b/app/plugins/CoreServer/src/Controller/Oauth2ServersController.php
@@ -46,17 +46,16 @@ class Oauth2ServersController extends StandardPluginController
    *
    * @param EventInterface $event Cake Event
    *
-   * @return Response|void
    * @since  COmanage Registry v5.2.0
    */
 
   public function beforeRender(EventInterface $event)
   {
-    // Generate the callback URL
+    // Generate the Redirect URI
 
     if ($this->getRequest()->getParam('action') === 'edit') {
       $id = $this->getRequest()->getParam('pass')[0] ?? null; // Assuming $id comes from passed arguments
-      $this->set('vv_callback_endpoint', $this->Oauth2Servers->redirectUri($id));
+      $this->set('vv_redirect_uri', $this->Oauth2Servers->redirectUri($id));
     }
 
     return parent::beforeRender($event);
diff --git a/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc b/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
index ee6928f81..4904d5e2f 100644
--- a/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
+++ b/app/plugins/CoreServer/templates/Oauth2Servers/fields.inc
@@ -30,14 +30,13 @@ if($vv_action !== 'edit') {
   return;
 }
 
-// Render the callback endpoint
-
+// Render the Redirect URI
 print $this->element('form/listItem', [
   'arguments' => [
-    'fieldName' => 'callback_endpoint',
+    'fieldName' => 'redirect_uri',
     'fieldOptions' => [
       'readOnly' => true,
-      'default' => $vv_callback_endpoint
+      'default' => $vv_redirect_uri
     ]
   ]]);