From 00a18756653b12dbd8e46b750fe45b2ace207395 Mon Sep 17 00:00:00 2001
From: netalertx-fedora <@gitconfigbackup.thehomelab.cc>
Date: Fri, 9 Jan 2026 22:39:42 +0100
Subject: [PATCH 1/2] Use getApiBase() to get GraphQL Endpoint.

---
 front/deviceDetailsTools.php | 40 +++++++++++++++---------------------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/front/deviceDetailsTools.php b/front/deviceDetailsTools.php
index 469a645a..b30e8fbd 100755
--- a/front/deviceDetailsTools.php
+++ b/front/deviceDetailsTools.php
@@ -210,23 +210,20 @@
 <div id="scanoutput" style="margin-top: 30px;"></div>
 
 <script>
-
-            const protocol = window.location.protocol;
-            const host = window.location.hostname;
-            const port = getSetting("GRAPHQL_PORT");
+            // Build base URL dynamically
+            const apiBase = getApiBase();
             const apiToken = getSetting("API_TOKEN");
 
         // ----------------------------------------------------------------
         function manualnmapscan(targetip, mode) {
             $("#scanoutput").empty();
 
-
-            const baseUrl = getApiBase();
-
+            // Build base URL dynamically
+            const apiBase = getApiBase();
 
             $.ajax({
                 method: "POST",
-                url: `${baseUrl}/nettools/nmap`,
+                url: `${apiBase}/nettools/nmap`,
                 contentType: "application/json",
                 dataType: "json",
                 data: JSON.stringify({
@@ -265,7 +262,7 @@
 
             $.ajax({
                 method: "GET",
-                url: `${protocol}//${host}:${port}/nettools/speedtest`,
+                url: `${apiBase}/nettools/speedtest`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"
@@ -316,7 +313,7 @@
 
             $.ajax({
                 method: "POST",
-                url: `${protocol}//${host}:${port}/nettools/traceroute`,
+                url: `${apiBase}/nettools/traceroute`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"
@@ -366,7 +363,7 @@
 
             $.ajax({
                 method: "POST",
-                url: `${protocol}//${host}:${port}/nettools/nslookup`,
+                url: `${apiBase}/nettools/nslookup`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"
@@ -450,7 +447,7 @@
 
             $.ajax({
                 method: "POST",
-                url: `${protocol}//${host}:${port}/nettools/wakeonlan`,
+                url: `${apiBase}/nettools/wakeonlan`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"
@@ -492,7 +489,7 @@
 
             $.ajax({
                 method: "POST",
-                url: `${protocol}//${host}:${port}/device/copy`,
+                url: `${apiBase}/device/copy`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"
@@ -585,18 +582,14 @@
                 return;
             }
 
-            const protocol = window.location.protocol;  // "http:" or "https:"
-            const host = window.location.hostname;      // current hostname
-            const port = getSetting("GRAPHQL_PORT");    // your dynamic port
-            const apiToken = getSetting("API_TOKEN");   // optional token if needed
-
             // Build base URL dynamically
-            const baseUrl = getApiBase();
+            const apiBase = getApiBase();
+            const apiToken = getSetting("API_TOKEN");   // optional token if needed
 
             // Delete device events
             $.ajax({
                 method: "DELETE",
-                url: `${baseUrl}/device/${encodeURIComponent(mac)}/events/delete`,
+                url: `${apiBase}/device/${encodeURIComponent(mac)}/events/delete`,
                 headers: {
                     "Authorization": "Bearer " + apiToken
                 },
@@ -641,11 +634,12 @@
                 return;
             }
 
-            const baseUrl = getApiBase();
+            // Build base URL dynamically
+            const apiBase = getApiBase();
 
             $.ajax({
                 method: "POST",
-                url: `${baseUrl}/device/${encodeURIComponent(mac)}/reset-props`,
+                url: `${apiBase}/device/${encodeURIComponent(mac)}/reset-props`,
                 dataType: "json",
                 headers: {
                     "Authorization": "Bearer " + apiToken
@@ -675,7 +669,7 @@
 
             $.ajax({
                 method: "GET",
-                url: `${protocol}//${host}:${port}/nettools/internetinfo`,
+                url: `${apiBase}/nettools/internetinfo`,
                 headers: {
                     "Authorization": "Bearer " + apiToken,
                     "Content-Type": "application/json"

From 7b15329a028271ba747ca5493b215a54b775330f Mon Sep 17 00:00:00 2001
From: netalertx-fedora <@gitconfigbackup.thehomelab.cc>
Date: Fri, 9 Jan 2026 22:46:56 +0100
Subject: [PATCH 2/2] Use getApiBase() to get GraphQL Endpoint.

---
 front/appEventsCore.php |  6 ++----
 front/events.php        | 13 +++++--------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/front/appEventsCore.php b/front/appEventsCore.php
index 9e328db9..473d83f6 100755
--- a/front/appEventsCore.php
+++ b/front/appEventsCore.php
@@ -23,11 +23,9 @@ showSpinner()
 
 $(document).ready(function () {
 
-  const protocol = window.location.protocol.replace(':', '');
-  const host = window.location.hostname;
   const apiToken = getSetting("API_TOKEN");
-  const port = getSetting("GRAPHQL_PORT");
-  const graphqlUrl = `${protocol}://${host}:${port}/graphql`;
+  const apiBase = getApiBase();
+  const graphqlUrl = `${apiBase}/graphql`;
 
   $('#appevents-table').DataTable({
     processing: true,
diff --git a/front/events.php b/front/events.php
index 8df16c1b..a0c9b6a8 100755
--- a/front/events.php
+++ b/front/events.php
@@ -160,11 +160,10 @@ function periodChanged() {
 function getEventsTotals() {
   stopTimerRefreshData();
 
-  const protocol = window.location.protocol.replace(":", "");
-  const host = window.location.hostname;
-  const port = getSetting("GRAPHQL_PORT");
+  // Build API URL
+  const apiBase = getApiBase();
   const apiToken = getSetting("API_TOKEN");
-  const url = `${protocol}://${host}:${port}/sessions/totals?period=${encodeURIComponent(period)}`;
+  const url = `${apiBase}/sessions/totals?period=${encodeURIComponent(period)}`;
 
   $.ajax({
     url,
@@ -207,11 +206,9 @@ function getEvents(type) {
   table.column(7).visible(config.sesionCols);
 
   // Build API URL
-  const protocol = window.location.protocol.replace(":", "");
-  const host = window.location.hostname;
-  const port = getSetting("GRAPHQL_PORT");
+  const apiBase = getApiBase();
   const apiToken = getSetting("API_TOKEN");
-  const url = `${protocol}://${host}:${port}/sessions/session-events?type=${encodeURIComponent(type)}&period=${encodeURIComponent(period)}`;
+  const url = `${apiBase}/sessions/session-events?type=${encodeURIComponent(type)}&period=${encodeURIComponent(period)}`;
 
   table.clear().draw(); // Clear old rows