Merge pull request #329 from xdev-software/develop

release

Author: AB-xdev

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.2.3
+* oauth2-oidc-remember-me
+  * Fix NPE in `FastCookieFinder`
+
 # 2.2.2
 * oauth2-oidc-remember-me
   * Handle cookie path correctly

demo/pom.xml

@@ -22,7 +22,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
 		<!-- Dependency Version Groups -->
-		<com.vaadin.version>25.1.2</com.vaadin.version>
+		<com.vaadin.version>25.1.3</com.vaadin.version>
 
 		<org.springframework.boot.version>4.0.5</org.springframework.boot.version>
 	</properties>

oauth2-oidc/src/main/java/software/xdev/sse/oauth2/util/FastCookieFinder.java

@@ -29,9 +29,17 @@ public static Optional<Cookie> findCookie(final HttpServletRequest request, fina
 		return Optional.ofNullable(request.getHeader("Cookie"))
 			// Quick check if value is present
 			.filter(h -> h.contains(cookieName))
-			.flatMap(x -> Stream.of(request.getCookies())
-				.filter(c -> cookieName.equals(c.getName()))
-				.findFirst());
+			.flatMap(x -> {
+				final Cookie[] cookies = request.getCookies();
+				if(cookies == null)
+				{
+					return Optional.empty();
+				}
+				
+				return Stream.of(cookies)
+					.filter(c -> cookieName.equals(c.getName()))
+					.findFirst();
+			});
 	}
 
 	private FastCookieFinder()

vaadin/pom.xml

@@ -62,7 +62,7 @@
 			<dependency>
 				<groupId>com.vaadin</groupId>
 				<artifactId>vaadin-bom</artifactId>
-				<version>25.1.2</version>
+				<version>25.1.3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>