store cookie and user login info

app/panel/actions/PanelActions.js

@@ -11,6 +11,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0
  */
 import 'whatwg-fetch';
+import normalize from 'json-api-normalizer';
+import build from 'redux-object';
 import {
 	GET_PANEL_DATA, GET_SUMMARY_DATA, GET_BLOCKING_DATA,
 	TOGGLE_CLIQZ_FEATURE,
@@ -24,11 +26,12 @@ import {
 } from '../constants/constants';
 import { sendMessageInPromise } from '../utils/msg';
 import { doXHR } from '../utils/utils';
+import { get } from '../utils/api';
 import globals from '../../../src/classes/Globals';
 import { decodeJwt, log } from '../../../src/utils/common';
 
 // const API_ROOT_URL = `https://consumerapi.${globals.GHOSTERY_DOMAIN}.com`;
-const API_ROOT_URL = `http://localhost:8080`;
+const API_ROOT_URL = `http://ghostery.io:8080`;
 
 /**
  * Update Cliqz Features.
@@ -114,17 +117,43 @@ export function toggleExpert() {
 	};
 }
 
+/**
+ * Call accountAPI and get user info. Called from Login
+ * Component. Picked up by Panel reducer.
+ * @param  {Object} query
+ * @return {Object} dispatch
+ */
+
 export function fetchUser(user_id) {
+
+	console.log('fetchUser');
 	console.log(user_id);
+
 	return function (dispatch) {
-		console.log(user_id);
-		// TODO make fetch to /api/v2/users/{user_id}
-		// TODO copy jsonapi from account-web to utils
-		// utils.jsonapi.get('users', user_id)
-		// .then(() => {
-		// // TODO sendMessageInPromise to background to set email (new location somewhere in conf)
-		// });
-	}
+		return get('users', user_id)
+		.then((data) => {
+			// normalize user data with jsonapi
+			const user = build(normalize(data), 'users', user_id);
+			// store user info in background conf
+			return sendMessageInPromise('setLoginInfo', user)
+			.then({
+
+			})
+			.catch(e => {
+
+			});
+		})
+		.catch((errors) => {
+			console.log(errors);
+			dispatch({
+				type: SHOW_NOTIFICATION,
+				data: {
+					text: t('server_error_message'),
+					classes: 'alert',
+				},
+			});
+		});
+	};
 }
 
 /**
@@ -160,7 +189,9 @@ export function userLogin(email, password) {
 					});
 				});
 			}
-			sendMessageInPromise('setLoginInfo').then((user_id) => {
+			return sendMessageInPromise('getLoginCookie')
+			.then((user_id) => {
+				console.log('sendMessageInPromise getLoginCookie', user_id);
 				dispatch({
 					type: LOGIN_SUCCESS,
 					data: { user_id }
@@ -172,6 +203,7 @@ export function userLogin(email, password) {
 						classes: 'success',
 					},
 				});
+				return user_id;
 			})
 			.catch((error) => {
 				// server error
@@ -185,8 +217,8 @@ export function userLogin(email, password) {
 					},
 				});
 			});
-			return;
-		}).catch((err) => {
+		})
+		.catch((err) => {
 			log('PanelActions userLogin server error', err);
 			dispatch({ type: LOGIN_FAILED });
 			dispatch({

app/panel/components/Login.jsx

@@ -90,7 +90,9 @@ class Login extends React.Component {
 
 		this.props.actions.userLogin(email, password)
 		.then((user_id) => {
-			this.props.actions.fetchUser(user_id);
+			if (user_id) {
+				this.props.actions.fetchUser(user_id)
+			}
 		});
 	}
 	/**

app/panel/utils/api.js

@@ -0,0 +1,126 @@
+import 'whatwg-fetch';
+
+// TODO make this not global vars
+let isRefreshing = false;
+const tokenRefreshedEventType = 'tokenRefreshed';
+const Config = {
+	account_server : {
+		host: 'http://ghostery.io:8081'
+	},
+};
+
+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 _sendReq = (method, path, body) => (
+	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': '' // TODO get cookie from conf,
+		},
+		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;
+				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}`);
+};

package.json

@@ -48,6 +48,7 @@
     "d3-scale": "^1.0.6",
     "foundation-sites": "^6.4.4-rc1",
     "history": "^4.7.2",
+    "json-api-normalizer": "^0.4.10",
     "moment": "^2.19.1",
     "react": "^16.0.0",
     "react-dom": "^16.0.0",
@@ -56,6 +57,7 @@
     "react-router-dom": "^4.2.2",
     "react-shadow": "^16.2.0",
     "redux": "^3.7.2",
+    "redux-object": "^0.5.6",
     "redux-thunk": "^2.2.0",
     "spanan": "^2.0.0",
     "ua-parser-js": "^0.7.17",

src/background.js

@@ -723,15 +723,22 @@ function onMessageHandler(request, sender, callback) {
 			log('GET LOGIN INFO ERROR:', err);
 		});
 		return true;
-	} else if (name === 'setLoginInfo') {
+	} else if (name === 'getLoginCookie') {
 		// Note: if you want to trigger a logout, send message as empty {}
-		accounts.setLoginInfo().then((result) => {
+		accounts.getLoginCookie().then((result) => {
 			callback(result);
 		}).catch((err) => {
 			callback();
-			log('SET LOGIN INFO ERROR');
+			log('GET LOGIN COOKIE 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 === 'update_database') {
 		checkLibraryVersion().then((result) => {
 			callback(result);
@@ -841,6 +848,7 @@ function initializeDispatcher() {
 		utils.flushChromeMemoryCache();
 	});
 	dispatcher.on('conf.save.login_info', (loginInfo) => {
+		console.log('conf.save.login_info', loginInfo);
 		if (loginInfo.logged_in) {
 			accounts.pullUserSettings().catch((err) => {
 				log("dispatcher.on('conf.save.login_info): pullUserSettings error:", err);

src/utils/accounts.js

@@ -59,25 +59,31 @@ const SYNC_SET = new Set(globals.SYNC_ARRAY);
  *
  * @return {Promise} 				login info object
  */
-export function setLoginInfo() {
-	/* @TODO
-		- get user info from /api/v2/users/{userid}
-		- email will be in response. store it in conf.login_info
-		- use extension cookie API to get user_id cookie
-	*/
+export function setLoginInfo(user) {
+	console.log('inside background setLoginInfo', user);
+	return new Promise((resolve, reject) => {
+		const { email, emailValidated, id } = user;
+		conf.login_info = {
+			logged_in: true,
+			user_id: id,
+			is_validated: emailValidated,
+			email
+		};
+	});
+}
+
+export function getLoginCookie() {
 	return new Promise((resolve, reject) => {
 		chrome.cookies.get({
-			url: 'localhost', // ghostery.com || ghosterystage.com
+			url: 'http://ghostery.io', // ghostery.com || ghosterystage.com
 			name: 'user_id',
-		}, cookie => {
-			conf.login_info = {
-				logged_in: true,
-				user_id: cookie.value
-				// user_token,
-				// decoded_user_token,
-				// is_validated // (email validation) get from user endpoint
-			};
-			resolve(cookie.value);
+		}, (cookie) => {
+			if (cookie) {
+				resolve(cookie.value);
+				return;
+			}
+			reject('err getting login user_id cookie');
+			return;
 		});
 	});
 

yarn.lock

@@ -5773,6 +5773,12 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+json-api-normalizer@^0.4.10:
+  version "0.4.10"
+  resolved "https://registry.yarnpkg.com/json-api-normalizer/-/json-api-normalizer-0.4.10.tgz#5c997a50d45d9ea47ae75cb8c223bffb236ee20a"
+  dependencies:
+    lodash "^4.17.2"
+
 json-buffer@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
@@ -8332,6 +8338,10 @@ redux-mock-store@^1.5.1:
   dependencies:
     lodash.isplainobject "^4.0.6"
 
+redux-object@^0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/redux-object/-/redux-object-0.5.6.tgz#db573a466ea26d59a98646a748333e00c11702e3"
+
 redux-thunk@^2.2.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"