From 8ecfd6ed35b39bfad72348e9d7a018b5d2dffdb7 Mon Sep 17 00:00:00 2001
From: "k.triantafyllou" <k.triantafyllou@di.uoa.gr>
Date: Tue, 23 Nov 2021 13:45:16 +0000
Subject: [PATCH] Fix null pointer exception in cookies

---
 .../utils/AuthorizationUtils.java                     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
index 8add38c..6e401dd 100644
--- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
+++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/utils/AuthorizationUtils.java
@@ -54,11 +54,14 @@ public class AuthorizationUtils {
 
     private boolean hasCookie(HttpServletRequest request) {
         Cookie[] cookies = request.getCookies();
-        if(securityConfig.isDeprecated()) {
-            return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(TOKEN));
-        } else {
-            return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(SESSION));
+        if(cookies != null) {
+            if (securityConfig.isDeprecated()) {
+                return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(TOKEN));
+            } else {
+                return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(SESSION));
+            }
         }
+        return false;
     }
 
     private HttpEntity<HttpHeaders> createHeaders(HttpServletRequest request) {