mandatory field checks reverted and scriploader edit

rudderlabs · Sep 22, 2021 · 549a728 · 549a728
1 parent 1b2c9cf
commit 549a728
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/integrations/Sentry/browser.js b/integrations/Sentry/browser.js
@@ -37,6 +37,12 @@ class Sentry {
       `sha384-S3qfdh3AsT1UN84WIYNuOX9vVOoFg3nB17Jp5/pTFGDBGBt+dtz7MGAV845efkZr`
     );
 
+    SentryScriptLoader(
+      "Sentry",
+      `https://browser.sentry-cdn.com/6.12.0/rewriteframes.min.js`,
+      `sha384-WOm9k3kzVt1COFAB/zCXOFx4lDMtJh/2vmEizIwgog7OW0P/dPwl3s8f6MdwrD7q`
+    );
+
     const formattedAllowUrls = convertObjectToArray(this.allowUrls);
     const formattedDenyUrls = convertObjectToArray(this.denyUrls);
     const formattedIgnoreErrors = convertObjectToArray(this.ignoreErrors);
@@ -127,6 +133,14 @@ class Sentry {
       get(rudderElement.message, "traits.ip_address") ||
       get(rudderElement.message, "context.traits.ip_address");
 
+    if (!userId && !email && !name && !ipAddress) {
+      // if no user identification property is present the event will be dropped
+      logger.debug(
+        "Any one of userId, email, name and ip_address is mandatory"
+      );
+      return;
+    }
+
     const finalPayload = {
       id: userId,
       email: email,

diff --git a/integrations/Sentry/utils.js b/integrations/Sentry/utils.js
@@ -17,11 +17,6 @@ const SentryScriptLoader = (id, src, integrity) => {
   logger.debug("==parent script==", e);
   logger.debug("==adding script==", js);
   e.parentNode.insertBefore(js, e);
-  SentryScriptLoader(
-    "Sentry",
-    `https://browser.sentry-cdn.com/6.12.0/rewriteframes.min.js`,
-    `sha384-WOm9k3kzVt1COFAB/zCXOFx4lDMtJh/2vmEizIwgog7OW0P/dPwl3s8f6MdwrD7q`
-  );
 };
 
 export { SentryScriptLoader, convertObjectToArray };