Add accountEvents array to Ghostery Debug for logging login/out events

src/background.js

@@ -1687,9 +1687,11 @@ function init() {
 		initializeEventListeners();
 		initializeVersioning();
 		return metrics.init(globals.JUST_INSTALLED).then(() => initializeGhosteryModules().then(() => {
+			ghosteryDebug.addAccountEvent('migrate', 'migrate start');
 			account.migrate()
 				.then(() => {
 					if (conf.account !== null) {
+						ghosteryDebug.addAccountEvent('app started', 'signed in', conf.account);
 						return account.getUser()
 							.then(account.getUserSettings)
 							.then(() => {
@@ -1699,6 +1701,7 @@ function init() {
 								return false;
 							});
 					}
+					ghosteryDebug.addAccountEvent('app started', 'not signed in');
 					if (globals.JUST_INSTALLED) {
 						setGhosteryDefaultBlocking();
 					}

src/classes/Account.js

@@ -22,6 +22,7 @@ import conf from './Conf';
 import dispatcher from './Dispatcher';
 import { log } from '../utils/common';
 import Api from '../utils/api';
+import ghosteryDebug from './GhosteryDebug';
 
 const api = new Api();
 const {
@@ -83,6 +84,7 @@ class Account {
 			if (res.status >= 400) {
 				return res.json();
 			}
+			ghosteryDebug.addAccountEvent('login', 'cookie set by fetch POST');
 			this._getUserIDFromCookie().then((userID) => {
 				this._setAccountInfo(userID);
 				this.getUserSubscriptionData();
@@ -103,6 +105,7 @@ class Account {
 			credentials: 'include',
 		}).then((res) => {
 			if (res.status >= 400) {
+				ghosteryDebug.addAccountEvent('register', 'cookie set by fetch POST');
 				return res.json();
 			}
 			this._getUserIDFromCookie().then((userID) => {
@@ -124,7 +127,10 @@ class Account {
 					credentials: 'include',
 					headers: { 'X-CSRF-Token': cookie.value },
 				}).then((res) => {
-					if (res.status < 400) { return resolve(); }
+					if (res.status < 400) {
+						ghosteryDebug.addAccountEvent('logout', 'cookie set by fetch POST');
+						return resolve();
+					}
 					return res.json().then(json => reject(json));
 				}).catch(err => reject(err));
 			});
@@ -257,26 +263,30 @@ class Account {
 			const legacyLoginInfoKey = 'login_info';
 			chrome.storage.local.get(legacyLoginInfoKey, (items) => {
 				if (chrome.runtime.lastError) {
+					ghosteryDebug.addAccountEvent('migrate', 'runtime error');
 					resolve(new Error(chrome.runtime.lastError));
 					return;
 				}
 
 				const { login_info } = items;
 				if (!items || !login_info) {
+					ghosteryDebug.addAccountEvent('migrate', 'no items found');
 					resolve();
 					return;
 				}
 
 				// ensure we have all the necessary info
 				const { decoded_user_token, user_token } = login_info;
 				if (!decoded_user_token || !user_token) {
+					ghosteryDebug.addAccountEvent('migrate', 'found items, not enough info I');
 					chrome.storage.local.remove(legacyLoginInfoKey, () => resolve());
 					return;
 				}
 				const {
 					UserId, csrf_token, RefreshToken, exp
 				} = decoded_user_token;
 				if (!UserId || !csrf_token || !RefreshToken || !exp) {
+					ghosteryDebug.addAccountEvent('migrate', 'found items, not enough info II');
 					chrome.storage.local.remove(legacyLoginInfoKey, () => resolve());
 					return;
 				}
@@ -311,8 +321,10 @@ class Account {
 					// login
 					this._setAccountInfo(UserId);
 					this.getUserSubscriptionData();
+					ghosteryDebug.addAccountEvent('migrate', 'remove legacy items');
 					chrome.storage.local.remove(legacyLoginInfoKey, () => resolve());
 				}).catch((err) => {
+					ghosteryDebug.addAccountEvent('migrate', 'cookies set error');
 					resolve(err);
 				});
 			});

src/classes/GhosteryDebug.js

@@ -19,8 +19,35 @@ import foundBugs from './FoundBugs';
 /**
  * @class for debugging Ghostery via the background.js console.
  * @memberof BackgroundClasses
+ * ToDo:  Test whether foundApps, foundBugs and tabInfo updates existing tabs,
+ *        adds new tabs, removes existing tabs, etc.
  */
 class GhosteryDebug {
+	constructor() {
+		this.accountEvents = [];
+
+		const _cookieChangeEvent = (changeInfo) => {
+			const { removed, cookie, cause } = changeInfo;
+			const { domain, name } = cookie;
+			if (domain.includes(globals.GHOSTERY_ROOT_DOMAIN)) {
+				const type = `Cookie ${name} ${removed ? 'Removed' : 'Added'}`;
+				this.addAccountEvent(type, cause, cookie);
+			}
+		};
+
+		chrome.cookies.onChanged.addListener(_cookieChangeEvent);
+	}
+
+	addAccountEvent(type, event, details) {
+		const timestamp = new Date();
+		const pushObj = { type, event, timestamp };
+		if (details) {
+			pushObj.details = details;
+		}
+
+		this.accountEvents.push(pushObj);
+	}
+
 	getTabInfo() {
 		function _getActiveTabIds() {
 			return new Promise((resolve, reject) => {