NemID fields populate caching issue

Author: stankut

CHANGELOG.md

@@ -11,6 +11,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- Fixed NemID fields populate caching issue
+
 - Fixed issue with wrong authorization provider used when multiple are enabled
 
 ## [3.8.0] 2023-07-12

modules/os2forms_nemid/src/EventSubscriber/NemloginRedirectSubscriber.php

@@ -147,6 +147,9 @@ public function redirectToNemlogin(GetResponseEvent $event) {
       return;
     }
 
+    // Killing cache on webform so that populated values are never cached.
+    $this->pageCacheKillSwitch->trigger();
+
     $webformNemidSettings = $webform->getThirdPartySetting('os2forms', 'os2forms_nemid');
 
     // Getting nemlogin_auto_redirect setting.
@@ -156,10 +159,6 @@ public function redirectToNemlogin(GetResponseEvent $event) {
     }
     // Checking if $nemlogin_auto_redirect is on.
     if ($nemlogin_auto_redirect) {
-      // Killing cache so that positive or negative redirect decision is not
-      // cached.
-      $this->pageCacheKillSwitch->trigger();
-
       // Getting auth plugin ID override.
       $authPluginId = NULL;
       if (isset($webformNemidSettings['session_type']) && !empty($webformNemidSettings['session_type'])) {