Refactor account into own component.

app/Account/AccountActions.js

@@ -0,0 +1,134 @@
+import { sendMessageInPromise } from '../panel/utils/msg';
+import { log } from '../../src/utils/common';
+import {
+	REGISTER_SUCCESS,
+	REGISTER_FAIL,
+	LOGIN_SUCCESS,
+	LOGIN_FAIL,
+	LOGOUT_SUCCESS,
+	LOGOUT_FAIL,
+	RESET_PASSWORD_SUCCESS,
+	RESET_PASSWORD_FAIL,
+	GET_USER_SUCCESS,
+	GET_USER_FAIL,
+
+	GET_SETTINGS_DATA
+} from './AccountConstants';
+
+export const getUserSettings = () => dispatch => (
+	sendMessageInPromise('account.getUserSettings')
+		.then((settings) => {
+			dispatch({
+				type: GET_SETTINGS_DATA,
+				data: { settingsData: settings }
+			});
+		})
+		.catch((error) => {
+			log('PanelActions getUserSettings error', error);
+		})
+);
+
+export const getUser = () => dispatch => (
+	sendMessageInPromise('account.getUser')
+		.then((user) => {
+			dispatch({
+				type: GET_USER_SUCCESS,
+				payload: { user },
+			});
+			return user;
+		})
+);
+
+export const login = (email, password) => dispatch => (
+	sendMessageInPromise('account.login', { email, password })
+		.then((res) => {
+			const { errors } = res;
+			if (errors) {
+				dispatch({
+					type: LOGIN_FAIL,
+					payload: { errors },
+				});
+				return false;
+			}
+			dispatch({
+				type: LOGIN_SUCCESS,
+				payload: { email },
+			});
+			return true;
+		})
+		.catch((err) => {
+			log('account.login() error:', err);
+			dispatch({
+				type: LOGIN_FAIL,
+				payload: {
+					errors: [{ title: err.toString(), detail: err.toString() }],
+				},
+			});
+		})
+);
+
+export const register = (email, confirmEmail, firstName, lastName, password) => dispatch => (
+	sendMessageInPromise('account.register', {
+		email, confirmEmail, firstName, lastName, password
+	}).then((res) => {
+		const { errors } = res;
+		if (errors) {
+			dispatch({
+				type: REGISTER_FAIL,
+				payload: { errors },
+			});
+			return false;
+		}
+		dispatch({
+			type: REGISTER_SUCCESS,
+			payload: { email },
+		});
+		return true;
+	}).catch((err) => {
+		dispatch({
+			type: REGISTER_FAIL,
+			payload: {
+				errors: [{ title: err.toString(), detail: err.toString() }],
+			},
+		});
+	})
+);
+
+export const logout = () => dispatch => (
+	sendMessageInPromise('account.logout', {})
+		.then(() => {
+			dispatch({ type: LOGOUT_SUCCESS });
+		})
+		.catch((err) => {
+			dispatch({
+				type: LOGOUT_FAIL,
+				payload: {
+					errors: [{ title: err.toString(), detail: err.toString() }],
+				},
+			});
+		})
+);
+
+export const resetPassword = email => dispatch => (
+	sendMessageInPromise('account.resetPassword', { email })
+		.then((res) => {
+			const { errors } = res;
+			if (errors) {
+				dispatch({
+					type: RESET_PASSWORD_FAIL,
+					payload: { errors },
+				});
+				return false;
+			}
+			dispatch({ type: RESET_PASSWORD_SUCCESS });
+			return true;
+		})
+		.catch((err) => {
+			dispatch({
+				type: RESET_PASSWORD_FAIL,
+				payload: {
+					errors: [{ title: err.toString(), detail: err.toString() }],
+				},
+			});
+		})
+);

app/Account/AccountConstants.js

@@ -0,0 +1,12 @@
+export const LOGIN_SUCCESS = 'LOGIN_SUCCESS';
+export const LOGIN_FAIL = 'LOGIN_FAIL';
+export const REGISTER_SUCCESS = 'REGISTER_SUCCESS';
+export const REGISTER_FAIL = 'REGISTER_FAIL';
+export const LOGOUT_SUCCESS = 'LOGOUT_SUCCESS';
+export const LOGOUT_FAIL = 'LOGOUT_FAIL';
+export const RESET_PASSWORD_SUCCESS = 'RESET_PASSWORD_SUCCESS';
+export const RESET_PASSWORD_FAIL = 'RESET_PASSWORD_FAIL';
+export const GET_USER_SUCCESS = 'GET_USER_SUCCESS';
+export const GET_USER_FAIL = 'GET_USER_FAIL';
+export const GET_USER_SETTINGS_SUCCESS = 'GET_USER_SETTINGS_SUCCESS';
+export const GET_USER_SETTINGS_FAIL = 'GET_USER_SETTINGS_FAIL';

app/Account/AccountReducer.js

@@ -0,0 +1,65 @@
+/**
+ * Account Reducer
+ *
+ * Ghostery Browser Extension
+ * https://www.ghostery.com/
+ *
+ * Copyright 2018 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 {
+	LOGIN_SUCCESS,
+	LOGOUT_SUCCESS,
+	REGISTER_SUCCESS,
+	GET_USER_SUCCESS,
+	GET_USER_SETTINGS_SUCCESS
+} from './AccountConstants';
+import { GET_PANEL_DATA } from '../panel/constants/constants';
+import { sendMessage } from '../panel/utils/msg';
+
+const initialState = {
+	loggedIn: false,
+	userID: '',
+	user: null,
+	userSettings: null,
+};
+
+export default (state = initialState, action) => {
+	switch (action.type) {
+		case GET_PANEL_DATA: {
+			const { account } = action.data;
+			if (account === null) {
+				return Object.assign({}, initialState);
+			}
+			const { userID, user, userSettings } = account;
+			return Object.assign({}, state, {
+				loggedIn: true,
+				userID,
+				user,
+				userSettings,
+			});
+		}
+		case REGISTER_SUCCESS:
+		case LOGIN_SUCCESS: {
+			return Object.assign({}, state, {
+				loggedIn: true,
+			});
+		}
+		case LOGOUT_SUCCESS: {
+			return Object.assign({}, initialState);
+		}
+		case GET_USER_SUCCESS: {
+			const { user } = action.payload;
+			return Object.assign({}, state, { user });
+		}
+		case GET_USER_SETTINGS_SUCCESS: {
+			const { userSettings } = action.payload;
+			return Object.assign({}, state, { userSettings });
+		}
+		default: return state;
+	}
+};

app/panel/actions/__tests__/AccountActions.js → app/Account/__tests__/AccountActions.js

@@ -13,12 +13,12 @@
 
 import configureStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import * as msg from '../../utils/msg';
+import * as msg from '../../panel/utils/msg';
 import * as accountActions from '../AccountActions';
 import {
 	LOGIN_FAILED, SHOW_NOTIFICATION, LOGIN_SUCCESS,
 	GET_SETTINGS_DATA, LOGIN_DATA_SUCCESS, LOGOUT
-} from '../../constants/constants';
+} from '../AccountConstants';
 
 // Fake the translation function to only return the translation key
 global.t = function (str) {