add search messager class and allow calling of refreshToken

src/background.js

@@ -40,6 +40,7 @@ import tabInfo from './classes/TabInfo';
 import metrics from './classes/Metrics';
 import account from './classes/Account';
 import promoModals from './classes/PromoModals';
+import searchMessager from './classes/SearchMessager';
 // utilities
 import { allowAllwaysC2P } from './utils/click2play';
 import * as common from './utils/common';
@@ -1648,6 +1649,15 @@ function initializeGhosteryModules() {
 	});
 }
 
+/**
+ * Initialize Search Messaging.
+ * @memberOf Background
+ */
+function initializeSearchMessaging() {
+	const sm = new searchMessager();
+	sm.init()
+}
+
 /**
  * Application Initializer
  * Called whenever the browser starts or the extension is
@@ -1659,6 +1669,7 @@ function init() {
 		initializePopup();
 		initializeEventListeners();
 		initializeVersioning();
+		initializeSearchMessaging();
 		return metrics.init(globals.JUST_INSTALLED).then(() => initializeGhosteryModules().then(() => {
 			account.migrate()
 				.then(() => {

src/classes/Account.js

@@ -142,6 +142,8 @@ class Account {
 		})
 	)
 
+	refreshToken = () => api.refreshToken()
+
 	// @TODO a 404 here should trigger a logout
 	getUser = () => (
 		this._getUserID()

src/classes/SearchMessager.js

@@ -0,0 +1,51 @@
+/**
+ * Search Messager
+ *
+ * Ghostery Browser Extension
+ * https://www.ghostery.com/
+ *
+ * Copyright 2019 Ghostery, Inc. All rights reserved.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0
+ */
+
+import ExtMessenger from './ExtMessenger';
+import account from './Account';
+import { log } from '../utils/common';
+
+/**
+ * Class for handling cross-extension messaging.
+ * @memberOf  BackgroundClasses
+ */
+export default class SearchMessager {
+	constructor() {
+		this.extensionId = 'search@ghostery.com';
+		this._messageHandler = this._messageHandler.bind(this);
+	}
+
+	init() {
+		ExtMessenger.addListener(this._messageHandler);
+	}
+
+	unload() {
+		ExtMessenger.removeListener(this._messageHandler);
+	}
+
+	_messageHandler(message, sender, sendResponse) {
+		if (sender.id !== this.extensionId) {
+			return;
+		}
+
+		// allow search extension to refresh token
+		if (message === "refreshToken") {
+			account.refreshToken()
+				.then(() => sendResponse({ success: true }))
+				.catch(error => sendResponse({ success: false, error }));
+			return true
+		} else {
+			log('SearchMessager error: Unhandled message', message);
+		}
+	}
+}

src/utils/api.js

@@ -27,6 +27,10 @@ class Api {
 		}
 	}
 
+	refreshToken() {
+		return this._refreshToken().then(this.isRefreshing = false);
+	}
+
 	_refreshToken() {
 		if (this.isRefreshing) {
 			let bindedResolve;