move api js from panel to background

app/panel/actions/PanelActions.js

@@ -210,8 +210,9 @@ export function userLogin(email, password) {
 							});
 						});
 				}
-				return sendMessageInPromise('getLoginCookie')
-					.then((user_id) => {
+				return sendMessageInPromise('fetchUser')
+					.then((user) => {
+						console.log('fetchUser', user);
 						dispatch({
 							type: LOGIN_SUCCESS
 						});
@@ -222,7 +223,7 @@ export function userLogin(email, password) {
 								classes: 'success',
 							},
 						});
-						return user_id;
+						return user;
 					})
 					.catch((error) => {
 						// server error
@@ -248,58 +249,6 @@ export function userLogin(email, password) {
 					},
 				});
 			});
-	// 	return doXHR('POST', `${API_ROOT_URL}/api/v2/login`, JSON.stringify(query)).then((response) => {
-	// 		if (response) {
-	// 			sendMessageInPromise('setLoginInfo', {
-	// 				user_token: response.Token,
-	// 				decoded_user_token: decodedToken.payload,
-	// 			}).then((data) => {
-	// 				dispatch({
-	// 					type: LOGIN_SUCCESS,
-	// 					data: decodedToken.payload,
-	// 				});
-	// 				dispatch({
-	// 					type: SHOW_NOTIFICATION,
-	// 					data: {
-	// 						text: `${t('panel_signin_success')} ${query.EmailAddress}`,
-	// 						classes: 'success',
-	// 					},
-	// 				});
-	// 			}).catch((err) => {
-	// 				log('PanelActions userLogin returned with an error', err);
-	// 				dispatch({ type: LOGIN_FAILED });
-	// 				dispatch({
-	// 					type: SHOW_NOTIFICATION,
-	// 					data: {
-	// 						text: `${t('panel_signin_success')} ${query.EmailAddress}`,
-	// 						classes: 'alert',
-	// 					},
-	// 				});
-	// 			});
-	// 		} else {
-	// 			// XHR was successful but we did not get a token back
-	// 			log('PanelActions userLogin callback error', response);
-	// 			dispatch({ type: LOGIN_FAILED });
-	// 			dispatch({
-	// 				type: SHOW_NOTIFICATION,
-	// 				data: {
-	// 					text: t('banner_no_such_account_message'),
-	// 					classes: 'alert',
-	// 				},
-	// 			});
-	// 		}
-	// 	}).catch((error) => {
-	// 		// server error
-	// 		log('PanelActions userLogin server error', error);
-	// 		dispatch({ type: LOGIN_FAILED });
-	// 		dispatch({
-	// 			type: SHOW_NOTIFICATION,
-	// 			data: {
-	// 				text: t('server_error_message'),
-	// 				classes: 'alert',
-	// 			},
-	// 		});
-	// 	});
 	};
 }
 

app/panel/components/Login.jsx

@@ -89,11 +89,7 @@ class Login extends React.Component {
 		}
 
 		this.props.actions.userLogin(email, password)
-			.then((user_id) => {
-				if (user_id) {
-					this.props.actions.fetchUser(user_id);
-				}
-			});
+		.catch(e => log(e));
 	}
 	/**
 	 * Intercept Return key and call showSigninResult.

src/background.js

@@ -703,41 +703,34 @@ function onMessageHandler(request, sender, callback) {
 			}
 		});
 		return true;
-	} else if (name === 'setConfUserSettings') {
-		accounts.setConfUserSettings(message.settingsJson);
+	} else if (name === 'pullUserSettings') {
+		console.log('background pullUserSettings: ', message);
+		accounts.pullUserSettings(message);
 		return true;
 	} else if (name === 'getTrackerDescription') {
 		utils.getJson(message.url).then((result) => {
 			const description = (result) ? ((result.company_in_their_own_words) ? result.company_in_their_own_words : ((result.company_description) ? result.company_description : '')) : '';
 			callback(description);
 		});
 		return true;
-	} else if (name === 'getLoginInfo') {
-		accounts.getLoginInfo().then((result) => {
-			// this sends the loginInfo directly to panelView. TODO: use model change event instead
-			utils.sendMessageToPanel('onLoginInfoUpdated', result);
-			// this sends the loginInfo back to the collection
-			callback(result);
-		}).catch((err) => {
-			callback();
-			log('GET LOGIN INFO ERROR:', err);
-		});
-		return true;
-	} else if (name === 'getLoginCookie') {
-		// Note: if you want to trigger a logout, send message as empty {}
-		accounts.getLoginCookie().then((result) => {
-			callback(result);
-		}).catch((err) => {
-			callback();
-			log('GET LOGIN COOKIE ERROR');
+	} else if (name === 'userLogin') {
+		accounts.userLogin(message)
+		.then((response) => {
+			callback(response);
+		})
+		.catch((err) => {
+			callback(err);
+			log('LOGIN ERROR');
 		});
 		return true;
-	} else if (name === 'setLoginInfo') {
-		accounts.setLoginInfo(message).then((result) => {
-			callback(result);
-		}).catch((err) => {
-			callback();
-			log('SET LOGIN INFO ERROR');
+	} else if (name === 'fetchUser') {
+		accounts.fetchUser(message)
+		.then((user) => {
+			callback(user);
+		})
+		.catch((err) => {
+			callback(err);
+			log('FETCH USER ERROR');
 		});
 		return true;
 	} else if (name === 'update_database') {

src/utils/accounts.js

@@ -23,9 +23,12 @@
 /* eslint no-param-reassign: 0 */
 
 import _ from 'underscore';
+import normalize from 'json-api-normalizer';
+import build from 'redux-object';
 import globals from '../classes/Globals';
 import conf from '../classes/Conf';
 import { log, decodeJwt } from './common';
+import { Config, get, save } from './api';
 import { getJson, postJson, sendMessageToPanel } from './utils';
 
 const IS_EDGE = (globals.BROWSER_INFO.name === 'edge');
@@ -38,11 +41,6 @@ const API_ROOT_URL = 'https://localhost:8080';
 const VERIFICATION_URL = `https://signon.${GHOSTERY_DOMAIN}.com/register/verify/`; // can't set culture because site needs to append guid
 const REDIRECT_URL = `https://account.${GHOSTERY_DOMAIN}.com/`;
 const SIGNON_URL = `https://signon.${GHOSTERY_DOMAIN}.com/`; // culture query param not needed, only for cookie
-const AUTH_COOKIE = 'AUTH';
-// milliseconds. Refresh call will be made REFRESH_OFFSET seconds in advance of Account expiration.
-const REFRESH_OFFSET = 60000;
-const LOGOUT_TIMEOUT = 604800000; // one week in millisec
-const GROUND_ZERO_TIME = (new Date(0)).getTime();
 const SYNC_SET = new Set(globals.SYNC_ARRAY);
 
 /**
@@ -75,6 +73,49 @@ export function setLoginInfo(user) {
 	return Promise.resolve(conf.login_info);
 }
 
+export function userLogin(credentials) {
+	return fetch(`${Config.auth_server.host}/api/v2/login`, {
+		method: 'POST',
+		body: credentials,
+		headers: {
+			'Content-Type': 'application/x-www-form-urlencoded',
+			'Content-Length': Buffer.byteLength(credentials),
+		},
+		credentials: 'include',
+	})
+	.then((response) => {
+		console.log('fetch response', response);
+		return Promise.resolve(response);
+	})
+	.catch(e => Promise.reject(e));
+}
+
+export function fetchUser() {
+	let userId;
+	return getLoginCookie()
+	.then(cookie => {
+		userId = cookie;
+		console.log('fetchUser userId', userId);
+		return get('users', userId);
+	})
+	.then(response => {
+		const user = build(normalize(response), 'users', userId);
+		user.loggedIn = true;
+		return setLoginInfo(user)
+	})
+	.then(loginInfo => {
+		console.log('fetchUser loginInfo', loginInfo);
+		return Promise.resolve(loginInfo);
+	})
+	.catch(err => {
+		return Promise.reject(err);
+	});
+}
+
+export function pullUserSettings() {
+
+}
+
 export function getLoginCookie() {
 	return new Promise((resolve, reject) => {
 		chrome.cookies.get({
@@ -155,13 +196,6 @@ function _logOut() {
  * @return {Promise} 	user settings json or error
  */
 export function setConfUserSettings(settings) {
-	// TODO settings are in settings.settingsJson
-	// need to set those to `settings`
-	try {
-		settings = settings ? JSON.parse(settings) : {};
-	} catch (e) {
-		return Promise.reject('Corrupted settings');
-	}
 	log('SET USER SETTINGS', settings);
 	if (IS_EDGE) {
 		settings.enable_human_web = false;

src/utils/api.js

@@ -0,0 +1,156 @@
+import globals from '../classes/Globals';
+
+// TODO make this not global vars
+let isRefreshing = false;
+const tokenRefreshedEventType = 'tokenRefreshed';
+
+const _getJSONAPIErrorsObject = e => ([{ title: 'Something went wrong.', detail: e.toString() }]);
+
+const _refreshToken = function () {
+	if (isRefreshing) {
+		let bindedResolve;
+		const _processRefreshTokenEvent = (resolve, e) => {
+			window.removeEventListener(tokenRefreshedEventType, bindedResolve, false);
+			resolve(e.detail);
+		};
+		return new Promise((resolve, reject) => {
+			bindedResolve = _processRefreshTokenEvent.bind(null, resolve);
+			window.addEventListener(tokenRefreshedEventType, bindedResolve, false);
+		});
+	}
+
+	isRefreshing = true;
+	return fetch(`${Config.auth_server.host}/api/v2/refresh_token`, { // eslint-disable-line no-undef
+		method: 'POST',
+		credentials: 'include',
+	});
+};
+
+const getCsrfCookie = () => new Promise((resolve, reject) => {
+	chrome.cookies.get({
+		url: `https://${globals.GHOSTERY_DOMAIN}.com`, // ghostery.com || ghosterystage.com
+		name: 'csrf_token',
+	}, (cookie) => {
+		if (cookie) {
+			resolve(cookie);
+			return;
+		}
+		reject();
+	});
+});
+
+const _sendReq = (method, path, body) => getCsrfCookie()
+	.then(cookie => fetch(`${Config.account_server.host}${path}`, { // eslint-disable-line no-undef
+		method,
+		headers: {
+			'Content-Type': 'application/vnd.api+json',
+			'Content-Length': Buffer.byteLength(JSON.stringify(body)),
+			'X-CSRF-Token': cookie.value,
+		},
+		body: JSON.stringify(body),
+		credentials: 'include',
+	}));
+
+const _processResponse = res => (
+	new Promise((resolve, reject) => {
+		const { status } = res;
+		if (status === 204) {
+			resolve();
+			return;
+		}
+		res.json().then((data) => {
+			if (status >= 400) {
+				reject(data);
+			} else {
+				resolve(data);
+			}
+		});
+	})
+);
+
+const _sendAuthenticatedRequest = (method, path, body) => (
+	new Promise((resolve, reject) => {
+		_sendReq(method, path, body)
+			.then(_processResponse)
+			.then((data) => {
+				resolve(data);
+			})
+			.catch((data) => {
+				let shouldRefresh = false;
+				if (data && data.errors) {
+					data.errors.forEach((e) => {
+						if (e.code === '10021' || e.code === '10022') { // token is expired or missing
+							shouldRefresh = true;
+						}
+					});
+				}
+				if (shouldRefresh) {
+					_refreshToken()
+						.then((res) => {
+							isRefreshing = false;
+							window.dispatchEvent(new CustomEvent(tokenRefreshedEventType, {
+								detail: res,
+							}));
+							const { status } = res;
+							if (status >= 400) {
+								res.json().then((data2) => {
+									reject(data2.errors);
+								}).catch((err) => {
+									reject(_getJSONAPIErrorsObject(err));
+								});
+								return;
+							}
+							_sendReq(method, path, body)
+								.then(_processResponse)
+								.then((data3) => {
+									resolve(data3);
+								})
+								.catch((err) => {
+									reject(_getJSONAPIErrorsObject(err));
+								});
+						});
+				} else {
+					reject(_getJSONAPIErrorsObject(data));
+				}
+			});
+	})
+);
+
+export const get = function (type, id, include = '') {
+	if (!id) { return Promise.reject(new Error('id is missing')); }
+	return _sendAuthenticatedRequest('GET', `/api/v2/${type}/${id}?include=${include}`);
+};
+
+export const save = function (type, data) {
+	return _sendAuthenticatedRequest('POST', `/api/v2/${type}/`, data);
+};
+
+export const update = function (type, data) {
+	// TODO check for data.id and fail
+	return _sendAuthenticatedRequest('PATCH', `/api/v2/${type}/${data.id}`, { data });
+};
+
+export const remove = function (type, id) {
+	return _sendAuthenticatedRequest('DELETE', `/api/v2/${type}/${id}`);
+};
+
+export const Config = {
+	auth_server: {
+		host: `https://consumerapi.${globals.GHOSTERY_DOMAIN}.com`
+	},
+	account_server: {
+		host: `https://accountapi.${globals.GHOSTERY_DOMAIN}.com`
+	},
+};
+
+// @TODO move to accounts.js
+// export const logout = function () {
+// 	return getCsrfCookie()
+// 		.then(cookie => fetch(`${Config.auth_server.host}/api/v2/logout`, { // eslint-disable-line no-undef
+// 			method: 'POST',
+// 			credentials: 'include',
+// 			headers: {
+// 				'X-CSRF-Token': cookie.value,
+// 			},
+// 		}));
+// };