Refactor the code.

wso2-extensions · Dec 13, 2024 · 28c4788 · 28c4788
1 parent 0886166
commit 28c4788
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...piry/src/main/java/org/wso2/carbon/identity/password/expiry/util/PasswordPolicyUtils.java b/...piry/src/main/java/org/wso2/carbon/identity/password/expiry/util/PasswordPolicyUtils.java
@@ -407,10 +407,12 @@ public static Optional<Long> getUserPasswordExpiryTime(String tenantDomain,
     private static List<PasswordExpiryRule> filterApplicableExpiryRules(List<PasswordExpiryRule> passwordExpiryRules,
                                                                         boolean skipIfNoApplicableRules) {
 
+        if (!skipIfNoApplicableRules) {
+            return passwordExpiryRules;
+        }
         // If the default behavior is to skip the password expiry, rules with skip logic are not required.
         return passwordExpiryRules.stream().filter(
-                rule -> !skipIfNoApplicableRules || !PasswordExpiryRuleOperatorEnum.NE.equals(rule.getOperator()))
-                .collect(Collectors.toList());
+                rule -> !PasswordExpiryRuleOperatorEnum.NE.equals(rule.getOperator())).collect(Collectors.toList());
     }
 
     /**