saulteafarmer/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Stirling-Tools/Stirling-PDF.git synced 2025-05-24 19:02:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
Anthony Stirling 2024-09-06 19:06:00 +02:00
parent 7ccb4d59b0
commit 8ea179e3e6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/stirling/software/SPDF/config/security/CustomAuthenticationSuccessHandler.java
View File

@ -45,7 +45,15 @@ public class CustomAuthenticationSuccessHandler
? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST") ? (SavedRequest) session.getAttribute("SPRING_SECURITY_SAVED_REQUEST")
: null; : null;
if (savedRequest != null // Check for the stored previous page URL
String previousPageUrl = (session != null) ? (String) session.getAttribute("PREVIOUS_PAGE_URL") : null;
if (previousPageUrl != null) {
// Redirect to the stored previous page URL
getRedirectStrategy().sendRedirect(request, response, previousPageUrl);
// Remove the stored previous page URL from the session
session.removeAttribute("PREVIOUS_PAGE_URL");
} else if (savedRequest != null
&& !RequestUriUtils.isStaticResource( && !RequestUriUtils.isStaticResource(
request.getContextPath(), savedRequest.getRedirectUrl())) { request.getContextPath(), savedRequest.getRedirectUrl())) {
// Redirect to the original destination // Redirect to the original destination

8
src/main/java/stirling/software/SPDF/controller/web/AccountWebController.java
View File

@ -20,6 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpSession;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import stirling.software.SPDF.config.security.session.SessionPersistentRegistry; import stirling.software.SPDF.config.security.session.SessionPersistentRegistry;
import stirling.software.SPDF.model.*; import stirling.software.SPDF.model.*;
@ -49,6 +50,13 @@ public class AccountWebController {
return "redirect:/"; return "redirect:/";
} }
// Store the previous page URL in the session before redirecting to the login page
HttpSession session = request.getSession();
String referer = request.getHeader("Referer");
if (referer != null && !referer.contains("/login")) {
session.setAttribute("PREVIOUS_PAGE_URL", referer);
}
Map<String, String> providerList = new HashMap<>(); Map<String, String> providerList = new HashMap<>();
OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2(); OAUTH2 oauth = applicationProperties.getSecurity().getOAUTH2();