Revert request passing change

TatuLund · May 28, 2024 · 6acc44d · 6acc44d
1 parent 7cfe081
commit 6acc44d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java b/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/VaadinCreateUI.java
@@ -72,13 +72,13 @@ protected void init(VaadinRequest request) {
     }
 
     private void showLoginView(VaadinRequest request) {
-        setContent(new LoginView(getAccessControl(), e -> onLogin(request)));
+        setContent(new LoginView(getAccessControl(), e -> onLogin()));
     }
 
-    private void onLogin(VaadinRequest request) {
+    private void onLogin() {
         target = getInitialTarget();
         logger.info("Initial target '{}'", target);
-        Utils.sessionFixation(request);
+        Utils.sessionFixation();
         getPage().reload();
         showAppLayout();
     }

diff --git a/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/util/Utils.java b/vaadincreate-ui/src/main/java/org/vaadin/tatu/vaadincreate/util/Utils.java
@@ -20,9 +20,9 @@ public static String sanitize(String unsanitized) {
         return text;
     }
 
-    public static void sessionFixation(VaadinRequest vaadinRequest) {
+    public static void sessionFixation() {
         UI.getCurrent().getPushConfiguration().setPushMode(PushMode.DISABLED);
-        VaadinServletRequest request = (VaadinServletRequest) vaadinRequest;
+        VaadinServletRequest request = (VaadinServletRequest) VaadinRequest.getCurrent();
         request.getHttpServletRequest().changeSessionId();
         UI.getCurrent().getPushConfiguration().setPushMode(PushMode.AUTOMATIC);
     }