Merge pull request #18 from dschaafsma1/develop

ENT-5279: SSO notification seems to log 'SSONOT_FAILED' when successful

Author: tbeekman

oc-sso-notificatie/src/main/java/nl/kennisnet/services/web/controller/SsoNotificationController.java

@@ -81,6 +81,8 @@ public class SsoNotificationController {
 
     private static final String SSONOT_FAILED = "SSONOT_FAILED";
 
+    private static final String SSONOT_INITIATED = "SSONOT_INITIATED";
+
     private static final String SSONOT_REDIRECT = "SSONOT_REDIRECT";
 
     private static final String SSONOT_SUCCESS= "SSONOT_SUCCESS";
@@ -128,11 +130,14 @@ public void processSsoNotification(@RequestParam(required = false) String id,
                                        HttpServletRequest request, HttpServletResponse response)
             throws IOException {
 
+        // Add IdP id to logback and initiate
+        MDC.put(IDP, String.valueOf(id));
+        MDC.put(EVENT, SSONOT_INITIATED);
+
         LOGGER.info("Request received with id ('{}') url ('{}') redirectUri ('{}') referrer ('{}') realm ('{}') " +
                 "notificationCookie ('{}')", id, url, redirectUri, referrer, realm, notificationCookie);
 
-        // Add IdP id to logback and set default to failed
-        MDC.put(IDP, String.valueOf(id));
+        // Set default to failed
         MDC.put(EVENT, SSONOT_FAILED);
 
         List<IdP> remoteSsoNotifications = idPProvider.getAllSsoNotifications();
@@ -158,6 +163,7 @@ public void processSsoNotification(@RequestParam(required = false) String id,
         URL createdUrl = determineAndVerifyURL(idp, url, referrer);
 
         // Set notification cookie
+        MDC.put(EVENT, SSONOT_SUCCESS);
         LOGGER.info("Setting notification Cookie ('{}') for id ('{}') with url ('{}') and realm ('{}')",
                 COOKIE_NOTIFICATION, id, createdUrl, realm);
 
@@ -171,7 +177,6 @@ public void processSsoNotification(@RequestParam(required = false) String id,
             response.sendRedirect(redirectUri);
             return;
         }
-        MDC.put(EVENT, SSONOT_SUCCESS);
         EVENT_LOGGER.info("Finished without redirecting");
     }
 

release/src/site/markdown/docs/2.3.8-SNAPSHOT/release-notes.md

@@ -13,7 +13,7 @@
 
 | #        | Description                                                   |
 |:---------|:--------------------------------------------------------------|
-| ENT-XXXX |                                                               |
+| ENT-5279 | SSO notification seems to log 'SSONOT_FAILED' when successful |
 
 
 ## Configuration changes