Check permissions for REST API calls

1 files changed, 14 insertions, 21 deletions

diff --git a/src/org/traccar/api/resource/SessionResource.java b/src/org/traccar/api/resource/SessionResource.java
index 554b6760e..745088a4d 100644
--- a/src/org/traccar/api/resource/SessionResource.java
+++ b/src/org/traccar/api/resource/SessionResource.java
@@ -45,32 +45,25 @@ public class SessionResource extends BaseResource {
 
     @PermitAll
     @GET
-    public User get() {
-        try {
-            Long userId = (Long) request.getSession().getAttribute(USER_ID_KEY);
-            if (userId != null) {
-                return Context.getDataManager().getUser(userId);
-            } else {
-                throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build());
-            }
-        } catch (SQLException e) {
-            throw new WebApplicationException(e);
+    public User get() throws SQLException {
+        Long userId = (Long) request.getSession().getAttribute(USER_ID_KEY);
+        if (userId != null) {
+            return Context.getDataManager().getUser(userId);
+        } else {
+            throw new WebApplicationException(Response.status(Response.Status.NOT_FOUND).build());
         }
     }
 
     @PermitAll
     @POST
-    public User add(@FormParam("email") String email, @FormParam("password") String password) {
-        try {
-            User user = Context.getDataManager().login(email, password);
-            if (user != null) {
-                request.getSession().setAttribute(USER_ID_KEY, user.getId());
-                return user;
-            } else {
-                throw new WebApplicationException(Response.status(Response.Status.UNAUTHORIZED).build());
-            }
-        } catch (SQLException e) {
-            throw new WebApplicationException(e);
+    public User add(
+            @FormParam("email") String email, @FormParam("password") String password) throws SQLException {
+        User user = Context.getDataManager().login(email, password);
+        if (user != null) {
+            request.getSession().setAttribute(USER_ID_KEY, user.getId());
+            return user;
+        } else {
+            throw new WebApplicationException(Response.status(Response.Status.UNAUTHORIZED).build());
         }
     }