Merge branch 'faraday-master' of gitlab.coko.foundation:xpub/xpub into faraday-master

packages/components-faraday/src/components/Admin/AdminRoute.js

+import React from 'react'
+import { get } from 'lodash'
+import { compose } from 'recompose'
+import { connect } from 'react-redux'
+import { Route, Redirect, withRouter } from 'react-router-dom'
+import { getCurrentUser } from 'pubsweet-component-xpub-authentication/src/redux/currentUser'
+
+const PrivateRoute = ({
+  currentUser,
+  getCurrentUser,
+  redirectPath = '/',
+  component: Component,
+  ...rest
+}) => (
+  <Route
+    {...rest}
+    render={props => {
+      if (!currentUser.isFetched) {
+        if (!currentUser.isFetching) {
+          getCurrentUser()
+        }
+
+        return <div>loading…</div>
+      }
+      if (!get(currentUser, 'user.admin') || !currentUser.isAuthenticated) {
+        return (
+          <Redirect
+            to={{
+              pathname: redirectPath,
+              state: { from: props.location },
+            }}
+          />
+        )
+      }
+
+      return <Component {...props} />
+    }}
+  />
+)
+
+export default compose(
+  withRouter,
+  connect(
+    state => ({
+      currentUser: state.currentUser,
+    }),
+    {
+      getCurrentUser,
+    },
+  ),
+)(PrivateRoute)

packages/components-faraday/src/components/Admin/index.js

 export { default as AdminUsers } from './AdminUsers'
 export { default as Pagination } from './Pagination'
+export { default as AdminRoute } from './AdminRoute'
 export { default as AdminDashboard } from './AdminDashboard'

packages/components-faraday/src/components/AppBar/AppBar.js

 import React from 'react'
-import { Icon } from '@pubsweet/ui'
 import { get } from 'lodash'
+import { Icon } from '@pubsweet/ui'
+import { connect } from 'react-redux'
 import styled from 'styled-components'
 import { withRouter } from 'react-router-dom'
 import { withState, withHandlers, compose } from 'recompose'
 
-const AppBar = ({ expanded, toggleMenu, brand, user, goTo }) => (
+const AppBar = ({ expanded, toggleMenu, brand, user, goTo, currentUser }) => (
   <Root>
     {React.cloneElement(brand, {
       onClick: goTo('/'),
@@ -22,9 +23,11 @@ const AppBar = ({ expanded, toggleMenu, brand, user, goTo }) => (
         {expanded && (
           <Dropdown>
             <DropdownOption>Settings</DropdownOption>
-            <DropdownOption onClick={goTo('admin')}>
-              Admin dashboard
-            </DropdownOption>
+            {currentUser.admin && (
+              <DropdownOption onClick={goTo('admin')}>
+                Admin dashboard
+              </DropdownOption>
+            )}
             <DropdownOption onClick={goTo('/logout')}>Logout</DropdownOption>
           </Dropdown>
         )}
@@ -34,6 +37,7 @@ const AppBar = ({ expanded, toggleMenu, brand, user, goTo }) => (
   </Root>
 )
 
+// #region styled-components
 const Root = styled.div`
   align-items: center;
   box-shadow: 0 1px 0 0 #667080;
@@ -99,9 +103,13 @@ const ToggleOverlay = styled.div`
   right: 0;
   opacity: 0;
 `
+// #endregion
 
 export default compose(
   withRouter,
+  connect(state => ({
+    currentUser: get(state, 'currentUser.user'),
+  })),
   withState('expanded', 'setExpanded', false),
   withHandlers({
     toggleMenu: ({ setExpanded }) => () => {

packages/xpub-faraday/app/routes.js

@@ -17,6 +17,7 @@ import NotFound from 'pubsweet-components-faraday/src/components/UIComponents/No
 import {
   AdminDashboard,
   AdminUsers,
+  AdminRoute,
 } from 'pubsweet-components-faraday/src/components/Admin'
 import AddEditUser from 'pubsweet-components-faraday/src/components/Admin/AddEditUser'
 import SignUpInvitationPage from 'pubsweet-components-faraday/src/components/SignUp/SignUpInvitationPage'
@@ -34,10 +35,10 @@ const Routes = () => (
         exact
         path="/confirmation-page"
       />
-      <PrivateRoute component={AdminDashboard} exact path="/admin" />
-      <PrivateRoute component={AdminUsers} exact path="/admin/users" />
-      <PrivateRoute component={AddEditUser} exact path="/admin/users/add" />
-      <PrivateRoute
+      <AdminRoute component={AdminDashboard} exact path="/admin" />
+      <AdminRoute component={AdminUsers} exact path="/admin/users" />
+      <AdminRoute component={AddEditUser} exact path="/admin/users/add" />
+      <AdminRoute
         component={AddEditUser}
         exact
         path="/admin/users/edit/:userId"