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

packages/component-user-manager/src/routes/users/linkOrcid.js

@@ -27,7 +27,14 @@ const LinkOrcid = app => {
         clientSecret,
       },
       (accessToken, refreshToken, params, profile, done) => {
-        profile = { orcid: params.orcid, name: params.name }
+        profile = {
+          orcid: params.orcid,
+          name: params.name,
+          accessToken,
+          refreshToken,
+          scope: params.scope,
+          expiry: params.expires_in,
+        }
         return done(null, profile)
       },
     ),
@@ -53,7 +60,7 @@ const LinkOrcid = app => {
 
 const linkOrcidHandler = models => async (req, res) => {
   const user = await models.User.find(userId)
-  user.orcid = req.user.orcid
+  user.orcid = req.user
   await user.save()
   res.redirect(successPath)
 }

packages/components-faraday/src/components/SignUp/ReviewerInviteDecision.js

@@ -37,7 +37,7 @@ const ReviewerInviteDecision = ({
   reviewerEmail,
 }) => (
   <RootContainer bordered>
-    <Title>Hindawi Invitation</Title>
+    <Title>Reviewer Invitation</Title>
     <Subtitle>{agree === 'true' ? agreeText : declineText}</Subtitle>
     <Email>{reviewerEmail}</Email>
     {agree === 'true' && (

packages/components-faraday/src/components/SignUp/SignUpStep0.js

@@ -105,9 +105,13 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
       <Row>
         <Text secondary small>
           This account information will be processed by us in accordance with
-          our Privacy Policy for the purpose of registering your Faraday account
-          and allowing you to use the services available via the Faraday
-          platform. Please read our Privacy Policy for further information.
+          our Privacy Policy for the purpose of registering your account and
+          allowing you to use the services available via the platform. Please
+          read our{' '}
+          <ActionLink to="https://www.hindawi.com/privacy/">
+            Privacy Policy{' '}
+          </ActionLink>{' '}
+          for further information.
         </Text>
       </Row>
 

packages/components-faraday/src/components/UserProfile/LinkOrcID.js

 import React from 'react'
+import { get } from 'lodash'
 import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 
@@ -14,24 +15,50 @@ import {
   withFetching,
 } from 'pubsweet-component-faraday-ui'
 
-const OrcidTooltip = () => (
+const ORCIDLinkTooltip = () => (
   <Text secondary>
-    ORCID provides a persistent identifier – an ORCID iD – that distinguishes
-    you from other researchers and a mechanism for linking your research outputs
-    and activities to your iD. Learn more at{' '}
-    <ActionLink to="https://orcid.org/help">orcid.org</ActionLink>
+    Hindawi is collecting your ORCID iD so we can ensure your work is
+    recognised. When you click the “Authorize” button, we will ask you to share
+    your iD using an authenticated process: either by{' '}
+    <ActionLink to="https://support.orcid.org/knowledgebase/topics/141838">
+      {' '}
+      registering for an ORCID iD{' '}
+    </ActionLink>{' '}
+    or, if you already have one, to{' '}
+    <ActionLink to="https://support.orcid.org/knowledgebase/topics/141838">
+      sign into your ORCID account{' '}
+    </ActionLink>, then granting us permission to get your ORCID iD. We do this
+    to ensure that you are correctly identified and securely connecting your
+    ORCID iD.
   </Text>
 )
 
-const LinkOrcID = ({ orcid = '', unlinkOrcid, id, ...rest }) => (
+const ORCIDDisplayTooltip = () => (
+  <Text secondary>
+    To acknowledge that you have used your iD and that it has been
+    authenticated, we display the ORCID iD icon alongside your name on our
+    website/in our publications/in our database etc. Learn more in{' '}
+    <ActionLink to="https://orcid.org/blog/2013/02/22/how-should-orcid-id-be-displayed">
+      {' '}
+      How should an ORCID iD be displayed
+    </ActionLink>.
+  </Text>
+)
+
+const LinkOrcID = ({ orcid = {}, unlinkOrcid, id, ...rest }) => (
   <ShadowedBox mt={2}>
     <Row alignItems="center">
       <Item alignItems="center">
-        <Label>ORCiD Account </Label>
-        <IconTooltip content={OrcidTooltip} iconSize={2} interactive primary />
+        <Label>ORCID iD </Label>
+        <IconTooltip
+          content={get(orcid, 'orcid') ? ORCIDDisplayTooltip : ORCIDLinkTooltip}
+          iconSize={2}
+          interactive
+          primary
+        />
       </Item>
       <Item justify="flex-end">
-        {orcid ? (
+        {orcid.orcid ? (
           <OpenModal
             confirmText="Unlink"
             onConfirm={unlinkOrcid}
@@ -47,16 +74,22 @@ const LinkOrcID = ({ orcid = '', unlinkOrcid, id, ...rest }) => (
       </Item>
     </Row>
 
-    {orcid && (
+    {orcid.orcid && (
       <Row>
         <Item>
           <Text>
-            <Img
-              alt="orcid_logo"
-              src="https://orcid.org/sites/default/files/images/orcid_16x16.png"
-            />
-            <ActionLink to={`https://orcid.org/${orcid}`}>
-              {`https://orcid.org/${orcid}`}
+            <a
+              href="https://orcid.org"
+              rel="noopener noreferrer"
+              target="_blank"
+            >
+              <Img
+                alt="ORCID Logo"
+                src="https://orcid.org/sites/default/files/images/orcid_16x16.png"
+              />
+            </a>
+            <ActionLink to={`https://orcid.org/${orcid.orcid}`}>
+              {`https://orcid.org/${orcid.orcid}`}
             </ActionLink>
           </Text>
         </Item>

packages/components-faraday/src/components/UserProfile/UserProfilePage.js

@@ -85,7 +85,7 @@ export default compose(
     }) => {
       setFetching(true)
       setModalError('')
-      saveUserDetails(user.id, { orcid: '' })
+      saveUserDetails(user.id, { orcid: {} })
         .then(() => {
           setFetching(false)
           hideModal()

packages/xpub-faraday/config/validations.js

@@ -130,7 +130,7 @@ module.exports = {
     },
   ],
   user: {
-    orcid: Joi.string().allow(''),
+    orcid: Joi.object(),
     name: Joi.string(),
     username: Joi.string(),
     isConfirmed: Joi.boolean(),