From dabfe7907df798099c64aa079d0ffb649708ed6f Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Wed, 14 Apr 2021 23:42:51 +0200
Subject: [PATCH] Remove last remnants of old analytics code (#110)

---
 package-lock.json                   |  5 -----
 package.json                        |  1 -
 src/app/app.component.ts            | 14 ++------------
 src/app/app.module.ts               |  7 -------
 src/app/services/services.module.ts |  3 ---
 5 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f0afc466..c32db3ed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1239,11 +1239,6 @@
       "resolved": "https://registry.npmjs.org/angular2-toaster/-/angular2-toaster-8.0.0.tgz",
       "integrity": "sha512-MRDswCmhqFLBiot7C7SIq96NyU5aT9pwIVdYgmYJtXHp7N6fXk6QzuMSMhVvK12edUJntgmUft+SZfh45Oq0Wg=="
     },
-    "angulartics2": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-9.1.0.tgz",
-      "integrity": "sha512-RAfHJSHyeRe834e5qCYLtp7fdFuKnz/myFTSVEUZV6nLp4cUotvX8XQhewUEpFv6gkrzJwcuY32JZxstDlNiXQ=="
-    },
     "ansi-align": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz",
diff --git a/package.json b/package.json
index 24343df8..2c0628b8 100644
--- a/package.json
+++ b/package.json
@@ -196,7 +196,6 @@
     "@angular/upgrade": "9.1.12",
     "@microsoft/microsoft-graph-client": "1.2.0",
     "angular2-toaster": "8.0.0",
-    "angulartics2": "9.1.0",
     "big-integer": "1.6.48",
     "bootstrap": "4.3.1",
     "browser-hrtime": "^1.1.8",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 97421627..803584d2 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,8 +5,6 @@ import {
     ToasterContainerComponent,
     ToasterService,
 } from 'angular2-toaster';
-import { Angulartics2 } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 
 import {
     Component,
@@ -60,10 +58,9 @@ export class AppComponent implements OnInit {
     private lastActivity: number = null;
     private modal: ModalComponent = null;
 
-    constructor(private angulartics2GoogleAnalytics: Angulartics2GoogleAnalytics,
-        private broadcasterService: BroadcasterService, private userService: UserService,
+    constructor(private broadcasterService: BroadcasterService, private userService: UserService,
         private tokenService: TokenService, private storageService: StorageService,
-        private authService: AuthService, private router: Router, private analytics: Angulartics2,
+        private authService: AuthService, private router: Router,
         private toasterService: ToasterService, private i18nService: I18nService,
         private sanitizer: DomSanitizer, private ngZone: NgZone,
         private componentFactoryResolver: ComponentFactoryResolver, private messagingService: MessagingService,
@@ -127,12 +124,6 @@ export class AppComponent implements OnInit {
                     case 'showToast':
                         this.showToast(message);
                         break;
-                    case 'analyticsEventTrack':
-                        this.analytics.eventTrack.next({
-                            action: message.action,
-                            properties: { label: message.label },
-                        });
-                        break;
                     case 'ssoCallback':
                         this.router.navigate(['sso'], { queryParams: { code: message.code, state: message.state } });
                         break;
@@ -155,7 +146,6 @@ export class AppComponent implements OnInit {
         ]);
 
         this.authService.logOut(async () => {
-            this.analytics.eventTrack.next({ action: 'Logged Out' });
             if (expired) {
                 this.toasterService.popAsync('warning', this.i18nService.t('loggedOut'),
                     this.i18nService.t('loginExpired'));
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 30fccc20..374b0997 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -2,8 +2,6 @@ import 'core-js';
 import 'zone.js/dist/zone';
 
 import { ToasterModule } from 'angular2-toaster';
-import { Angulartics2Module } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 
 import { AppRoutingModule } from './app-routing.module';
 import { ServicesModule } from './services/services.module';
@@ -48,11 +46,6 @@ import { SearchCiphersPipe } from 'jslib/angular/pipes/search-ciphers.pipe';
         FormsModule,
         AppRoutingModule,
         ServicesModule,
-        Angulartics2Module.forRoot({
-            pageTracking: {
-                clearQueryParams: true,
-            },
-        }),
         ToasterModule.forRoot(),
     ],
     declarations: [
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 46859f3b..5b2367e0 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -21,8 +21,6 @@ import { SyncService } from '../../services/sync.service';
 import { BroadcasterService } from 'jslib/angular/services/broadcaster.service';
 import { ValidationService } from 'jslib/angular/services/validation.service';
 
-import { Analytics } from 'jslib/misc/analytics';
-
 import { ApiService } from 'jslib/services/api.service';
 import { AppIdService } from 'jslib/services/appId.service';
 import { AuthService } from 'jslib/services/auth.service';
@@ -81,7 +79,6 @@ const syncService = new SyncService(configurationService, logService, cryptoFunc
 const passwordGenerationService = new PasswordGenerationService(cryptoService, storageService, null);
 const policyService = new PolicyService(userService, storageService);
 
-const analytics = new Analytics(window, () => true, platformUtilsService, storageService, appIdService);
 containerService.attachToWindow(window);
 
 export function initFactory(): Function {