Merge pull request #5 from managed-components/ZRZ-1078

Zrz 1078

src/conversionLinker.ts

@@ -1,7 +1,6 @@
 import { ComponentSettings, MCEvent } from '@managed-components/types'
 
-export const conversionLinkerHandler = async (
-  eventType: string,
+export const conversionLinkerHandler = (
   event: MCEvent,
   settings: ComponentSettings
 ) => {

src/index.ts

@@ -69,6 +69,14 @@ export const eventHandler = async (
   // bg: "ffffff",
   // u_nplug: 3
   // u_nmime: 4
+
+  if (settings.conversionLinker) {
+    // only handle conversion linker if gclid query param exists
+    if (client.url.searchParams.get('gclid')) {
+      conversionLinkerHandler(event, settings)
+    }
+  }
+
   if (client.url.searchParams.get('_gl')) {
     try {
       const gclaw = atob(
@@ -86,12 +94,14 @@ export const eventHandler = async (
       console.error(e)
     }
   }
+  if (eventType === 'pageview') {
+    return
+  }
+
   if (client.get('_gcl_aw')) {
     query.gclaw = client.get('_gcl_aw')?.split('.').pop()
   }
-  if (client.get('gclid')) {
-    query.gclaw = client.get('gclid')
-  }
+
   if (query.gclaw) {
     const url = new URL(query.url)
     url.searchParams.append('gclid', query.gclaw)
@@ -106,10 +116,12 @@ export const eventHandler = async (
 
   const params = new URLSearchParams({ ...query, ...payload }).toString()
 
-  const baseURL =
-    eventType === 'remarketing'
-      ? 'https://www.google.com/pagead/1p-user-list'
-      : 'https://www.googleadservices.com/pagead/conversion'
+  let baseURL = ''
+  if (eventType === 'remarketing') {
+    baseURL = 'https://www.google.com/pagead/1p-user-list'
+  } else {
+    baseURL = 'https://www.googleadservices.com/pagead/conversion'
+  }
   neededFetch.push(`${baseURL}/${conversionId}/?${params}`)
 
   neededFetch.push(
@@ -123,13 +135,12 @@ export const eventHandler = async (
       keepalive: true,
     })
   })
-
-  if (settings.conversionLinker) {
-    await conversionLinkerHandler(eventType, event, settings)
-  }
 }
 
 export default async function (manager: Manager, settings: ComponentSettings) {
+  manager.addEventListener('pageview', event => {
+    eventHandler('pageview', event, settings)
+  })
   manager.addEventListener('conversion', event => {
     eventHandler('conversion', event, settings)
   })