Merge branch '7.8' of github.com:gchq/stroom

Author: stroomdev66

stroom-security/stroom-security-impl/src/main/java/stroom/security/impl/OpenIdManager.java

@@ -14,7 +14,6 @@
 
 import jakarta.inject.Inject;
 import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpSession;
 import jakarta.ws.rs.core.UriBuilder;
 
 import java.util.List;
@@ -104,15 +103,14 @@ private String backChannelOIDC(final HttpServletRequest request,
         // If we have a state id then this should be a return from the auth service.
         LOGGER.debug(() -> LogUtil.message("We have the following backChannelOIDC state: {}", state));
 
-        final HttpSession session = request.getSession(false);
         UserAgentSessionUtil.set(request);
 
         final Optional<UserIdentity> optionalUserIdentity =
                 userIdentityFactory.getAuthFlowUserIdentity(request, code, state);
 
         if (optionalUserIdentity.isPresent()) {
             // Set the token in the session.
-            UserIdentitySessionUtil.set(session, optionalUserIdentity.get());
+            UserIdentitySessionUtil.set(request, optionalUserIdentity.get());
             loggedIn = true;
         }
 

unreleased_changes/20250401_122052_052__4842.md

@@ -0,0 +1,24 @@
+* Issue **#4842** : Fix null session when doing OIDC code flow with KeyCloak.
+
+
+```sh
+# ********************************************************************************
+# Issue title: OIDC code flow is broken when using Keycloack IDP
+# Issue link:  https://github.com/gchq/stroom/issues/4842
+# ********************************************************************************
+
+# ONLY the top line will be included as a change entry in the CHANGELOG.
+# The entry should be in GitHub flavour markdown and should be written on a SINGLE
+# line with no hard breaks. You can have multiple change files for a single GitHub issue.
+# The  entry should be written in the imperative mood, i.e. 'Fix nasty bug' rather than
+# 'Fixed nasty bug'.
+#
+# Examples of acceptable entries are:
+#
+#
+# * Issue **123** : Fix bug with an associated GitHub issue in this repository
+#
+# * Issue **namespace/other-repo#456** : Fix bug with an associated GitHub issue in another repository
+#
+# * Fix bug with no associated GitHub issue.
+```