maverick/flex-template-web
1
0
Fork 0
mirror of https://github.com/kingomarnajjar/flex-template-web.git synced 2026-07-30 18:16:48 +10:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename loginOrLogoutInProgress to authenticationInProgress

Browse source
This commit is contained in:
Kimmo Puputti 2017-04-28 11:04:59 +03:00
parent a99b33e5e8
commit 814184aa0a
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/containers/AuthenticationPage/AuthenticationPage.js
View file

@ -5,7 +5,7 @@ import { Redirect } from 'react-router-dom';
import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
import { PageLayout, NamedRedirect } from '../../components';
import { LoginForm, SignUpForm } from '../../containers';
import { login, loginOrLogoutInProgress } from '../../ducks/Auth.duck';
import { login, authenticationInProgress } from '../../ducks/Auth.duck';
import css from './AuthenticationPage.css';
@ -91,7 +91,7 @@ const mapStateToProps = state => {
return {
isAuthenticated,
loginError,
authInProgress: loginOrLogoutInProgress(state),
authInProgress: authenticationInProgress(state),
};
};

4
src/containers/Topbar/Topbar.js
View file

@ -2,7 +2,7 @@ import React, { PropTypes } from 'react';
import { compose } from 'redux';
import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom';
import { logout, loginOrLogoutInProgress } from '../../ducks/Auth.duck';
import { logout, authenticationInProgress } from '../../ducks/Auth.duck';
import { NamedLink, Button } from '../../components';
import { withFlattenedRoutes } from '../../util/contextHelpers';
import { pathByRouteName } from '../../util/routes';
@ -66,7 +66,7 @@ const mapStateToProps = state => {
const { isAuthenticated } = state.Auth;
return {
isAuthenticated,
authInProgress: loginOrLogoutInProgress(state),
authInProgress: authenticationInProgress(state),
};
};

6
src/ducks/Auth.duck.js
View file

@ -59,7 +59,7 @@ export default function reducer(state = initialState, action = {}) {
// ================ Selectors ================ //
export const loginOrLogoutInProgress = state => {
export const authenticationInProgress = state => {
const { loginInProgress, logoutInProgress } = state.Auth;
return loginInProgress || logoutInProgress;
};
@ -91,7 +91,7 @@ export const authInfo = () =>
export const login = (username, password) =>
(dispatch, getState, sdk) => {
if (loginOrLogoutInProgress(getState())) {
if (authenticationInProgress(getState())) {
return Promise.reject(new Error('Login or logout already in progress'));
}
dispatch(loginRequest());
@ -107,7 +107,7 @@ export const login = (username, password) =>
export const logout = () =>
(dispatch, getState, sdk) => {
if (loginOrLogoutInProgress(getState())) {
if (authenticationInProgress(getState())) {
return Promise.reject(new Error('Login or logout already in progress'));
}
dispatch(logoutRequest());