Fix analytics

src/lib/analytics.ts

@@ -1,10 +1,11 @@
-import { useCallback, useRef } from 'react'
+import { useCallback, useEffect, useMemo } from 'react'
 import Analytics from '@aws-amplify/analytics'
 import Auth from '@aws-amplify/auth'
-import { usePreferences } from './preferences'
+import { usePreferences, useFirstUser } from './preferences'
 import { DbStore } from './db'
 import { useEffectOnce } from 'react-use'
 import { osName } from './platform'
+import isElectron from 'is-electron'
 
 const amplifyConfig = {
   Auth: {
@@ -20,38 +21,47 @@ const analyticsConfig = {
     mandatorySignIn: false,
   },
 }
+Auth.configure(amplifyConfig)
+Analytics.configure(analyticsConfig)
+
+function reportViaPinpoint(name: string, attributes?: any) {
+  if (process.env.NODE_ENV === 'production') {
+    Analytics.record({ name, attributes })
+  }
+}
 
 export function useAnalytics() {
-  const configured = useRef(false)
   const { preferences } = usePreferences()
   const analyticsEnabled = preferences['general.enableAnalytics']
-  const user = preferences['general.accounts'][0]
+  const user = useFirstUser()
 
   useEffectOnce(() => {
-    Auth.configure(amplifyConfig)
-    Analytics.configure(analyticsConfig)
-    configured.current = true
-    const initilalized = (window as any).initilalized
-    if (!initilalized) {
-      ;(window as any).initilalized = true
-      Analytics.record('init')
-    }
-    Analytics.updateEndpoint({
+    reportViaPinpoint('init')
+  })
+
+  const userId = useMemo(() => {
+    return user != null ? user.id.toString() : null
+  }, [user])
+
+  useEffect(() => {
+    const endpointConfig: any = {
       attributes: {
-        userId: user == null ? [] : [user.id.toString()],
         target: [osName],
+        target2: [`${isElectron() ? 'electron' : 'web'}:${osName}`],
       },
-    })
-  })
+    }
+
+    if (userId != null) {
+      endpointConfig.userId = userId
+      endpointConfig.attributes.userId = [userId]
+    }
+    Analytics.updateEndpoint(endpointConfig)
+  }, [userId])
 
   const report = useCallback(
-    (name: string, attributes?: { [key: string]: string }) => {
+    (name: string, attributes?: any) => {
       if (analyticsEnabled) {
-        if (attributes == null) {
-          Analytics.record({ name: name })
-        } else {
-          Analytics.record({ name, attributes })
-        }
+        reportViaPinpoint(name, attributes)
       }
     },
     [analyticsEnabled]

src/mobile/lib/analytics.ts

@@ -1,7 +1,7 @@
-import { useCallback, useRef } from 'react'
+import { useCallback, useMemo, useEffect } from 'react'
 import Analytics from '@aws-amplify/analytics'
 import Auth from '@aws-amplify/auth'
-import { usePreferences } from '../../lib/preferences'
+import { usePreferences, useFirstUser } from '../../lib/preferences'
 import { DbStore } from '../../lib/db'
 import { useEffectOnce } from 'react-use'
 
@@ -20,37 +20,46 @@ const analyticsConfig = {
   },
 }
 
+Auth.configure(amplifyConfig)
+Analytics.configure(analyticsConfig)
+
+function reportViaPinpoint(name: string, attributes?: any) {
+  if (process.env.NODE_ENV === 'production') {
+    Analytics.record({ name, attributes })
+  }
+}
+
 export function useAnalytics() {
-  const configured = useRef(false)
   const { preferences } = usePreferences()
   const analyticsEnabled = preferences['general.enableAnalytics']
-  const user = preferences['general.accounts'][0]
+  const user = useFirstUser()
 
   useEffectOnce(() => {
-    Auth.configure(amplifyConfig)
-    Analytics.configure(analyticsConfig)
-    configured.current = true
-    const initilalized = (window as any).initilalized
-    if (!initilalized) {
-      ;(window as any).initilalized = true
-      Analytics.record('init')
-    }
-    Analytics.updateEndpoint({
+    reportViaPinpoint('init')
+  })
+
+  const userId = useMemo(() => {
+    return user != null ? user.id.toString() : null
+  }, [user])
+
+  useEffect(() => {
+    const endpointConfig: any = {
       attributes: {
-        userId: user == null ? [] : [user.id.toString()],
         target: [process.env.TARGET == null ? 'dev' : process.env.TARGET],
       },
-    })
-  })
+    }
+
+    if (userId == null) {
+      endpointConfig.userId = userId
+      endpointConfig.attributes.userId = [userId]
+    }
+    Analytics.updateEndpoint(endpointConfig)
+  }, [userId])
 
   const report = useCallback(
-    (name: string, attributes?: { [key: string]: string }) => {
+    (name: string, attributes?: any) => {
       if (analyticsEnabled) {
-        if (attributes == null) {
-          Analytics.record({ name: name })
-        } else {
-          Analytics.record({ name, attributes })
-        }
+        reportViaPinpoint(name, attributes)
       }
     },
     [analyticsEnabled]