Add max limit for rules and values

wso2 · Aug 15, 2024 · 35f908b · 35f908b
1 parent bb89947
commit 35f908b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/features/admin.server-configurations.v1/constants/governance-connector-constants.ts b/features/admin.server-configurations.v1/constants/governance-connector-constants.ts
@@ -134,8 +134,10 @@ export class GovernanceConnectorConstants {
         EXPIRY_TIME_MIN_LENGTH: number;
         EXPIRY_TIME_MIN_VALUE: number;
         EXPIRY_RULES_MAX_COUNT: number;
+        EXPIRY_RULE_MAX_VALUES_PER_RULE: number;
     } = {
         EXPIRY_RULES_MAX_COUNT: 10,
+        EXPIRY_RULE_MAX_VALUES_PER_RULE: 5,
         EXPIRY_TIME_MAX_LENGTH: 5,
         EXPIRY_TIME_MAX_VALUE: 10080,
         EXPIRY_TIME_MIN_LENGTH: 1,

diff --git a/features/admin.validation.v1/components/password-expiry-rule-list.tsx b/features/admin.validation.v1/components/password-expiry-rule-list.tsx
@@ -134,6 +134,9 @@ export const PasswordExpiryRuleList: FunctionComponent<PasswordExpiryRuleListPro
      * Add a new rule.
      */
     const addRule = () => {
+        if (rules?.length >= GovernanceConnectorConstants.PASSWORD_EXPIRY_FORM_FIELD_CONSTRAINTS.
+            EXPIRY_RULES_MAX_COUNT) return;
+
         const newRule: PasswordExpiryRule = {
             attribute: PasswordExpiryRuleAttribute.ROLES,
             expiryDays: 30,
@@ -227,7 +230,7 @@ export const PasswordExpiryRuleList: FunctionComponent<PasswordExpiryRuleListPro
         const validList: Resource[] = isRole ? rolesList : groupsList;
         const validatedValues: string[] = selectedValues.filter((selectedValue: string) =>
             validList.some((item: Resource) => item.id === selectedValue)
-        );
+        ).slice(0, GovernanceConnectorConstants.PASSWORD_EXPIRY_FORM_FIELD_CONSTRAINTS.EXPIRY_RULE_MAX_VALUES_PER_RULE);
 
         handleRuleChange(
             index,