fix issue with token setting configurationd defaults

src/main/java/password/pwm/config/profile/NewUserProfile.java

@@ -127,19 +127,19 @@ public class NewUserProfile extends AbstractProfile {
         return thePolicy;
     }
 
-    public TimeDuration getTokenDurationEmail() {
+    public TimeDuration getTokenDurationEmail(final Configuration configuration) {
         final long newUserDuration = readSettingAsLong(PwmSetting.NEWUSER_TOKEN_LIFETIME_EMAIL);
         if (newUserDuration < 1) {
-            final long defaultDuration = readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
+            final long defaultDuration = configuration.readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
             return new TimeDuration(defaultDuration, TimeUnit.SECONDS);
         }
         return new TimeDuration(newUserDuration, TimeUnit.SECONDS);
     }
 
-    public TimeDuration getTokenDurationSMS() {
+    public TimeDuration getTokenDurationSMS(final Configuration configuration) {
         final long newUserDuration = readSettingAsLong(PwmSetting.NEWUSER_TOKEN_LIFETIME_SMS);
         if (newUserDuration < 1) {
-            final long defaultDuration = readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
+            final long defaultDuration = configuration.readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
             return new TimeDuration(defaultDuration, TimeUnit.SECONDS);
         }
         return new TimeDuration(newUserDuration, TimeUnit.SECONDS);

src/main/java/password/pwm/config/profile/UpdateAttributesProfile.java

@@ -22,6 +22,7 @@
 
 package password.pwm.config.profile;
 
+import password.pwm.config.Configuration;
 import password.pwm.config.PwmSetting;
 import password.pwm.config.StoredValue;
 import password.pwm.config.stored.StoredConfiguration;
@@ -56,19 +57,19 @@ public class UpdateAttributesProfile extends AbstractProfile implements Profile
         return PROFILE_TYPE;
     }
 
-    public TimeDuration getTokenDurationEmail() {
+    public TimeDuration getTokenDurationEmail(final Configuration configuration) {
         final long duration = readSettingAsLong(PwmSetting.UPDATE_PROFILE_TOKEN_LIFETIME_EMAIL);
         if (duration < 1) {
-            final long defaultDuration = readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
+            final long defaultDuration = configuration.readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
             return new TimeDuration(defaultDuration, TimeUnit.SECONDS);
         }
         return new TimeDuration(duration, TimeUnit.SECONDS);
     }
 
-    public TimeDuration getTokenDurationSMS() {
+    public TimeDuration getTokenDurationSMS(final Configuration configuration) {
         final long duration = readSettingAsLong(PwmSetting.UPDATE_PROFILE_TOKEN_LIFETIME_SMS);
         if (duration < 1) {
-            final long defaultDuration = readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
+            final long defaultDuration = configuration.readSettingAsLong(PwmSetting.TOKEN_LIFETIME);
             return new TimeDuration(defaultDuration, TimeUnit.SECONDS);
         }
         return new TimeDuration(duration, TimeUnit.SECONDS);

src/main/java/password/pwm/http/servlet/UpdateProfileServlet.java

@@ -692,7 +692,7 @@ public class UpdateProfileServlet extends ControlledPwmServlet {
                 try {
                     final TokenPayload tokenPayload = pwmApplication.getTokenService().createTokenPayload(
                             TokenType.UPDATE_SMS,
-                            profile.getTokenDurationSMS(),
+                            profile.getTokenDurationSMS(config),
                             Collections.emptyMap(),
                             pwmRequest.getUserInfoIfLoggedIn(),
                             Collections.singleton(toNum)
@@ -730,7 +730,7 @@ public class UpdateProfileServlet extends ControlledPwmServlet {
                 try {
                     final TokenPayload tokenPayload = pwmApplication.getTokenService().createTokenPayload(
                             TokenType.UPDATE_EMAIL,
-                            profile.getTokenDurationEmail(),
+                            profile.getTokenDurationEmail(config),
                             Collections.emptyMap(),
                             pwmRequest.getUserInfoIfLoggedIn(),
                             Collections.singleton(toAddress)

src/main/java/password/pwm/http/servlet/newuser/NewUserUtils.java

@@ -479,7 +479,7 @@ class NewUserUtils {
                 try {
                     final TokenPayload tokenPayload = pwmApplication.getTokenService().createTokenPayload(
                             password.pwm.svc.token.TokenType.NEWUSER_SMS,
-                            newUserProfile.getTokenDurationSMS(),
+                            newUserProfile.getTokenDurationSMS(config),
                             tokenPayloadMap,
                             null,
                             Collections.singleton(outputDestTokenData.getSms())
@@ -525,7 +525,7 @@ class NewUserUtils {
                 try {
                     final TokenPayload tokenPayload = pwmApplication.getTokenService().createTokenPayload(
                             password.pwm.svc.token.TokenType.NEWUSER_EMAIL,
-                            newUserProfile.getTokenDurationEmail(),
+                            newUserProfile.getTokenDurationEmail(config),
                             tokenPayloadMap,
                             null,
                             Collections.singleton(outputDestTokenData.getEmail())