Feature/api v2 auth

app/panel/actions/AccountActions.js

@@ -49,11 +49,12 @@ export const getUser = () => dispatch => (
  */
 export const login = (email, password) => dispatch => (
 	sendMessageInPromise('account.login', { email, password })
-		.then((response) => {
-			if (response.errors) {
-				log('PanelActions login server error', response);
+		.then((res) => {
+			const { errors } = res;
+			if (errors) {
+				log('PanelActions login server error', res);
 				dispatch({ type: LOGIN_FAILED });
-				response.errors.forEach((err) => {
+				errors.forEach((err) => {
 					let errorText = '';
 					switch (err.code) {
 						case '10050':
@@ -96,6 +97,63 @@ export const login = (email, password) => dispatch => (
 		})
 );
 
+/**
+ * Call consumer API and create new account. Set new login info to state.
+ * @param  {Object} query
+ * @return {Object} dispatch
+ */
+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: CREATE_ACCOUNT_FAILED });
+			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: SHOW_NOTIFICATION,
+					data: {
+						text: errorText,
+						classes: 'alert',
+					},
+				});
+			});
+			return false;
+		}
+
+		dispatch({ type: CREATE_ACCOUNT_SUCCESS });
+		dispatch({
+			type: SHOW_NOTIFICATION,
+			data: {
+				text: t('panel_email_verification_sent', email),
+				classes: 'success',
+			},
+		});
+		return true;
+	}).catch((err) => {
+		log('PanelActions account.register server error', err);
+		dispatch({ type: CREATE_ACCOUNT_FAILED });
+		dispatch({
+			type: SHOW_NOTIFICATION,
+			data: {
+				text: t('server_error_message'),
+				classes: 'alert',
+			},
+		});
+	})
+);
+
 /**
  * Triggers logout by sending empty {} to setLoginInfo. Called from
  * HeaderMenu. Picked up by Panel reducer.
@@ -114,131 +172,67 @@ export function logout() {
 	};
 }
 
-/**
- * Call consumer API and create new account. Set new login info to state.
- * @param  {Object} query
- * @return {Object} dispatch
- */
-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 sendMessageInPromise('createAccount', data)
-			.then((response) => {
-				const { errors } = response;
-				if (errors) {
-					dispatch({ type: CREATE_ACCOUNT_FAILED });
-					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: SHOW_NOTIFICATION,
-							data: {
-								text: errorText,
-								classes: 'alert',
-							},
-						});
-					});
-					return;
-				}
-
-				sendMessageInPromise('fetchUser')
-					.then((user) => {
-						dispatch({
-							type: CREATE_ACCOUNT_SUCCESS,
-							data: {
-								email: user.email,
-								is_validated: user.is_validated
-							}
-						});
-						dispatch({
-							type: LOGIN_DATA_SUCCESS,
-							data: user,
-						});
-						dispatch({
-							type: SHOW_NOTIFICATION,
-							data: {
-								text: t('panel_email_verification_sent', user.email),
-								classes: 'success',
-							},
-						});
-						return user;
-					});
-			});
-	}
-);
-
 /**
  * Call consumer API and send password reminder email
  * @param  {Object} query
  * @return {Object} dispatch
  */
-export function forgotPassword(email) {
-	return function (dispatch) {
-		const data = `email=${window.encodeURIComponent(email)}`;
-		return sendMessageInPromise('resetPassword', data)
-			.then((response) => {
-				if (response.errors) {
-					log('PanelActions userLogin server error', response);
-					dispatch({ type: LOGIN_FAILED });
-					return response.errors.forEach((err) => {
-						let errorText = '';
-						let emailNotFound = '';
-						switch (err.code) {
-							case '10050':
-							case '10110':
-								errorText = t('banner_no_such_account_message');
-								emailNotFound = true;
-								break;
-							default:
-								errorText = t('server_error_message');
-								emailNotFound = false;
-						}
-						dispatch({
-							type: FORGOT_PASSWORD_FAILED,
-							emailNotFound
-						});
-						dispatch({
-							type: SHOW_NOTIFICATION,
-							data: {
-								text: errorText,
-								classes: 'alert',
-							},
-						});
+export const resetPassword = (email) => dispatch => (
+	sendMessageInPromise('account.resetPassword', { email })
+		.then((res) => {
+			const { errors } = res;
+			if (errors) {
+				log('PanelActions resetPassword server error', res);
+				dispatch({ type: LOGIN_FAILED });
+				errors.forEach((err) => {
+					let errorText = '';
+					let emailNotFound = '';
+					switch (err.code) {
+						case '10050':
+						case '10110':
+							errorText = t('banner_no_such_account_message');
+							emailNotFound = true;
+							break;
+						default:
+							errorText = t('server_error_message');
+							emailNotFound = false;
+					}
+					dispatch({
+						type: FORGOT_PASSWORD_FAILED,
+						emailNotFound
+					});
+					dispatch({
+						type: SHOW_NOTIFICATION,
+						data: {
+							text: errorText,
+							classes: 'alert',
+						},
 					});
-				}
-				dispatch({ type: FORGOT_PASSWORD_SUCCESS });
-				dispatch({
-					type: SHOW_NOTIFICATION,
-					data: {
-						text: t('banner_check_your_email_title'),
-						classes: 'success',
-					},
-				});
-				return true;
-			})
-			.catch((error) => {
-				// server error
-				log('PanelActions forgotPassword server error', error);
-				dispatch({
-					type: FORGOT_PASSWORD_FAILED,
-					emailNotFound: false,
-				});
-				dispatch({
-					type: SHOW_NOTIFICATION,
-					data: {
-						text: t('server_error_message'),
-						classes: 'alert',
-					},
 				});
+				return false;
+			}
+			dispatch({ type: FORGOT_PASSWORD_SUCCESS });
+			dispatch({
+				type: SHOW_NOTIFICATION,
+				data: {
+					text: t('banner_check_your_email_title'),
+					classes: 'success',
+				},
 			});
-	};
-}
+			return true;
+		})
+		.catch((err) => {
+			log('PanelActions forgotPassword server error', err);
+			dispatch({
+				type: FORGOT_PASSWORD_FAILED,
+				emailNotFound: false,
+			});
+			dispatch({
+				type: SHOW_NOTIFICATION,
+				data: {
+					text: t('server_error_message'),
+					classes: 'alert',
+				},
+			});
+		})
+);

app/panel/components/CreateAccount.jsx

@@ -145,7 +145,11 @@ class CreateAccount extends React.Component {
 			return;
 		}
 
-		this.props.actions.createAccount(email, confirmEmail, firstName, lastName, password);
+		this.props.actions.register(email, confirmEmail, firstName, lastName, password).then((success) => {
+			if (success) {
+				this.props.actions.getUser();
+			}
+		});
 	}
 	/**
 	 * Create account on Return.

app/panel/components/ForgotPassword.jsx

@@ -75,7 +75,7 @@ class ForgotPassword extends React.Component {
 			return;
 		}
 
-		this.props.actions.forgotPassword(email);
+		this.props.actions.resetPassword(email);
 	}
 	/**
 	 * Create account on Return.

app/panel/components/Header.jsx

@@ -78,17 +78,29 @@ class Header extends React.Component {
 	 * Handles clicking the sign-in / verify link
 	 */
 	clickSignInVerify() {
-		if (!this.props.loggedIn) {
+		const { loggedIn, email, emailValidated } = this.props;
+		if (!loggedIn) {
 			sendMessage('ping', 'sign_in');
 			this.props.history.push('/login');
-		} else if (!this.props.emailValidated) {
-			sendMessageInPromise('sendVerificationEmail').then((data) => {
-				this.props.actions.showNotification({
-					classes: 'success',
-					text: t('panel_email_verification_sent', data.email),
-				});
+		} else if (!emailValidated) {
+			sendMessageInPromise('account.sendValidateAccountEmail').then((success) => {
+				if (success) {
+					this.props.actions.showNotification({
+						classes: 'success',
+						text: t('panel_email_verification_sent', email),
+					});
+				} else {
+					this.props.actions.showNotification({
+						classes: 'alert',
+						text: t('server_error_message'),
+					});
+				}
 			}).catch((err) => {
 				log('sendVerificationEmail Error', err);
+				this.props.actions.showNotification({
+					classes: 'alert',
+					text: t('server_error_message'),
+				});
 			});
 		}
 	}