From fda60ee18981d5836978930e4e579831b0f8a8f3 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 5 Jul 2018 12:54:36 +0300
Subject: [PATCH] fix(author-confirm): show confirmation bar only for
authenticated users
---
.../components-faraday/src/components/AppBar/AppBar.js | 5 +++--
packages/xpub-faraday/app/FaradayApp.js | 10 +++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/packages/components-faraday/src/components/AppBar/AppBar.js b/packages/components-faraday/src/components/AppBar/AppBar.js
index ad8a6eacc..a20f4ad34 100644
--- a/packages/components-faraday/src/components/AppBar/AppBar.js
+++ b/packages/components-faraday/src/components/AppBar/AppBar.js
@@ -77,8 +77,9 @@ export default compose(
history.push(path)
},
}),
- withProps(({ isStaff, currentUser }) => ({
- shouldShowConfirmation: !isStaff && !get(currentUser, 'isConfirmed'),
+ withProps(({ isStaff, currentUser, isAuthenticated }) => ({
+ shouldShowConfirmation:
+ isAuthenticated && !isStaff && !get(currentUser, 'isConfirmed'),
})),
)(AppBar)
diff --git a/packages/xpub-faraday/app/FaradayApp.js b/packages/xpub-faraday/app/FaradayApp.js
index ae333761c..05d83b336 100644
--- a/packages/xpub-faraday/app/FaradayApp.js
+++ b/packages/xpub-faraday/app/FaradayApp.js
@@ -6,10 +6,17 @@ import { actions } from 'pubsweet-client'
import { withJournal } from 'xpub-journal'
import { AppBar } from 'pubsweet-components-faraday/src/components'
-const App = ({ children, currentUser, journal, logoutUser }) => (
+const App = ({
+ journal,
+ children,
+ logoutUser,
+ currentUser,
+ isAuthenticated,
+}) => (
<Root className="faraday-root">
<AppBar
brand={journal.metadata.name}
+ isAuthenticated={isAuthenticated}
onLogoutClick={logoutUser}
user={currentUser}
/>
@@ -21,6 +28,7 @@ export default compose(
connect(
state => ({
currentUser: state.currentUser.user,
+ isAuthenticated: state.currentUser.isAuthenticated,
}),
{ logoutUser: actions.logoutUser },
),
--
GitLab