[breaking] sessions - Returning 404 on GET /sessions/current when no …

…session is defined on current request
restx · Aug 21, 2017 · 8c14dff · 8c14dff
1 parent 46f8b58
commit 8c14dff
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/restx-security-basic/src/main/java/restx/security/SessionResource.java b/restx-security-basic/src/main/java/restx/security/SessionResource.java
@@ -61,11 +61,15 @@ public Session authenticate(Map session) {
     }
 
     @GET("/sessions/current")
-    public Session currentSession() {
+    public Optional<Session> currentSession() {
-        String sessionKey = RestxSession.current().get(String.class, Session.SESSION_DEF_KEY).get();
+        Optional<String> sessionKey = RestxSession.current().get(String.class, Session.SESSION_DEF_KEY);
-        RestxPrincipal principal = RestxSession.current().getPrincipal().get();
+        Optional<? extends RestxPrincipal> principal = RestxSession.current().getPrincipal();
 
-        return new Session(sessionKey, principal);
+        if(!sessionKey.isPresent() || !principal.isPresent()) {
+            return Optional.absent();
+        }
+
+        return Optional.of(new Session(sessionKey.get(), principal.get()));
     }
 
     @PermitAll