feat(email-subscription): send user id and remove auth bearer

packages/component-user-manager/src/Users.js

@@ -154,7 +154,6 @@ const Users = app => {
    */
   app.patch(
     '/api/users/subscriptions',
-    authBearer,
     require('./routes/users/subscriptions')(app.locals.models),
   )
 

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

 const { services } = require('pubsweet-component-helper-service')
 
 module.exports = models => async (req, res) => {
-  const { isUnsubscribed } = req.body
+  const { isUnsubscribed, id } = req.body
 
-  if (!services.checkForUndefinedParams(isUnsubscribed))
+  if (!services.checkForUndefinedParams(isUnsubscribed, id))
     return res.status(400).json({ error: 'Missing required params.' })
 
   let user
   try {
-    user = await models.User.find(req.user)
+    user = await models.User.find(id)
     user.isUnsubscribed = isUnsubscribed
     user = await user.save()
 

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

@@ -36,23 +36,33 @@ export default compose(
     modalComponent: ConfirmationModal,
   })),
   withHandlers({
-    subscribe: ({ showModal, hideModal, changeEmailSubscription }) => () => {
+    subscribe: ({
+      userId,
+      showModal,
+      hideModal,
+      changeEmailSubscription,
+    }) => () => {
       showModal({
         title: 'Subscribe to emails',
         subtitle: 'Are you sure you want to subscribe to emails?',
         onConfirm: () => {
-          changeEmailSubscription(false)
+          changeEmailSubscription(userId, false)
           hideModal()
         },
         onCancel: hideModal,
       })
     },
-    unsubscribe: ({ showModal, hideModal, changeEmailSubscription }) => () => {
+    unsubscribe: ({
+      userId,
+      showModal,
+      hideModal,
+      changeEmailSubscription,
+    }) => () => {
       showModal({
         title: 'Unsubscribe from emails',
         subtitle: 'Are you sure you want to unsubscribe from emails?',
         onConfirm: () => {
-          changeEmailSubscription(true)
+          changeEmailSubscription(userId, true)
           hideModal()
         },
         onCancel: hideModal,

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

@@ -24,6 +24,7 @@ const UserProfilePage = ({ history, user, changeEmailSubscription }) => (
     <EmailNotifications
       changeEmailSubscription={changeEmailSubscription}
       subscribed={!get(user, 'isUnsubscribed')}
+      userId={get(user, 'id')}
     />
     <LinkOrcID id={get(user, 'id')} orcid={get(user, 'orcid')} />
   </Root>

packages/components-faraday/src/redux/users.js

@@ -22,8 +22,12 @@ export const confirmUser = (userId, confirmationToken) => dispatch =>
     return dispatch(loginSuccess(user))
   })
 
-export const changeEmailSubscription = isUnsubscribed => dispatch => {
+export const changeEmailSubscription = (
+  id,
+  isUnsubscribed = false,
+) => dispatch => {
   update(`/users/subscriptions`, {
+    id,
     isUnsubscribed,
   }).then(() => dispatch(actions.getCurrentUser()))
 }