Skip to content

Fix 500 error when open XUI console in another tab #584 #587

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vharseko merged 1 commit into from
Feb 20, 2023
Merged

Fix 500 error when open XUI console in another tab #584 #587

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ...re-rest/src/main/java/org/forgerock/openam/core/rest/authn/RestAuthenticationHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ >>>>>>> cafd23ed69... Remove an input parameter included in exception message (#
import org.forgerock.json.resource.ResourceException;
import org.forgerock.openam.audit.context.AuditRequestContext;
import org.forgerock.openam.core.CoreWrapper;
import org.forgerock.openam.core.rest.authn.core.AuthIndexType;
import org.forgerock.openam.core.rest.authn.core.AuthenticationContext;
import org.forgerock.openam.core.rest.authn.core.LoginAuthenticator;
import org.forgerock.openam.core.rest.authn.core.LoginConfiguration;
import org.forgerock.openam.core.rest.authn.core.LoginProcess;
import org.forgerock.openam.core.rest.authn.core.*;
import org.forgerock.openam.core.rest.authn.core.wrappers.CoreServicesWrapper;
import org.forgerock.openam.core.rest.authn.exceptions.RestAuthErrorCodeException;
import org.forgerock.openam.core.rest.authn.exceptions.RestAuthException;
Expand All @@ -73,7 +69,7 @@ public class RestAuthenticationHandler {

private final CoreServicesWrapper coreServicesWrapper;
private final RedirectUrlValidator<String> urlValidator =
new RedirectUrlValidator<String>(ValidGotoUrlExtractor.getInstance());
new RedirectUrlValidator<>(ValidGotoUrlExtractor.getInstance());

/**
* Constructs an instance of the RestAuthenticationHandler.
Expand Down Expand Up @@ -385,8 +381,10 @@ private AuthIndexType getAuthIndexType(String authIndexType) throws RestAuthExce
}

private void setCookies(LoginProcess loginProcess, HttpServletRequest request, HttpServletResponse response) throws AuthException {
coreServicesWrapper.setAuthCookie(loginProcess.getAuthContext().getAuthContext(), request, response);
coreServicesWrapper.setLbCookie(loginProcess.getAuthContext().getAuthContext(), request, response);
if(!(loginProcess instanceof CompletedLoginProcess)) {
coreServicesWrapper.setAuthCookie(loginProcess.getAuthContext().getAuthContext(), request, response);
coreServicesWrapper.setLbCookie(loginProcess.getAuthContext().getAuthContext(), request, response);
}
switch (loginProcess.getLoginStage()) {
case REQUIREMENTS_WAITING:
break;
Expand Down