Refactor account in setup page.

app/Account/AccountActions.js

@@ -11,16 +11,15 @@ import {
 	RESET_PASSWORD_FAIL,
 	GET_USER_SUCCESS,
 	GET_USER_FAIL,
-
-	GET_SETTINGS_DATA
+	GET_USER_SETTINGS_SUCCESS
 } from './AccountConstants';
 
 export const getUserSettings = () => dispatch => (
 	sendMessageInPromise('account.getUserSettings')
 		.then((settings) => {
 			dispatch({
-				type: GET_SETTINGS_DATA,
-				data: { settingsData: settings }
+				type: GET_USER_SETTINGS_SUCCESS,
+				payload: { settings },
 			});
 		})
 		.catch((error) => {
@@ -30,12 +29,20 @@ export const getUserSettings = () => dispatch => (
 
 export const getUser = () => dispatch => (
 	sendMessageInPromise('account.getUser')
-		.then((user) => {
-			dispatch({
-				type: GET_USER_SUCCESS,
-				payload: { user },
-			});
-			return user;
+		.then((res) => {
+			const { errors, user } = res;
+			if (errors) {
+				dispatch({
+					type: GET_USER_FAIL,
+					payload: { errors },
+				});
+			} else {
+				dispatch({
+					type: GET_USER_SUCCESS,
+					payload: { user },
+				});
+			}
+			return res;
 		})
 );
 

app/Account/AccountReducer.js

@@ -57,8 +57,8 @@ export default (state = initialState, action) => {
 			return Object.assign({}, state, { user });
 		}
 		case GET_USER_SETTINGS_SUCCESS: {
-			const { userSettings } = action.payload;
-			return Object.assign({}, state, { userSettings });
+			const { settings } = action.payload;
+			return Object.assign({}, state, { userSettings: settings });
 		}
 		default: return state;
 	}

app/panel/actions/SettingsActions.js

@@ -26,9 +26,9 @@ import {
 	SETTINGS_TOGGLE_EXPAND_CATEGORY,
 	SETTINGS_UPDATE_SEARCH_VALUE,
 	SETTINGS_SEARCH_SUBMIT,
-	SETTINGS_FILTER
+	SETTINGS_FILTER,
+	GET_SETTINGS_DATA
 } from '../constants/constants';
-import { GET_SETTINGS_DATA } from '../../Account/AccountConstants';
 import { sendMessageInPromise } from '../utils/msg';
 import { hashCode } from '../../../src/utils/common';
 import globals from '../../../src/classes/Globals';

app/panel/constants/constants.js

@@ -63,3 +63,4 @@ export const SETTINGS_TOGGLE_EXPAND_ALL = 'SETTINGS_TOGGLE_EXPAND_ALL';
 export const SETTINGS_TOGGLE_EXPAND_CATEGORY = 'SETTINGS_TOGGLE_EXPAND_CATEGORY';
 export const SETTINGS_UPDATE_SEARCH_VALUE = 'SETTINGS_UPDATE_SEARCH_VALUE';
 export const SETTINGS_FILTER = 'SETTINGS_FILTER';
+export const GET_SETTINGS_DATA = 'GET_SETTINGS_DATA';

app/panel/reducers/panel.js

@@ -32,7 +32,6 @@ import {
 	LOGOUT_SUCCESS,
 	REGISTER_SUCCESS,
 	REGISTER_FAIL,
-	LOGIN_DATA_SUCCESS,
 	RESET_PASSWORD_SUCCESS,
 	RESET_PASSWORD_FAIL
 } from '../../Account/AccountConstants';
@@ -167,13 +166,6 @@ export default (state = initialState, action) => {
 			const updated = _showNotification(state, action);
 			return Object.assign({}, state, updated);
 		}
-		case LOGIN_DATA_SUCCESS: {
-			const { email, emailValidated } = action.data;
-			return Object.assign({}, state, {
-				email,
-				emailValidated,
-			});
-		}
 		case TOGGLE_CLIQZ_FEATURE: {
 			let pingName = '';
 			switch (action.data.featureName) {

app/panel/reducers/settings.js

@@ -28,9 +28,9 @@ import {
 	SETTINGS_TOGGLE_EXPAND_ALL,
 	SETTINGS_TOGGLE_EXPAND_CATEGORY,
 	SETTINGS_UPDATE_SEARCH_VALUE,
-	SETTINGS_FILTER
+	SETTINGS_FILTER,
+	GET_SETTINGS_DATA
 } from '../constants/constants';
-import { GET_SETTINGS_DATA } from '../../Account/AccountConstants';
 import { updateTrackerBlocked, updateCategoryBlocked, updateBlockAllTrackers, toggleExpandAll, toggleExpandCategory } from '../utils/blocking';
 import { removeFromObject, updateObject } from '../utils/utils';
 import { sendMessage } from '../utils/msg';

app/setup/actions/LogInActions.js

@@ -10,178 +10,8 @@
  * 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 'whatwg-fetch';
-import normalize from 'json-api-normalizer';
-import build from 'redux-object';
-import {
-	GET_LOGIN_INFO,
-	LOGIN_SUCCESS,
-	LOGIN_FAIL,
-	CREATE_ACCOUNT_SUCCESS,
-	CREATE_ACCOUNT_FAIL,
-	CLEAR_MESSAGE
-} from '../constants/constants';
-import { msg, utils } from '../utils';
-import globals from '../../../src/classes/Globals';
-import { decodeJwt, log } from '../../../src/utils/common';
+import { CLEAR_MESSAGE } from '../constants/constants';
 
-const API_ROOT_URL = `https://consumerapi.${globals.GHOSTERY_DOMAIN}.com`;
+export const clearMessage = () => ({ type: CLEAR_MESSAGE });
 
-/**
- * called from Header.clearMessage
- * @return {Object}
- * @memberof SetupActions
- */
-export function clearMessage() {
-	return {
-		type: CLEAR_MESSAGE,
-	};
-}
-
-/**
- * Called from LogInView.componentWillMount()
- * @return {Object}
- * @memberof SetupActions
- */
-export function getLoginInfo() {
-	return function (dispatch) {
-		return msg.sendMessageInPromise('fetchUser')
-			.then((user) => {
-				dispatch({
-					type: GET_LOGIN_INFO,
-					data: user,
-				});
-			});
-	};
-}
-
-/**
- * Called from LogInView._createAccount()
- * @return {Object}
- * @memberof SetupActions
- */
-export function createAccountFail() {
-	return {
-		type: CREATE_ACCOUNT_FAIL,
-		data: '', // TODO
-	};
-}
-
-/**
- * Called from LogInView._signIn()
- * @return {Object}
- * @memberof SetupActions
- */
-export function loginFail() {
-	return {
-		type: LOGIN_FAIL,
-		data: '', // TODO
-	};
-}
-
-/**
- * Call consumerAPI and set updated login info to state
- * @param  {Object} query
- * @return {Object} dispatch
- * @memberof SetupActions
- */
-export function userLogin(email, password) {
-	return function (dispatch) {
-		const data = `email=${window.encodeURIComponent(email)}&password=${encodeURIComponent(password)}`;
-		return msg.sendMessageInPromise('userLogin', data)
-			.then((response) => {
-				if (response.errors) {
-					log('PanelActions userLogin server error', response);
-					response.errors.forEach((err) => {
-						let errorText = '';
-						switch (err.code) {
-							case '10050':
-							case '10110':
-								errorText = t('banner_no_such_account_message');
-								break;
-							default:
-								errorText = t('server_error_message');
-						}
-						dispatch({
-							type: LOGIN_FAIL,
-							data: errorText
-						});
-					});
-					return false;
-				}
-				return msg.sendMessageInPromise('fetchUser')
-					.then((user) => {
-						dispatch({
-							type: LOGIN_SUCCESS,
-							data: {
-								text: `${t('panel_signin_success')} ${email}`,
-								payload: { email }
-							}
-						});
-					});
-			})
-			.catch((err) => {
-				log('PanelActions userLogin server error', err);
-				dispatch({
-					type: LOGIN_FAIL,
-					data: t('server_error_message')
-				});
-			});
-	};
-}
-
-/**
- * Call consumer API and create new account. Set new login info to state.
- * @param  {Object} query
- * @return {Object} dispatch
- * @memberof SetupActions
- */
-
-export const createAccount = (email, confirmEmail, firstName, lastName, password) => (
-	function (dispatch) {
-		const data = `email=${window.encodeURIComponent(email)}&email_confirmation=${window.encodeURIComponent(confirmEmail)}&first_name=${window.encodeURIComponent(firstName)}&last_name=${window.encodeURIComponent(lastName)}&password=${window.encodeURIComponent(password)}`;
-		return msg.sendMessageInPromise('createAccount', data)
-			.then((response) => {
-				if (response.errors) {
-					response.errors.forEach((err) => {
-						let errorText = '';
-						switch (err.code) {
-							case '10070':
-								errorText = t('email_address_in_use');
-								break;
-							case '10080':
-								errorText = t('invalid_email_confirmation');
-								break;
-							default:
-								errorText = t('server_error_message');
-						}
-						dispatch({
-							type: CREATE_ACCOUNT_FAIL,
-							data: {
-								text: errorText,
-								classes: 'alert',
-							},
-						});
-					});
-					return;
-				}
-				dispatch({
-					type: CREATE_ACCOUNT_SUCCESS,
-					data: {
-						payload: { email },
-						text: `${t('panel_signin_success')} ${email}`
-					},
-				});
-			})
-			.catch((err) => {
-				log('PanelActions createAccount returned with an error', err);
-				dispatch({
-					type: CREATE_ACCOUNT_FAIL,
-					data: {
-						text: t('server_error_message'),
-						classes: 'alert',
-					},
-				});
-			});
-	}
-);
+export const reset = () => ({ type: 'RESET' });

app/setup/actions/NavigationActions.js

@@ -17,8 +17,8 @@ import {
 	UPDATE_NAVIGATION_NEXT_BUTTON,
 	RESET_NAVIGATION_NEXT_BUTTON,
 	NAVIGATION_NEXT,
-	CREATE_ACCOUNT,
-	SIGN_IN
+	TRIGGER_LOGIN,
+	TRIGGER_REGISTER
 } from '../constants/constants';
 import { msg } from '../utils';
 
@@ -51,22 +51,14 @@ export function resetNavigationNextButton() {
  * @return {Object}
  * @memberof SetupActions
  */
-export function triggerCreateAccount() {
-	return {
-		type: CREATE_ACCOUNT,
-	};
-}
+export const triggerCreateAccount = () => ({ type: TRIGGER_REGISTER });
 
 /**
  * Called from Navigation and LoginView views
  * @return {Object}
  * @memberof SetupActions
  */
-export function triggerSignIn() {
-	return {
-		type: SIGN_IN,
-	};
-}
+export const triggerSignIn = () => ({ type: TRIGGER_LOGIN });
 
 /**
  * Called from Navigation._close()