fix(profile): view all notifications display

Author: polonel

src/client/containers/Modals/ViewAllNotificationsModal.jsx

@@ -28,6 +28,7 @@ import BaseModal from 'containers/Modals/BaseModal'
 import Button from 'components/Button'
 
 import helpers from 'lib/helpers'
+import history from 'lib/lib-history'
 
 @observer
 class ViewAllNotificationsModal extends React.Component {
@@ -41,7 +42,7 @@ class ViewAllNotificationsModal extends React.Component {
   componentDidMount () {
     helpers.hideAllpDropDowns()
     axios
-      .get('/api/v1/users/notifications')
+      .get('/api/v2/accounts/profile/notifications')
       .then(res => {
         this.notifications = res.data.notifications
       })
@@ -57,7 +58,7 @@ class ViewAllNotificationsModal extends React.Component {
 
     this.props.hideModal()
     this.props.socket.emit(NOTIFICATIONS_MARK_READ, notification._id)
-    History.pushState(null, null, `/tickets/${notification.data.ticket.uid}`)
+    history.push(`/tickets/${notification.data.ticket.uid}`)
   }
 
   render () {

src/controllers/api/v2/accounts.js

@@ -22,7 +22,7 @@ const Group = require('../../../models').GroupModel
 const Team = require('../../../models').TeamModel
 const Department = require('../../../models').DepartmentModel
 const passwordComplexity = require('../../../settings/passwordComplexity')
-const { RoleModel, RoleOrderModel } = require('../../../models')
+const { RoleModel, RoleOrderModel, NotificationModel } = require('../../../models')
 
 const accountsApi = {}
 
@@ -472,6 +472,16 @@ accountsApi.updatePassword = async (req, res) => {
   }
 }
 
+accountsApi.userNotifications = async (req, res) => {
+  try {
+    const notifications = await NotificationModel.findAllForUser(req.user._id)
+
+    return apiUtil.sendApiSuccess(res, { notifications })
+  } catch (err) {
+    return apiUtil.sendApiError(res, 500, err)
+  }
+}
+
 accountsApi.getRoles = async (req, res) => {
   try {
     const roles = await RoleModel.find({})

src/controllers/api/v2/routes.js

@@ -39,6 +39,7 @@ module.exports = function (middleware, router, controllers) {
   router.post('/api/v2/accounts/profile/mfa/verify', apiv2Auth, csrfCheck, apiv2.accounts.verifyMFA)
   router.post('/api/v2/accounts/profile/mfa/disable', apiv2Auth, csrfCheck, apiv2.accounts.disableMFA)
   router.post('/api/v2/accounts/profile/update-password', apiv2Auth, csrfCheck, apiv2.accounts.updatePassword)
+  router.get('/api/v2/accounts/profile/notifications', apiv2Auth, apiv2.accounts.userNotifications)
   router.put('/api/v2/accounts/:username', apiv2Auth, canUser('accounts:update'), apiv2.accounts.update)
 
   // Account Roles