Merge branch 'develop'

aesirxio · Nov 1, 2023 · f6bc193 · f6bc193
2 parents 15b8725 + 27d8a08
commit f6bc193
Show file tree

Hide file tree

Showing 7 changed files with 327 additions and 156 deletions.
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -21,7 +21,7 @@ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \
     ldap \
     sockets;
 
-ENV NODE_PACKAGE_URL  https://unofficial-builds.nodejs.org/download/release/v16.9.1/node-v16.9.1-linux-x64-musl.tar.gz
+ENV NODE_PACKAGE_URL  https://unofficial-builds.nodejs.org/download/release/v16.14.0/node-v16.14.0-linux-x64-musl.tar.gz
 
 RUN apk add libstdc++
 WORKDIR /opt

diff --git a/extensions/components/com_aesirx_analytics/administrator/aesirx_analytics.xml b/extensions/components/com_aesirx_analytics/administrator/aesirx_analytics.xml
@@ -7,7 +7,7 @@
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
 	<authorEmail>info@aesir.io</authorEmail>
 	<authorUrl>aesir.io</authorUrl>
-	<version>2.0.1</version>
+	<version>3.0.0</version>
 	<description>COM_AESIRX_ANALYTICS_XML_DESCRIPTION</description>
 	<namespace path="src">Aesirx\Component\AesirxAnalytics</namespace>
 	<administration>

diff --git a/extensions/plugins/system/aesirx_analytics/composer.json b/extensions/plugins/system/aesirx_analytics/composer.json
@@ -1,13 +1,13 @@
 {
-    "name": "vshandak/aesirx_analytics",
+    "name": "aesirx/aesirx_analytics",
     "description": "Aesirx analytics plugin. When you join forces with AesirX, you're not just becoming a Partner - you're also becoming a freedom fighter in the battle for privacy!",
     "type": "project",
     "license": "GPL-2.0-or-later",
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
         "php": ">=7.2",
-        "vshandak/aesirx_analytics_lib": "^1"
+        "aesirx/aesirx_analytics_lib": "^1"
     },
     "require-dev": {
         "voku/portable-utf8": "6.0.12 as 5.4.0",

diff --git a/extensions/plugins/system/aesirx_analytics/composer.lock b/extensions/plugins/system/aesirx_analytics/composer.lock
diff --git a/extensions/plugins/system/aesirx_analytics/src/Extension/AesirxAnalyticsExtension.php b/extensions/plugins/system/aesirx_analytics/src/Extension/AesirxAnalyticsExtension.php
@@ -116,13 +116,17 @@ public function onAfterRender()
 						? $uri->toString(['scheme', 'user', 'pass', 'host', 'port']) . Uri::base(true) . '?path='
 						: $params->get('domain');
 
+					$clientId = $params->get('client_id');
+					$clientSecret = $params->get('client_secret');
+
 					$wa->addInlineScript(
 						'window.env = {};
-				window.env.REACT_APP_CLIENT_ID = "app";
-				window.env.REACT_APP_CLIENT_SECRET = "secret";
+				window.env.REACT_APP_CLIENT_ID = "' . $clientId . '";
+				window.env.REACT_APP_CLIENT_SECRET = "' . $clientSecret . '";
 				window.env.REACT_APP_ENDPOINT_URL = "' . rtrim($endpoint, '/') . '";
 				window.env.REACT_APP_DATA_STREAM = JSON.stringify(' . json_encode($streams) . ');
-				window.env.PUBLIC_URL="' . Uri::root() . 'media/plg_system_aesirx_analytics/";',
+				window.env.PUBLIC_URL="' . Uri::root() . 'media/plg_system_aesirx_analytics/";
+				window.env.STORAGE="' . $params->get('1st_party_server') . '";' . ($params->get('1st_party_server', 'internal') === 'external' ? 'window.env.REACT_APP_HEADER_JWT="true";' : ''),
 						['position' => 'before'], [], ['plg_system_aesirx_analytics.bi.0']
 					);
 				};