diff --git a/pom.xml b/pom.xml index ab1ae75dbd0dc7ad2e04eb85f9bcfe0ed486e902..7250ef43593830a1cd9cac7ce65372fa655f5c93 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>edu.wisc.uwss</groupId> <artifactId>uw-spring-security</artifactId> - <version>1.6.3-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>UW Spring Security Parent</name> <description>Parent project for module to integrate Spring Security with UW authentication mechanism.</description> diff --git a/uw-spring-security-config/pom.xml b/uw-spring-security-config/pom.xml index 18a1d38b57d5b1ee142429032c099f2ab5fe92b0..a4b0c30d148529c7be2d75978c9e156c2beb2f90 100644 --- a/uw-spring-security-config/pom.xml +++ b/uw-spring-security-config/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>edu.wisc.uwss</groupId> <artifactId>uw-spring-security</artifactId> - <version>1.6.3-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <artifactId>uw-spring-security-config</artifactId> <name>UW Spring Security Configuration</name> diff --git a/uw-spring-security-core/pom.xml b/uw-spring-security-core/pom.xml index 53a99fc0bb25a0d5f42f90766b6b98dc6b7f1f27..aaa4fda2086821133d62b17b4289cada5c37a222 100644 --- a/uw-spring-security-core/pom.xml +++ b/uw-spring-security-core/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>edu.wisc.uwss</groupId> <artifactId>uw-spring-security</artifactId> - <version>1.6.3-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <artifactId>uw-spring-security-core</artifactId> <name>UW Spring Security Core</name> diff --git a/uw-spring-security-core/src/main/java/edu/wisc/uwss/uds/UdsPersonUserDetailsServiceImpl.java b/uw-spring-security-core/src/main/java/edu/wisc/uwss/uds/UdsPersonUserDetailsServiceImpl.java index 285c7ef64ac4844f3fabb1972a6843489113b648..1b152ec735211a4db8a8ea4245fb02428b08cb18 100644 --- a/uw-spring-security-core/src/main/java/edu/wisc/uwss/uds/UdsPersonUserDetailsServiceImpl.java +++ b/uw-spring-security-core/src/main/java/edu/wisc/uwss/uds/UdsPersonUserDetailsServiceImpl.java @@ -25,9 +25,18 @@ import edu.wisc.uwss.UWUserDetails; */ public class UdsPersonUserDetailsServiceImpl implements UserDetailsService{ - @Autowired UdsPersonService personService; - @Autowired(required=false) IdentifiersFactory identifiersFactory = new IdentifiersFactory.NetID(); + protected UdsPersonService personService; + protected IdentifiersFactory identifiersFactory = new IdentifiersFactory.NetID(); + @Autowired + public UdsPersonUserDetailsServiceImpl(UdsPersonService personService) { + this(personService, new IdentifiersFactory.NetID()); + } + @Autowired(required=false) + public UdsPersonUserDetailsServiceImpl(UdsPersonService personService, IdentifiersFactory identifiersFactory) { + this.personService = personService; + this.identifiersFactory = identifiersFactory; + } @Override public UWUserDetails loadUserByUsername(String username) throws UsernameNotFoundException { Identifiers identifiers = identifiersFactory.withValue(username); diff --git a/uw-spring-security-core/src/test/java/edu/wisc/uwss/UWUserDetailsImplTest.java b/uw-spring-security-core/src/test/java/edu/wisc/uwss/UWUserDetailsImplTest.java index b32e9f680716843af5c741f1e4570cca81e6771a..77f26aa750682b54f8aa5ff12d7bb13f93037470 100644 --- a/uw-spring-security-core/src/test/java/edu/wisc/uwss/UWUserDetailsImplTest.java +++ b/uw-spring-security-core/src/test/java/edu/wisc/uwss/UWUserDetailsImplTest.java @@ -83,4 +83,9 @@ public class UWUserDetailsImplTest { assertEquals(lower.getEmailAddress(), upper.getEmailAddress()); assertEquals(lower.getEmailAddressHash(), upper.getEmailAddressHash()); } + + @Test + public void newInstance_success() { + UWUserDetailsImpl instance = UWUserDetailsImpl.newInstance("UW123A123", "bucky", "", "Bucky Badger", "bucky.badger@wisc.edu", Collections.<String>emptyList(), Collections.<String>emptyList()); + } } diff --git a/uw-spring-security-sample-war/pom.xml b/uw-spring-security-sample-war/pom.xml index 9eb379b20a4e57b368a953ea2019550f7aa6b469..83a75802d13b8b9c9f144297fe88b66c20f41ec0 100644 --- a/uw-spring-security-sample-war/pom.xml +++ b/uw-spring-security-sample-war/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>edu.wisc.uwss</groupId> <artifactId>uw-spring-security</artifactId> - <version>1.6.3-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <artifactId>uw-spring-security-sample-war</artifactId> <name>UW Spring Security Sample War</name> diff --git a/uw-spring-security-web/pom.xml b/uw-spring-security-web/pom.xml index e9000ec15e752b505cf07dc48e62e16b2f795c83..1af82d56ecf3b2ef8486353474b3dfa21788e049 100644 --- a/uw-spring-security-web/pom.xml +++ b/uw-spring-security-web/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>edu.wisc.uwss</groupId> <artifactId>uw-spring-security</artifactId> - <version>1.6.3-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> </parent> <artifactId>uw-spring-security-web</artifactId> <name>UW Spring Security Web</name>