From 913bb611d589f70778ee80f6f0521bdb243e4652 Mon Sep 17 00:00:00 2001
From: c <c@echo.local>
Date: Tue, 31 Jan 2023 13:18:02 +0000
Subject: [PATCH] Feature - Google Analytics - Removed regex to validate a
Google Analytics tag.
---
server/modules/google-analytics.js | 13 -------------
.../socket-handlers/status-page-socket-handler.js | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/server/modules/google-analytics.js b/server/modules/google-analytics.js
index 4e0c95b2..8b909b42 100644
--- a/server/modules/google-analytics.js
+++ b/server/modules/google-analytics.js
@@ -1,15 +1,3 @@
-/**
- * Returns true if the tag conforms to the format of 1-2 Letters followed by a dash and 8 numbers.
- * This should take care of the following property tag formats:
- * UA-########, G-########, AW-########, DC-########
- * @param {String} tagInput Google UA/G/AW/DC Property ID
- * @returns {boolean}
- */
-function isValidTag(tagInput) {
- const re = /^\w{1,2}-\d{8}$/g;
- return tagInput.match(re) != null;
-}
-
/**
* Returns a string that represents the javascript that is required to insert the Google Analytics scripts
* into a webpage.
@@ -23,5 +11,4 @@ function getGoogleAnalyticsScript(tagId) {
module.exports = {
getGoogleAnalyticsScript,
- isValidTag,
};
diff --git a/server/socket-handlers/status-page-socket-handler.js b/server/socket-handlers/status-page-socket-handler.js
index 359ed15b..c973d7ed 100644
--- a/server/socket-handlers/status-page-socket-handler.js
+++ b/server/socket-handlers/status-page-socket-handler.js
@@ -164,7 +164,7 @@ module.exports.statusPageSocketHandler = (socket) => {
statusPage.custom_css = config.customCSS;
statusPage.show_powered_by = config.showPoweredBy;
statusPage.modified_date = R.isoDateTime();
- statusPage.google_analytics_tag_id = googleAnalytics.isValidTag(config.googleAnalyticsId) ? config.googleAnalyticsId : "";
+ statusPage.google_analytics_tag_id = config.googleAnalyticsId;
await R.store(statusPage);