jan/openreplay
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(ui): fix incorrect login error

Browse source
This commit is contained in:
nick-delirium 2023-01-10 16:55:50 +01:00
parent 3e50efd673
commit 2ec63b1591
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
frontend/app/components/Login/Login.js
View file

@ -122,15 +122,15 @@ export default class Login extends React.Component {
</div>
</div>
</Loader>
{ errors &&
<div className={ stl.errors }>
{ errors.length ?
(<div className={ stl.errors }>
{ errors.map(error => (
<div className={stl.errorItem}>
<Icon name="info" color="red" size="20"/>
<span className="color-red ml-2">{ error }<br /></span>
</div>
)) }
</div>
</div>) : null
}
{/* <div className={ stl.formFooter }> */}
<Button className="mt-2" type="submit" variant="primary" >{ 'Login' }</Button>

15
frontend/app/duck/user.js
View file

@ -28,7 +28,11 @@ export const initialState = Map({
authDetails: {},
onboarding: false,
sites: List(),
jwt: null
jwt: null,
loginRequest: {
loading: false,
errors: []
},
});
const setClient = (state, data) => {
@ -50,10 +54,12 @@ const reducer = (state = initialState, action = {}) => {
switch (action.type) {
case UPDATE_JWT:
return state.set('jwt', action.data);
case LOGIN.REQUEST:
return state.set('loginRequest', { loading: true, errors: [] })
case RESET_PASSWORD.SUCCESS:
case UPDATE_PASSWORD.SUCCESS:
case LOGIN.SUCCESS:
state.set('account', Account({...action.data.user }))
state.set('account', Account({...action.data.user })).set('loginRequest', { loading: false, errors: [] })
case SIGNUP.SUCCESS:
state.set('account', Account(action.data.user)).set('onboarding', true);
case REQUEST_RESET_PASSWORD.SUCCESS:
@ -67,6 +73,8 @@ const reducer = (state = initialState, action = {}) => {
return state.set('passwordErrors', List(action.errors))
case FETCH_ACCOUNT.FAILURE:
case LOGIN.FAILURE:
deleteCookie('jwt', '/', 'openreplay.com')
return state.set('loginRequest', { loading: false, errors: ['Invalid username or password'] });
case DELETE.SUCCESS:
case DELETE.FAILURE:
deleteCookie('jwt', '/', 'openreplay.com')
@ -86,7 +94,6 @@ const reducer = (state = initialState, action = {}) => {
export default withRequestState({
loginRequest: LOGIN,
signupRequest: SIGNUP,
updatePasswordRequest: UPDATE_PASSWORD,
requestResetPassowrd: REQUEST_RESET_PASSWORD,
@ -96,7 +103,7 @@ export default withRequestState({
updateAccountRequest: UPDATE_ACCOUNT,
}, reducer);
export const login = params => dispatch => dispatch({
export const login = params => ({
types: LOGIN.toArray(),
call: client => client.post('/login', params),
});