Refactor

wso2-extensions · Dec 4, 2024 · 16567bc · 16567bc
1 parent feab5d9
commit 16567bc
Showing 1 changed file with 4 additions and 5 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
@@ -341,18 +341,17 @@ public static Optional<Long> getUserPasswordExpiryTime(String tenantDomain, Stri
                         lastPasswordUpdatedTimeInMillis + getDaysTimeInMillis(defaultPasswordExpiryInDays));
             }
 
-            List<PasswordExpiryRule> filteredRules =
-                    filterApplicableExpiryRules(passwordExpiryRules, skipIfNoApplicableRules);
-
             Map<PasswordExpiryRuleAttributeEnum, Set<String>> userAttributes =
                     new EnumMap<>(PasswordExpiryRuleAttributeEnum.class);
-            if (groupIds != null) {
+            if (CollectionUtils.isNotEmpty(groupIds)) {
                 userAttributes.put(PasswordExpiryRuleAttributeEnum.GROUPS, new HashSet<>(groupIds));
             }
-            if (roleIds != null) {
+            if (CollectionUtils.isNotEmpty(roleIds)) {
                 userAttributes.put(PasswordExpiryRuleAttributeEnum.ROLES, new HashSet<>(roleIds));
             }
 
+            List<PasswordExpiryRule> filteredRules =
+                    filterApplicableExpiryRules(passwordExpiryRules, skipIfNoApplicableRules);
             for (PasswordExpiryRule rule : filteredRules) {
                 if (isRuleApplicable(rule, userAttributes, tenantDomain, userId, userStoreManager)) {
                     // Skip the rule if the operator is not equals.