gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: Do not re-signin if user is already authed

Browse Source
This commit is contained in:
Bouncey
2019-01-31 17:55:47 +00:00
committed by Valeriy
parent e719b917a8
commit c7bb16edeb
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
client/src/components/Header/components/Login.js
View File

@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { createSelector } from 'reselect'; import { createSelector } from 'reselect';
import { navigate as gatsbyNavigate } from 'gatsby';
import { Button } from '@freecodecamp/react-bootstrap'; import { Button } from '@freecodecamp/react-bootstrap';
import { hardGoTo, isSignedInSelector } from '../../../redux'; import { hardGoTo, isSignedInSelector } from '../../../redux';
@ -11,27 +12,26 @@ import { gtagReportConversion } from '../../../analytics/gtag';
import './login.css'; import './login.css';
const mapStateToProps = createSelector( const mapStateToProps = createSelector(isSignedInSelector, isSignedIn => ({
isSignedInSelector, isSignedIn
({ isSingedIn }) => ({ isSingedIn }) }));
);
const mapDispatchToProps = dispatch => ({ const mapDispatchToProps = dispatch => ({
navigate: location => dispatch(hardGoTo(location)) navigate: location => dispatch(hardGoTo(location))
}); });
const createOnClick = (navigate, isSingedIn) => e => { const createOnClick = (navigate, isSignedIn) => e => {
e.preventDefault(); e.preventDefault();
gtagReportConversion(); gtagReportConversion();
if (isSingedIn) { if (isSignedIn) {
return navigate('/welcome'); return gatsbyNavigate('/welcome');
} }
return navigate(`${apiLocation}/signin`); return navigate(`${apiLocation}/signin`);
}; };
function Login(props) { function Login(props) {
const { children, navigate, isSingedIn, ...restProps } = props; const { children, navigate, isSignedIn, ...restProps } = props;
return ( return (
<a href='/signin' onClick={createOnClick(navigate, isSingedIn)}> <a href='/signin' onClick={createOnClick(navigate, isSignedIn)}>
<Button <Button
{...restProps} {...restProps}
bsStyle='default' bsStyle='default'
@ -48,7 +48,7 @@ function Login(props) {
Login.displayName = 'Login'; Login.displayName = 'Login';
Login.propTypes = { Login.propTypes = {
children: PropTypes.any, children: PropTypes.any,
isSingedIn: PropTypes.bool, isSignedIn: PropTypes.bool,
navigate: PropTypes.func.isRequired navigate: PropTypes.func.isRequired
}; };