From 21e2684ea3772f0ecae2ca11c3b12bae9d2115ba Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Thu, 19 May 2016 19:14:54 -0500
Subject: [PATCH] More updates to make stuff use the new AdminUI preferences.
---
.../restlet/resources/UserListResource.java | 2 +-
.../security/XnatLdapUserDetailsMapper.java | 2 +-
.../XnatDatabaseAuthenticationProvider.java | 2 +-
.../modules/actions/XDATRegisterUser.java | 17 ++++++++---------
.../modules/screens/UploadAppletScreen.java | 2 +-
.../modules/screens/XDATScreen_UpdateUser.java | 2 +-
6 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java b/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
index 2eda908e..97c99d46 100644
--- a/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
+++ b/src/main/java/org/nrg/xnat/restlet/resources/UserListResource.java
@@ -81,6 +81,6 @@ public class UserListResource extends SecureResource {
* @return <b>true</b> if only site administrators can access the list of users, <b>false</b> otherwise.
*/
private boolean restrictUserListAccessToAdmins() {
- return XDAT.getBoolSiteConfigurationProperty("restrictUserListAccessToAdmins", true);
+ return XDAT.getSiteConfigPreferences().getRestrictUserListAccessToAdmins();
}
}
diff --git a/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java b/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
index c0768d86..313b68e1 100644
--- a/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
+++ b/src/main/java/org/nrg/xnat/security/XnatLdapUserDetailsMapper.java
@@ -77,7 +77,7 @@ public class XnatLdapUserDetailsMapper extends LdapUserDetailsMapper {
try {
final UserI xdatUser = Users.getUser(userDetails.getUsername());
- if ((!XDAT.verificationOn() || xdatUser.isVerified()) && userDetails.getAuthorization().isEnabled()) {
+ if ((!XDAT.getSiteConfigPreferences().getEmailVerification() || xdatUser.isVerified()) && userDetails.getAuthorization().isEnabled()) {
return userDetails;
} else {
throw new NewLdapAccountNotAutoEnabledException(
diff --git a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
index 085bd95e..8dac7b24 100644
--- a/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
+++ b/src/main/java/org/nrg/xnat/security/provider/XnatDatabaseAuthenticationProvider.java
@@ -80,7 +80,7 @@ public class XnatDatabaseAuthenticationProvider extends DaoAuthenticationProvide
throw new AuthenticationServiceException("User details class is not of a type I know how to handle: " + userDetails.getClass());
}
final UserI xdatUserDetails = (UserI) userDetails;
- if ((XDAT.verificationOn() && !xdatUserDetails.isVerified() && xdatUserDetails.isEnabled()) || !xdatUserDetails.isAccountNonLocked()) {
+ if ((XDAT.getSiteConfigPreferences().getEmailVerification() && !xdatUserDetails.isVerified() && xdatUserDetails.isEnabled()) || !xdatUserDetails.isAccountNonLocked()) {
throw new CredentialsExpiredException("Attempted login to unverified or locked account: " + xdatUserDetails.getUsername());
}
super.additionalAuthenticationChecks(userDetails, authentication);
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
index b61c9592..8db9f45c 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/actions/XDATRegisterUser.java
@@ -10,12 +10,6 @@
*/
package org.nrg.xnat.turbine.modules.actions;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.apache.turbine.Turbine;
@@ -25,12 +19,17 @@ import org.apache.turbine.util.RunData;
import org.apache.velocity.context.Context;
import org.nrg.xdat.XDAT;
import org.nrg.xdat.turbine.utils.TurbineUtils;
-import org.nrg.xft.XFT;
import org.nrg.xft.security.UserI;
import org.nrg.xnat.turbine.utils.ProjectAccessRequest;
import org.springframework.security.web.savedrequest.HttpSessionRequestCache;
import org.springframework.security.web.savedrequest.SavedRequest;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATRegisterUser {
@Override
@@ -94,13 +93,13 @@ public class XDATRegisterUser extends org.nrg.xdat.turbine.modules.actions.XDATR
context.put("user", user);
action.doPerform(data, context);
} else if (!StringUtils.isEmpty(nextAction) && !nextAction.contains("XDATLoginUser") && !nextAction.equals(Turbine.getConfiguration().getString("action.login"))) {
- if (XDAT.getSiteConfigPreferences().getUserRegistration() & !XDAT.verificationOn()) {
+ if (XDAT.getSiteConfigPreferences().getUserRegistration() & !XDAT.getSiteConfigPreferences().getEmailVerification()) {
data.setAction(nextAction);
VelocityAction action = (VelocityAction) ActionLoader.getInstance().getInstance(nextAction);
action.doPerform(data, context);
}
} else if (!StringUtils.isEmpty(nextPage) && !nextPage.equals(Turbine.getConfiguration().getString("template.home"))) {
- if (XDAT.getSiteConfigPreferences().getUserRegistration() && !XDAT.verificationOn()) {
+ if (XDAT.getSiteConfigPreferences().getUserRegistration() && !XDAT.getSiteConfigPreferences().getEmailVerification()) {
data.setScreenTemplate(nextPage);
}
}
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
index 743912a9..36bb43c1 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/UploadAppletScreen.java
@@ -50,7 +50,7 @@ public abstract class UploadAppletScreen extends SecureScreen {
scope = Scope.Site;
}
- boolean enableProjectAppletScript = XDAT.getBoolSiteConfigurationProperty("enableProjectAppletScript", false);
+ boolean enableProjectAppletScript = XDAT.getSiteConfigPreferences().getEnableProjectAppletScript();
org.nrg.config.entities.Configuration config = enableProjectAppletScript ? configService.getConfig(AppletConfig.toolName, AppletConfig.path, scope, projectId) : null;
if (config == null || org.nrg.config.entities.Configuration.DISABLED_STRING.equalsIgnoreCase(config.getStatus())) {
diff --git a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
index 9f08bc2e..758bf687 100644
--- a/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
+++ b/src/main/java/org/nrg/xnat/turbine/modules/screens/XDATScreen_UpdateUser.java
@@ -129,7 +129,7 @@ public class XDATScreen_UpdateUser extends SecureScreen {
if(!user.isEnabled()) {
throw new Exception("User is not enabled: " + user.getUsername());
}
- if (XDAT.verificationOn() && !user.isVerified()) {
+ if (XDAT.getSiteConfigPreferences().getEmailVerification() && !user.isVerified()) {
throw new Exception("User is not verified: " + user.getUsername());
}
}
--
GitLab