From ac6c86ddd482721e7011dcb727e4099b8cdf84b1 Mon Sep 17 00:00:00 2001
From: Alexander Alexeev
Date: Sun, 11 Dec 2016 00:52:57 +0700
Subject: anonymous user support

---
 .../com/juick/api/controllers/Notifications.java   | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'juick-api/src/main/java/com/juick/api/controllers/Notifications.java')

diff --git a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
index cd31ad39..9f2f675b 100644
--- a/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
+++ b/juick-api/src/main/java/com/juick/api/controllers/Notifications.java
@@ -4,10 +4,10 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.juick.Message;
 import com.juick.User;
-import com.juick.server.util.HttpBadRequestException;
-import com.juick.server.util.HttpForbiddenException;
 import com.juick.server.helpers.Status;
 import com.juick.server.helpers.TokensList;
+import com.juick.server.util.HttpBadRequestException;
+import com.juick.server.util.HttpForbiddenException;
 import com.juick.service.MessagesService;
 import com.juick.service.PushQueriesService;
 import com.juick.service.SubscriptionService;
@@ -42,12 +42,10 @@ public class Notifications {
 
     @RequestMapping(value = "/notifications", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public ResponseEntity<List<String>> doGet(
-            Principal principal,
             @RequestParam String type,
             @RequestParam(required = false, defaultValue = "0") int uid,
             @RequestParam(required = false, defaultValue = "0") int mid) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         if ((visitor.getUid() == 0) || !(visitor.getName().equals("juick"))) {
             throw new HttpForbiddenException();
         }
@@ -95,10 +93,8 @@ public class Notifications {
 
     @RequestMapping(value = "/notifications", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doDelete(
-            Principal principal,
             @RequestBody String requestBody) throws IOException {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         // FIXME: it is possible to delete other user's tokens
         if ((visitor.getUid() == 0) || !(visitor.getName().equals("juick"))) {
             throw new HttpForbiddenException();
@@ -124,12 +120,11 @@ public class Notifications {
 
         return Status.OK;
     }
+
     @RequestMapping(value = "/notifications", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doPut(
-            Principal principal,
             @RequestBody String requestBody) throws IOException {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         if (visitor.getUid() == 0) {
             throw new HttpForbiddenException();
         }
@@ -153,35 +148,36 @@ public class Notifications {
         }
         return Status.OK;
     }
+
     @Deprecated
     @RequestMapping(value = "/android/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doAndroidRegister(
-            Principal principal,
             @RequestParam(name = "regid") String regId) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         if (visitor.getUid() == 0) {
             throw new HttpForbiddenException();
         }
         pushQueriesService.addGCMToken(visitor.getUid(), regId);
         return Status.OK;
     }
+
     @Deprecated
     @RequestMapping(value = "/android/unregister", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doAndroidUnRegister(@RequestParam(name = "regid") String regId) {
         pushQueriesService.deleteGCMToken(regId);
         return Status.OK;
     }
+
     @Deprecated
     @RequestMapping(value = "/winphone/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doWinphoneRegister(
             Principal principal,
             @RequestParam(name = "url") String regId) {
-        String name = UserUtils.getUsername(principal, null);
-        User visitor = userService.getUserByName(name);
+        User visitor = UserUtils.getCurrentUser();
         pushQueriesService.addMPNSToken(visitor.getUid(), regId);
         return Status.OK;
     }
+
     @Deprecated
     @RequestMapping(value = "/winphone/unregister", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public Status doWinphoneUnRegister(@RequestParam(name = "url") String regId) {
-- 
cgit v1.2.3