Przeglądaj źródła

login password default to '' + typo

David 9 lat temu
rodzic
commit
0383630b00
2 zmienionych plików z 8 dodań i 7 usunięć
  1. 5 6
      src/actions/AuthActions.js
  2. 3 1
      src/actions/LocalStorageActions.js

+ 5 - 6
src/actions/AuthActions.js

@@ -24,28 +24,26 @@ export const passwordChanged = (text) => {
   };
 };
 
-export const loginUser = ({ email, password }) => {
+export const loginUser = ({ email, password='' }) => {
 	return (dispatch) => {
 		const SHA256 = require('sha256');
 	    dispatch({ type: LOGIN_USER });
 	    return post('login.php', { user: email, pass: SHA256(password) })
 	      .then(
 	        (response) => {
-				loginUserSuccess(dispatch, response, password);
-				return Promise.resolve();
+				return loginUserSuccess(dispatch, response, password);
 			}
 	      ).catch(
 	        (error) => {
-				loginUserFail(dispatch, error)
-				return Promise.reject();
+				return loginUserFail(dispatch, error)
 			}
 	      );
   };
 };
 
 const loginUserFail = (dispatch, error) => {
-  console.log('login failed', error);
   dispatch({ type: LOGIN_USER_FAIL, payload: error });
+  return Promise.reject();
 };
 
 const loginUserSuccess = (dispatch, user, password='') => {
@@ -55,4 +53,5 @@ const loginUserSuccess = (dispatch, user, password='') => {
   });
   saveLogin({ user: user.email, password: password })
   Actions.Menu({type: 'reset'});
+  return Promise.resolve();
 };

+ 3 - 1
src/actions/LocalStorageActions.js

@@ -80,7 +80,7 @@ export const getLogin = () => {
 		ls.get('user').then((data) => {
 			let payload = data;
 			if (data === null || data === undefined) {
-				payload = { user: '', passowrd: ''};
+				payload = { user: '', password: ''};
 				ls.save('user', payload);
 			}
 			dispatch({
@@ -95,6 +95,8 @@ export const getLogin = () => {
 			})
 
 
+		}).catch((error) => {
+			Actions.login({ user: 'lol' });
 		});
 	};
 };