Add user activity check before substitution #2220
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
alx-mag
changed the title
dtsaryov
suggested changes
Jul 1, 2019
| * @param user user to check | ||
| * @return true if user is active | ||
| */ | ||
| boolean isUserActive(User user); |
There was a problem hiding this comment.
Please move a code from AuthenticationManager & AuthenticationService to UserManagementService
| @Override | ||
| public boolean isUserActive(User user) { | ||
| try (Transaction ignored = persistence.createTransaction()) { | ||
| User foundUser = persistence.getEntityManager().find(User.class, user.getId()); |
| @@ -42,25 +44,36 @@ public ChangeSubstUserAction(User user) { | |||
| public void actionPerform(com.haulmont.cuba.gui.components.Component component) { | |||
| AppUI ui = AppUI.getCurrent(); | |||
|
|
|||
| WebScreens screens = (WebScreens) ui.getScreens(); | |||
| if (!isUserActive(user)) { | |||
There was a problem hiding this comment.
Let's fail fast:
if (notActive) {
showNotification()
doRevert();
return;
}
WebScreens screens = ...| }) | ||
| .otherwise(this::doRevert); | ||
| private static boolean isUserActive(User user) { | ||
| return AppBeans.<AuthenticationService>get(AuthenticationService.NAME).isUserActive(user); |
There was a problem hiding this comment.
T foo = AppBeans.get(T.class);
| @@ -73,4 +73,11 @@ | |||
| * @throws NoUserSessionException if session is absent or expired | |||
| */ | |||
| void logout(); | |||
|
|
|||
| /** | |||
| * Check if user is active | |||
There was a problem hiding this comment.
Omit this part when the @return has the same description
| return authenticationManager.isUserActive(user); | ||
| } | ||
|
|
||
|
|
| @@ -73,4 +73,11 @@ | |||
| * @see AuthenticationService#logout() | |||
| */ | |||
| void logout(); | |||
|
|
|||
| /** | |||
| * Checks if user is active | |||
|
Alexander Magomedov seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account. You have signed the CLA already but the status is still pending? Let us recheck it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A solution for #2219