File tree Expand file tree Collapse file tree 1 file changed +7
-5
lines changed
server/src/main/java/password/pwm/svc/token Expand file tree Collapse file tree 1 file changed +7
-5
lines changed Original file line number Diff line number Diff line change 35
35
import password .pwm .config .option .DataStorageMethod ;
36
36
import password .pwm .config .option .MessageSendMethod ;
37
37
import password .pwm .config .option .TokenStorageMethod ;
38
+ import password .pwm .config .profile .ActivateUserProfile ;
38
39
import password .pwm .config .profile .ForgottenPasswordProfile ;
39
40
import password .pwm .config .profile .NewUserProfile ;
40
41
import password .pwm .error .ErrorInformation ;
@@ -476,16 +477,17 @@ private static boolean tokensAreUsedInConfig( final Configuration configuration
476
477
return true ;
477
478
}
478
479
}
479
- return true ;
480
480
}
481
481
482
-
483
482
if ( configuration .readSettingAsBoolean ( PwmSetting .ACTIVATE_USER_ENABLE ) )
484
483
{
485
- final MessageSendMethod activateMethod = configuration .readSettingAsEnum ( PwmSetting .ACTIVATE_TOKEN_SEND_METHOD , MessageSendMethod .class );
486
- if ( MessageSendMethod .NONE != activateMethod )
484
+ for ( final ActivateUserProfile activateUserProfile : configuration .getUserActivationProfiles ().values () )
487
485
{
488
- return true ;
486
+ final MessageSendMethod activateMethod = activateUserProfile .readSettingAsEnum ( PwmSetting .ACTIVATE_TOKEN_SEND_METHOD , MessageSendMethod .class );
487
+ if ( MessageSendMethod .NONE != activateMethod )
488
+ {
489
+ return true ;
490
+ }
489
491
}
490
492
}
491
493
You can’t perform that action at this time.
0 commit comments