Add check for principal not null in SecurityService

jcartign
1 parent f130c6a2
Showing 1 changed file with 12 additions and 3 deletions Show diff stats
src/main/java/fr/plil/sio/web/mvc/SecurityServiceImpl.java
@@ -3,6 +3,7 @@ package fr.plil.sio.web.mvc;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
@@ -14,10 +15,18 @@ public class SecurityServiceImpl implements SecurityService{
     @Override
     public String findLoggedInUsername() {
-        Object userDetails = SecurityContextHolder.getContext().getAuthentication().getPrincipal();
-        if (userDetails instanceof UserDetails) {
-            return ((UserDetails)userDetails).getUsername();
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+
+        if(authentication == null) {
+            return null;
         }
+
+        Object principal = authentication.getPrincipal();
+
+        if (principal instanceof UserDetails) {
+            return ((UserDetails)principal).getUsername();
+        }
+
         logger.warn("cannot find logged user");
         return null;
     }