From 2bb6e3a94cf486a7187b60f41ba158c11a1644a2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Wed, 22 Jun 2022 16:05:10 +0200
Subject: [PATCH] fix user Service - no NPE if SecureContext is missing
---
.../ozg/pluto/common/callcontext/CurrentUserService.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
index bc469f45b..3d4189226 100644
--- a/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
+++ b/pluto-server/src/main/java/de/itvsh/ozg/pluto/common/callcontext/CurrentUserService.java
@@ -36,12 +36,13 @@ public class CurrentUserService {
}
}
- public Optional<Authentication> getAuthentication() {
+ public Optional<Authentication> findAuthentication() {
return findTrustedAuthentication();
}
Optional<Authentication> findTrustedAuthentication() {
- return Optional.ofNullable(SecurityContextHolder.getContext().getAuthentication())
+ return Optional.ofNullable(SecurityContextHolder.getContext())
+ .map(context -> context.getAuthentication())
.filter(auth -> !trustResolver.isAnonymous(auth))
.filter(Authentication::isAuthenticated);
}
--
GitLab