Skip to content

Commit eb3ec39

Browse files
committed
Make AccountStatusUserDetailsChecker implement MessageSourceAware
Fixes: gh-3980
1 parent 7618d23 commit eb3ec39

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

core/src/main/java/org/springframework/security/authentication/AccountStatusUserDetailsChecker.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,20 @@
1515
*/
1616
package org.springframework.security.authentication;
1717

18+
import org.springframework.context.MessageSource;
19+
import org.springframework.context.MessageSourceAware;
1820
import org.springframework.security.core.SpringSecurityMessageSource;
1921
import org.springframework.security.core.userdetails.UserDetails;
2022
import org.springframework.security.core.userdetails.UserDetailsChecker;
2123
import org.springframework.context.support.MessageSourceAccessor;
24+
import org.springframework.util.Assert;
2225

2326
/**
2427
* @author Luke Taylor
2528
*/
26-
public class AccountStatusUserDetailsChecker implements UserDetailsChecker {
29+
public class AccountStatusUserDetailsChecker implements UserDetailsChecker, MessageSourceAware {
2730

28-
protected final MessageSourceAccessor messages = SpringSecurityMessageSource
31+
protected MessageSourceAccessor messages = SpringSecurityMessageSource
2932
.getAccessor();
3033

3134
public void check(UserDetails user) {
@@ -51,4 +54,13 @@ public void check(UserDetails user) {
5154
"User credentials have expired"));
5255
}
5356
}
57+
58+
/**
59+
* @since 5.2
60+
*/
61+
@Override
62+
public void setMessageSource(MessageSource messageSource) {
63+
Assert.notNull(messageSource, "messageSource cannot be null");
64+
this.messages = new MessageSourceAccessor(messageSource);
65+
}
5466
}

core/src/main/resources/org/springframework/security/messages_nl.properties

Whitespace-only changes.

0 commit comments

Comments
 (0)