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

Ensure current user, add docs

Browse source
This commit is contained in:
Kimmo Puputti 2017-09-14 09:46:20 +03:00
parent 7adfa6eeed
commit fd79f32923
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5,6 +5,7 @@ import { withRouter, Redirect } from 'react-router-dom';
import { FormattedMessage, injectIntl, intlShape } from 'react-intl';
import classNames from 'classnames';
import * as propTypes from '../../util/propTypes';
import { ensureCurrentUser } from '../../util/data';
import {
PageLayout,
NamedLink,
@ -69,12 +70,19 @@ export const AuthenticationPageComponent = props => {
const isLogin = tab === 'login';
const from = location.state && location.state.from ? location.state.from : null;
const showEmailVerification = !isLogin && currentUser && !currentUser.attributes.emailVerified;
const user = ensureCurrentUser(currentUser);
const currentUserLoaded = !!user.id;
// We only want to show the email verification dialog in the signup
// tab if the user isn't being redirected somewhere else
// (i.e. `from` is present). We must also check the `emailVerified`
// flag only when the current user is fully loaded.
const showEmailVerification = !isLogin && currentUserLoaded && !user.attributes.emailVerified;
// Already authenticated, redirect away from auth page
if (isAuthenticated && from) {
return <Redirect to={from} />;
} else if (isAuthenticated && currentUser && !showEmailVerification) {
} else if (isAuthenticated && currentUserLoaded && !showEmailVerification) {
return <NamedRedirect name="LandingPage" />;
}
@ -144,13 +152,8 @@ export const AuthenticationPageComponent = props => {
</div>
);
const currentUserHasAttributes = currentUser && currentUser.attributes;
const name = currentUserHasAttributes && currentUser.attributes.profile
? currentUser.attributes.profile.displayName
: '';
const email = currentUserHasAttributes
? <span className={css.email}>{currentUser.attributes.email}</span>
: '';
const name = user.attributes.profile.displayName;
const email = <span className={css.email}>{user.attributes.email}</span>;
const resendEmailLink = (
<InlineTextButton className={css.verifyLink} onClick={onResendVerificationEmail}>