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