Skip to content
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

Fix the issue of password expiry event trigger of PasswordGrantHandler #2659

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix the issue of password expiry event trigger of PasswordGrantHandler #2659

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
16 changes: 8 additions & 8 deletions .../main/java/org/wso2/carbon/identity/oauth2/token/handlers/grant/PasswordGrantHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,11 @@ private Optional<AuthenticatedUser> authenticateUserAtUserStore(OAuth2AccessTok
if (log.isDebugEnabled()) {
log.debug("user " + tokenReq.getResourceOwnerUsername() + " authenticated: " + authenticated);
}
triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, true);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
if (authenticated) {
AuthenticatedUser authenticatedUser =
new AuthenticatedUser(authenticationResult.getAuthenticatedUser().get());
Expand All @@ -178,11 +183,6 @@ private Optional<AuthenticatedUser> authenticateUserAtUserStore(OAuth2AccessTok
return Optional.of(authenticatedUser);
}

triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, true);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
return Optional.empty();
}

Expand Down Expand Up @@ -387,14 +387,14 @@ private AuthenticatedUser validateUserCredentials(OAuth2AccessTokenReqDTO tokenR
authenticatedUser = authenticateUserAtUserStore(tokenReq, userId, userStoreManager,
tenantAwareUserName, isPublishPasswordGrantLoginEnabled, userTenantDomain, serviceProvider);
}
if (authenticatedUser.isPresent()) {
return authenticatedUser.get();
}
triggerPasswordExpiryValidationEvent(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT, tenantAwareUserName,
userTenantDomain, userStoreManager, false);
if (log.isDebugEnabled()) {
log.debug(PASSWORD_GRANT_POST_AUTHENTICATION_EVENT + " event is triggered");
}
if (authenticatedUser.isPresent()) {
return authenticatedUser.get();
}
if (isPublishPasswordGrantLoginEnabled) {
publishAuthenticationData(tokenReq, false, serviceProvider);
}
Expand Down
Loading