diff --git a/app/actions/profile.js b/app/actions/profile.js index 8cf39f3..78844f7 100644 --- a/app/actions/profile.js +++ b/app/actions/profile.js @@ -26,6 +26,12 @@ import { import { getAuthToken } from '../selectors/auth.js'; import { getUserId } from '../selectors/profile.js'; + +const handleLoginFailure = (errors) => (dispatch) => { + dispatch(loginFailure(errors)); + dispatch(unblockUI()); +}; + const isValidEmail = (payload) => ({ type: PROFILE_EMAIL_AVAILABLE, payload, @@ -100,9 +106,15 @@ export const login = (username, password) => (dispatch) => { dispatch(blockUI()); loginUser(username, password) .then((result) => { + if (result.errors) { + dispatch(handleLoginFailure(result.errors)); + return; + } + dispatch(loginSuccess(result)); + dispatch(unblockUI()); }) - .catch((err) => dispatch(loginFailure(err))); + .catch((err) => dispatch(handleLoginFailure(err))); }; export const logout = () => (dispatch) => { diff --git a/app/api/helpers.js b/app/api/helpers.js index c5f20ff..c2c1bfc 100644 --- a/app/api/helpers.js +++ b/app/api/helpers.js @@ -34,8 +34,7 @@ export const formatPostData = (body) => { }; export const formatJsonData = (body) => { - console.log('formateJsonBody:', body); - return body; //JSON.stringify(body); + return JSON.stringify(body); }; const parseQueryParamsString = (queryParams) => { diff --git a/app/api/index.js b/app/api/index.js index dd4085f..e1dc75c 100644 --- a/app/api/index.js +++ b/app/api/index.js @@ -25,6 +25,7 @@ export const API_ENDPOINTS = { PURCHASE_ITEM: '/sales', // User/Profile + LOGIN: '/auth', USER_SIGNUP: '/signup', USER_PROFILE: '/users/:user_id',