Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove AuthenticatedPrincipal from UserDetails

Browse Source 
Issue gh-4877
This commit is contained in:
Joe Grandja
2017-11-30 10:30:41 -05:00
parent 50d1a81458
commit e19fdb6cc1
3 changed files with 2 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/springframework/security/core/userdetails/MapReactiveUserDetailsService.java
View File

@@ -43,7 +43,7 @@ public class MapReactiveUserDetailsService implements ReactiveUserDetailsService
public MapReactiveUserDetailsService(Collection<UserDetails> users) {
Assert.notEmpty(users, "users cannot be null or empty");
this.users = users.stream().collect(Collectors.toConcurrentMap( u -> getKey(u.getName()), Function.identity()));
this.users = users.stream().collect(Collectors.toConcurrentMap( u -> getKey(u.getUsername()), Function.identity()));
}
@Override

13
core/src/main/java/org/springframework/security/core/userdetails/UserDetails.java
View File

@@ -18,7 +18,6 @@ package org.springframework.security.core.userdetails;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.AuthenticatedPrincipal;
import java.io.Serializable;
import java.util.Collection;
@@ -42,7 +41,7 @@ import java.util.Collection;
*
* @author Ben Alex
*/
public interface UserDetails extends AuthenticatedPrincipal, Serializable {
public interface UserDetails extends Serializable {
// ~ Methods
// ========================================================================================================
@@ -100,14 +99,4 @@ public interface UserDetails extends AuthenticatedPrincipal, Serializable {
* @return <code>true</code> if the user is enabled, <code>false</code> otherwise
*/
boolean isEnabled();
/**
* Returns the name of the user. Cannot return <code>null</code>.
* The default implementation of this method returns {@link #getUsername()}.
*
* @return the name of the user (never <code>null</code>)
*/
default String getName() {
return getUsername();
}
}