Skip to content

Fixed logout for okta #57

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

Closed
k----n wants to merge 1 commit into from
Closed

Fixed logout for okta #57

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
30 changes: 27 additions & 3 deletions src/main/java/eu/openanalytics/containerproxy/auth/impl/OpenIDAuthenticationBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,34 @@ public String getLoginRedirectURI() {
+ OAuth2AuthorizationRequestRedirectFilter.DEFAULT_AUTHORIZATION_REQUEST_BASE_URI
+ "/" + REG_ID;
}


private String getIdToken() {
Authentication auth = SecurityContextHolder.getContext().getAuthentication();
if (auth == null) return "";

OidcUser user = (OidcUser) auth.getPrincipal();
return user.getIdToken().getTokenValue();
}

@Override
public String getLogoutSuccessURL() {
public String getLogoutURL() {
String logoutURL = environment.getProperty("proxy.openid.logout-url");
String providerLogoutURL = environment.getProperty("proxy.openid.provider-logout-url");
String provider = environment.getProperty("proxy.openid.provider");

if (providerLogoutURL == null || providerLogoutURL.trim().isEmpty()) {
return "/logout";
} else if (provider.trim().equals("okta")) {
providerLogoutURL += "?id_token_hint=" + getIdToken();
providerLogoutURL += "&post_logout_redirect_uri=" + logoutURL;
}

return providerLogoutURL;
}

@Override
public String getLogoutSuccessURL() {
String logoutURL = environment.getProperty("proxy.openid.logout-success-url");
if (logoutURL == null || logoutURL.trim().isEmpty()) logoutURL = IAuthenticationBackend.super.getLogoutSuccessURL();
return logoutURL;
}
Expand Down Expand Up @@ -172,7 +196,7 @@ protected ClientRegistrationRepository createClientRepo() {
if (scope == null) break;
else scopes.add(scope);
}

ClientRegistration client = ClientRegistration.withRegistrationId(REG_ID)
.authorizationGrantType(AuthorizationGrantType.AUTHORIZATION_CODE)
.clientName(REG_ID)
Expand Down