From 545694ba647d699592b9883f250de07b2501901f Mon Sep 17 00:00:00 2001
From: Nicholas Blair <nicholas.blair@wisc.edu>
Date: Mon, 22 Aug 2016 14:33:57 -0500
Subject: [PATCH] feat: update source field on users to match namespaced
profile
---
.../java/edu/wisc/uwss/local/LocalUserDetailsManagerImpl.java | 2 +-
.../preauth/PreauthenticatedUserDetailsAttributeMapper.java | 2 +-
.../edu/wisc/uwss/local/LocalUserDetailsManagerImplTest.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/uw-spring-security-core/src/main/java/edu/wisc/uwss/local/LocalUserDetailsManagerImpl.java b/uw-spring-security-core/src/main/java/edu/wisc/uwss/local/LocalUserDetailsManagerImpl.java
index 4927a2d..3e3683b 100644
--- a/uw-spring-security-core/src/main/java/edu/wisc/uwss/local/LocalUserDetailsManagerImpl.java
+++ b/uw-spring-security-core/src/main/java/edu/wisc/uwss/local/LocalUserDetailsManagerImpl.java
@@ -138,7 +138,7 @@ public class LocalUserDetailsManagerImpl implements UserDetailsManager {
if(userDetails != null && StringUtils.isNotBlank(userDetails.getUsername())) {
users.put(userDetails.getUsername(), userDetails);
if(userDetails instanceof HasModifiableSource) {
- ((HasModifiableSource) userDetails).setSource("local-users");
+ ((HasModifiableSource) userDetails).setSource("edu.wisc.uwss.local-users");
}
}
}
diff --git a/uw-spring-security-core/src/main/java/edu/wisc/uwss/preauth/PreauthenticatedUserDetailsAttributeMapper.java b/uw-spring-security-core/src/main/java/edu/wisc/uwss/preauth/PreauthenticatedUserDetailsAttributeMapper.java
index 1dce635..d638e04 100644
--- a/uw-spring-security-core/src/main/java/edu/wisc/uwss/preauth/PreauthenticatedUserDetailsAttributeMapper.java
+++ b/uw-spring-security-core/src/main/java/edu/wisc/uwss/preauth/PreauthenticatedUserDetailsAttributeMapper.java
@@ -88,7 +88,7 @@ public interface PreauthenticatedUserDetailsAttributeMapper {
}
String email = request.getHeader(emailAddressHeader);
UWUserDetailsImpl result = new UWUserDetailsImpl(pvi, uid, "", cn, email, uddsMembership);
- result.setSource("preauth");
+ result.setSource("edu.wisc.uwss.preauth");
result.setEppn(eppn);
result.setIsisEmplid(emplid);
result.setFirstName(request.getHeader(firstNameHeader));
diff --git a/uw-spring-security-core/src/test/java/edu/wisc/uwss/local/LocalUserDetailsManagerImplTest.java b/uw-spring-security-core/src/test/java/edu/wisc/uwss/local/LocalUserDetailsManagerImplTest.java
index cc4e17e..e24c411 100644
--- a/uw-spring-security-core/src/test/java/edu/wisc/uwss/local/LocalUserDetailsManagerImplTest.java
+++ b/uw-spring-security-core/src/test/java/edu/wisc/uwss/local/LocalUserDetailsManagerImplTest.java
@@ -211,7 +211,7 @@ public class LocalUserDetailsManagerImplTest {
UserDetails user = new UWUserDetailsImpl("pvi", username, "password", "fullName", "emailAddress");
manager.createUser(user);
assertTrue(manager.userExists(username));
- assertEquals("local-users", manager.loadUserByUsername("username").getSource());
+ assertEquals("edu.wisc.uwss.local-users", manager.loadUserByUsername("username").getSource());
}
/**
--
GitLab