We should not store notificaitons information in the Session

ORCID · Oct 29, 2024 · 1eb2a9c · 1eb2a9c
1 parent 3d52213
commit 1eb2a9c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 58 deletions.
diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/NotificationController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/NotificationController.java
@@ -10,6 +10,8 @@
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.StringUtils;
+import org.ehcache.UserManagedCache;
+import org.ehcache.config.builders.UserManagedCacheBuilder;
 import org.orcid.core.common.manager.EmailFrequencyManager;
 import org.orcid.core.manager.ClientDetailsEntityCacheManager;
 import org.orcid.core.manager.EncryptionManager;
@@ -18,7 +20,6 @@
 import org.orcid.core.manager.v3.NotificationManager;
 import org.orcid.core.manager.v3.read_only.EmailManagerReadOnly;
 import org.orcid.core.oauth.OrcidProfileUserDetails;
-import org.orcid.frontend.web.controllers.helper.UserSession;
 import org.orcid.jaxb.model.v3.release.common.Source;
 import org.orcid.jaxb.model.v3.release.common.SourceClientId;
 import org.orcid.jaxb.model.v3.release.notification.Notification;
@@ -55,9 +56,6 @@ public class NotificationController extends BaseController {
     @Resource
     private ClientDetailsEntityCacheManager clientDetailsEntityCacheManager;
 
-    @Resource
-    private UserSession userSession;
-
     @Resource
     private PreferenceManager preferenceManager;
 
@@ -75,6 +73,13 @@ public ModelAndView getNotifications() {
         return new ModelAndView("notifications");
     }
 
+    UserManagedCache<String, Boolean> isObsoleteNotificationAlertsCheckDone =
+            UserManagedCacheBuilder.newUserManagedCacheBuilder(String.class, Boolean.class).build(true);
+
+    public void shutdown() {
+        isObsoleteNotificationAlertsCheckDone.close();
+    }
+
     @RequestMapping("/notifications.json")
     public @ResponseBody List<Notification> getNotificationsJson(@RequestParam(value = "firstResult", defaultValue = "0") int firstResult,
             @RequestParam(value = "maxResults", defaultValue = "10") int maxResults,
@@ -88,20 +93,10 @@ public ModelAndView getNotifications() {
         return notifications;
     }
 
-    @RequestMapping("/notification-alerts.json")
-    public @ResponseBody List<Notification> getNotificationAlertJson() {
-        String currentOrcid = getCurrentUserOrcid();
-        List<Notification> notifications = notificationManager.findNotificationAlertsByOrcid(currentOrcid);
-        notifications = archiveObsoleteNotifications(currentOrcid, notifications);
-        notifications = notifications.stream().filter(n -> !userSession.getSuppressedNotificationAlertIds().contains(n.getPutCode())).collect(Collectors.toList());
-        addSubjectToNotifications(notifications);
-        return notifications;
-    }
-
     private List<Notification> archiveObsoleteNotifications(String currentOrcid, List<Notification> notifications) {
-        if (!userSession.isObsoleteNotificationAlertsCheckDone()) {
+        if (!isObsoleteNotificationAlertsCheckDone.containsKey(currentOrcid)) {
             notifications = notificationManager.filterActionedNotificationAlerts(notifications, currentOrcid);
-            userSession.setObsoleteNotificationAlertsCheckDone(true);
+            isObsoleteNotificationAlertsCheckDone.putIfAbsent(currentOrcid, Boolean.TRUE);
         }
         return notifications;
     }
@@ -197,12 +192,6 @@ public ModelAndView executeAction(@PathVariable("encryptedId") String encryptedI
         notificationManager.setActionedAndReadDate(notificationOrcid, id);
         return new ModelAndView("redirect:" + redirectUrl);
     }
-
-    @RequestMapping(value = "{id}/suppressAlert.json")
-    public @ResponseBody void suppressAlert(HttpServletResponse response, @PathVariable("id") String id) {
-        userSession.getSuppressedNotificationAlertIds().add(Long.valueOf(id));
-        response.addHeader("X-Robots-Tag", "noindex");
-    }    
 
     @RequestMapping(value = "/frequencies/view", method = RequestMethod.GET)
     public @ResponseBody Map<String, String> getNotificationFrequencies() {

diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/helper/UserSession.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/helper/UserSession.java
diff --git a/orcid-web/src/main/resources/orcid-frontend-web-servlet.xml b/orcid-web/src/main/resources/orcid-frontend-web-servlet.xml
@@ -79,11 +79,7 @@
     	<constructor-arg value="${org.orcid.recaptcha.verify_url}" />
     	<constructor-arg value="${org.orcid.recaptcha.secret}" />
     </bean>
-
-    <bean id="userSession" class="org.orcid.frontend.web.controllers.helper.UserSession" scope="session">
-        <aop:scoped-proxy/>
-    </bean>
-
+
     <bean id="worksPaginator" class="org.orcid.frontend.web.pagination.WorksPaginator" >
         <property name="worksCacheManager" ref="worksCacheManager" />
         <property name="worksExtendedCacheManager" ref="worksExtendedCacheManager" />