github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removed previous constructor from DefaultUserInforUserDetailsService.java and put in getter/setter for UserInfoRepository as a replacement.

pull/347/head
William Kim 2013-06-04 16:58:14 -04:00
parent de77f2c75a
commit 1b601abd6f
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoUserDetailsService.java
View File

@ -40,22 +40,13 @@ import org.springframework.stereotype.Service;
public class DefaultUserInfoUserDetailsService implements UserDetailsService { public class DefaultUserInfoUserDetailsService implements UserDetailsService {
@Autowired @Autowired
UserInfoRepository repository; private UserInfoRepository repository;
public static final GrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER"); public static final GrantedAuthority ROLE_USER = new SimpleGrantedAuthority("ROLE_USER");
public static final GrantedAuthority ROLE_ADMIN = new SimpleGrantedAuthority("ROLE_ADMIN"); public static final GrantedAuthority ROLE_ADMIN = new SimpleGrantedAuthority("ROLE_ADMIN");
private List<String> admins = new ArrayList<String>(); private List<String> admins = new ArrayList<String>();
/**
* Parameterized constructor for use in test harnesses.
*
* @param repository the UserInfoRepository to set
*/
public DefaultUserInfoUserDetailsService(UserInfoRepository repository) {
this.repository = repository;
}
@Override @Override
public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException { public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
UserInfo userInfo = repository.getByUsername(username); UserInfo userInfo = repository.getByUsername(username);
@ -94,4 +85,12 @@ public class DefaultUserInfoUserDetailsService implements UserDetailsService {
this.admins = admins; this.admins = admins;
} }
public UserInfoRepository getUserInfoRepository() {
return repository;
}
public void setUserInfoRepository(UserInfoRepository repository) {
this.repository = repository;
}
} }

3
openid-connect-server/src/test/java/org/mitre/openid/connect/service/impl/TestDefaultUserInfoUserDetailsService.java
View File

@ -37,7 +37,8 @@ public class TestDefaultUserInfoUserDetailsService {
@Before @Before
public void prepare() { public void prepare() {
userInfoRepository = Mockito.mock(UserInfoRepository.class); userInfoRepository = Mockito.mock(UserInfoRepository.class);
service = new DefaultUserInfoUserDetailsService(userInfoRepository); service = new DefaultUserInfoUserDetailsService();
service.setUserInfoRepository(userInfoRepository);
service.setAdmins(Lists.newArrayList(adminUsername)); service.setAdmins(Lists.newArrayList(adminUsername));
userInfoAdmin = new DefaultUserInfo(); userInfoAdmin = new DefaultUserInfo();