fix GA submission and add debug mode

savantly-net · Jan 1, 2025 · 5a39e20 · 5a39e20
1 parent eb3057b
commit 5a39e20
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 7 deletions.
diff --git a/...lytics-flow/src/main/java/net/savantly/nexus/gaform/dom/form/Form_SubmissionListener.java b/...lytics-flow/src/main/java/net/savantly/nexus/gaform/dom/form/Form_SubmissionListener.java
@@ -18,7 +18,7 @@
 public class Form_SubmissionListener {
 
     private final String baseUrl = "https://www.google-analytics.com";
-    private final String measurementApi = "/mp/collect";
+    private final String measurementApi = "/mp/collect?api_secret={api_secret}&measurement_id={measurement_id}";
 
     private final RestClient rest;
 
@@ -58,36 +58,55 @@ public void onApplicationEvent(SubmitFormJsonEvent event) {
             return;
         }
 
-        var apiKey = gaConnection.getConnection().getApiKey();
+        var baseGaConnection = gaConnection.getConnection();
+        var apiKey = baseGaConnection.getApiKey();
 
         if (Objects.isNull(apiKey) || Objects.isNull(apiKey.getSecret())) {
             log.debug("google analytics api key not found for formId: {}", form.getId());
             return;
         }
 
+        var gaDebugMode = baseGaConnection.isDebug() ? "1" : "0";
+
         var unencryptedKey = secrets.decryptSecretString(apiKey);
-        var uriVariables = Map.of("api_secret", unencryptedKey);
+        var uriVariables = Map.of("api_secret", unencryptedKey, "measurement_id", baseGaConnection.getMeasurementId());
 
         var eventParams = Map.of("form_id", form.getId(), "submission_id", submission.getId(), "form_name",
-                form.getName());
+                form.getName(), "debug_mode", gaDebugMode);
         var gaEvent = Map.of("name", "form_submission", "params", eventParams);
         var events = List.of(gaEvent);
-        var body = Map.of("events", events, "user_id", extractUserId(source.getRequest()));
+        var body = Map.of("events", events, "user_id", extractUserId(source.getRequest()), "client_id",
+                extractClientId(source.getRequest()));
+
+        var fullMeasurementApi = measurementApi;
+
+        if (baseGaConnection.isDebug()) {
+            fullMeasurementApi = "/debug" + measurementApi;
+        }
 
         var response = rest.post()
-                .uri(measurementApi, uriVariables)
+                .uri(fullMeasurementApi, uriVariables)
                 .body(body)
                 .contentType(MediaType.APPLICATION_JSON)
                 .retrieve()
                 .onStatus(status -> status.isError(), (req, res) -> {
                     log.error("Failed to send event to Google Analytics: {}", res.getStatusText());
                 })
-                .toBodilessEntity();
+                .toEntity(Object.class);
         log.info("end handling event with GA response: {}", response);
     }
 
     private String extractUserId(HttpServletRequest request) {
 
+        var uid = request.getParameter("uid");
+        if (Objects.nonNull(uid)) {
+            return uid;
+        }
+        var userId = request.getParameter("user_id");
+        if (Objects.nonNull(userId)) {
+            return userId;
+        }
+
         var cid = request.getParameter("cid");
         if (Objects.nonNull(cid)) {
             return cid;
@@ -102,4 +121,33 @@ private String extractUserId(HttpServletRequest request) {
         }
         return request.getRemoteAddr();
     }
+
+    private String extractClientId(HttpServletRequest request) {
+
+        var cid = request.getParameter("cid");
+        if (Objects.nonNull(cid)) {
+            return cid;
+        }
+        var clientId = request.getParameter("client_id");
+        if (Objects.nonNull(clientId)) {
+            return clientId;
+        }
+        var proxiedFor = request.getParameter("X-Forwarded-For");
+        if (Objects.nonNull(proxiedFor)) {
+            return proxiedFor;
+        }
+        return request.getRemoteAddr();
+    }
+
+    private String extractSessionId(HttpServletRequest request) {
+        var sid = request.getParameter("sid");
+        if (Objects.nonNull(sid)) {
+            return sid;
+        }
+        var sessionId = request.getParameter("session_id");
+        if (Objects.nonNull(sessionId)) {
+            return sessionId;
+        }
+        return request.getSession().getId();
+    }
 }
diff --git a/...e-google-analytics/src/main/java/net/savantly/nexus/ga/dom/gaConnection/GAConnection.java b/...e-google-analytics/src/main/java/net/savantly/nexus/ga/dom/gaConnection/GAConnection.java
@@ -100,6 +100,12 @@ public static GAConnection withRequiredArgs(Organization organization, String na
     @Setter
     private String measurementId;
 
+    @Column(name = "is_debug", nullable = true, columnDefinition = "boolean default false")
+    @PropertyLayout(fieldSetId = "identity", sequence = "1.6")
+    @Getter
+    @Setter
+    private boolean debug;
+
     @JoinColumn(name = "ga_secret_id", nullable = true)
     @Property(editing = Editing.DISABLED)
     @PropertyLayout(fieldSetId = "identity", sequence = "1.7")