Move getProviderFromUrl and trackOAuthCompletion to analytics-providers

Signed-off-by: Alexander Platov <[email protected]>

Author: SasLord

packages/analytics-providers/src/utils.ts

@@ -16,10 +16,21 @@
 import { UAParser } from 'ua-parser-js'
 import { getMetadata } from '@hcengineering/platform'
 import presentation from '@hcengineering/presentation'
-import { desktopPlatform } from '@hcengineering/ui'
+import { desktopPlatform, getCurrentLocation } from '@hcengineering/ui'
+import { Analytics } from '@hcengineering/analytics'
 
 const parser = UAParser()
 
+let _isSignUp: boolean = false
+export const signupStore = {
+  setSignUpFlow: (isSignUp: boolean) => {
+    _isSignUp = isSignUp
+  },
+  getSignUpFlow: () => {
+    return _isSignUp
+  }
+}
+
 function getUrlTrackingParams (): Record<string, string | null> {
   const params = new URLSearchParams(window.location.search)
   return {
@@ -102,3 +113,32 @@ export function collectEventMetadata (properties: Record<string, any> = {}): Rec
     ...trackingParams
   }
 }
+
+function getProviderFromUrl (): string | null {
+  const location = getCurrentLocation()
+  const referrer = document.referrer
+
+  if (referrer.includes('accounts.google.com')) {
+    return 'google'
+  } else if (referrer.includes('github.com')) {
+    return 'github'
+  } else if (location.query?.provider != null && location.query.provider !== '') {
+    return location.query.provider
+  }
+
+  return null
+}
+
+export function trackOAuthCompletion (result: any): void {
+  const provider = getProviderFromUrl()
+  if (provider == null) return
+
+  const isSignUp = signupStore.getSignUpFlow()
+  const success = result != null
+
+  const eventPrefix = isSignUp ? 'signup' : 'login'
+  const eventSuffix = success ? 'completed' : 'error'
+  const eventName: string = `${eventPrefix}.${provider}.${eventSuffix}`
+
+  Analytics.handleEvent(eventName)
+}

packages/analytics/src/index.ts

@@ -4,16 +4,6 @@
 
 import { addEventListener, PlatformEvent, Severity, Status, translate } from '@hcengineering/platform'
 
-let _isSignUp: boolean = false
-export const signupStore = {
-  setSignUpFlow: (isSignUp: boolean) => {
-    _isSignUp = isSignUp
-  },
-  getSignUpFlow: () => {
-    return _isSignUp
-  }
-}
-
 export const providers: AnalyticProvider[] = []
 export interface AnalyticProvider {
   init: (config: Record<string, any>) => boolean
@@ -86,19 +76,6 @@ export const Analytics = {
   }
 }
 
-export function trackOAuthCompletion (result: any, provider?: string | null): void {
-  if (provider == null) return
-
-  const isSignUp = signupStore.getSignUpFlow()
-  const success = result != null
-
-  const eventPrefix = isSignUp ? 'signup' : 'login'
-  const eventSuffix = success ? 'completed' : 'error'
-  const eventName: string = `${eventPrefix}.${provider}.${eventSuffix}`
-
-  Analytics.handleEvent(eventName)
-}
-
 addEventListener(PlatformEvent, async (_event, _status: Status) => {
   if (_status.severity === Severity.ERROR) {
     const label = await translate(_status.code, _status.params, 'en')

plugins/login-resources/package.json

@@ -49,6 +49,7 @@
     "@hcengineering/setting": "^0.6.17",
     "@hcengineering/theme": "^0.6.5",
     "@hcengineering/analytics": "^0.6.0",
-    "@hcengineering/account-client": "^0.6.0"
+    "@hcengineering/account-client": "^0.6.0",
+    "@hcengineering/analytics-providers": "^0.6.0"
   }
 }

plugins/login-resources/src/components/Auth.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
-  import { Loading, getCurrentLocation } from '@hcengineering/ui'
+  import { Loading } from '@hcengineering/ui'
   import { logIn } from '@hcengineering/workbench'
-  import { trackOAuthCompletion } from '@hcengineering/analytics'
+  import { trackOAuthCompletion } from '@hcengineering/analytics-providers'
   import { onMount } from 'svelte'
 
   import {
@@ -13,21 +13,6 @@
     navigateToWorkspace
   } from '../utils'
 
-  function getProviderFromUrl (): string | null {
-    const location = getCurrentLocation()
-    const referrer = document.referrer
-
-    if (referrer.includes('accounts.google.com')) {
-      return 'google'
-    } else if (referrer.includes('github.com')) {
-      return 'github'
-    } else if (location.query?.provider != null && location.query.provider !== '') {
-      return location.query.provider
-    }
-
-    return null
-  }
-
   onMount(async () => {
     const autoJoinInfo = getAutoJoinInfo()
     if (autoJoinInfo != null) {
@@ -36,9 +21,8 @@
     }
 
     const result = await getLoginInfoFromQuery()
-    const provider = getProviderFromUrl()
 
-    trackOAuthCompletion(result, provider)
+    trackOAuthCompletion(result)
 
     if (result != null) {
       await logIn(result)

plugins/login-resources/src/components/Join.svelte

@@ -19,7 +19,8 @@
   import { checkJoined, join, setLoginInfo, signUpJoin } from '../utils'
   import Form from './Form.svelte'
 
-  import { Analytics, signupStore } from '@hcengineering/analytics'
+  import { Analytics } from '@hcengineering/analytics'
+  import { signupStore } from '@hcengineering/analytics-providers'
   import { logIn, workbenchId } from '@hcengineering/workbench'
   import { onMount } from 'svelte'
   import { loginAction, recoveryAction } from '../actions'

plugins/login-resources/src/components/LoginForm.svelte

@@ -15,7 +15,7 @@
 -->
 <script lang="ts">
   import { type IntlString, Severity, Status } from '@hcengineering/platform'
-  import { signupStore } from '@hcengineering/analytics'
+  import { signupStore } from '@hcengineering/analytics-providers'
   import { onMount } from 'svelte'
 
   import { type BottomAction, doLoginAsGuest, doLoginNavigate, LoginMethods } from '../index'

plugins/login-resources/src/components/SignupForm.svelte

@@ -16,7 +16,7 @@
 <script lang="ts">
   import { OK, Severity, Status } from '@hcengineering/platform'
   import { logIn } from '@hcengineering/workbench'
-  import { signupStore } from '@hcengineering/analytics'
+  import { signupStore } from '@hcengineering/analytics-providers'
 
   import BottomActionComponent from './BottomAction.svelte'
   import login from '../plugin'