feat: improve the PIN Enter repetition validation rule and add relevant messages #1401
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,7 @@ export enum PINError { | |
| CrossPatternValidation = 'CrossPatternValidation', | ||
| OddOrEvenSequenceValidation = 'OddOrEvenSequenceValidation', | ||
| NoRepetitionOfTheSameNumbersValidation = 'NoRepetitionOfTheSameNumbersValidation', | ||
| MaxAdjacentNumberRepetitionValidation = 'MaxAdjacentNumberRepetitionValidation', | ||
| NoRepetitionOfTheTwoSameNumbersValidation = 'NoRepetitionOfTheTwoSameNumbersValidation', | ||
| NoSeriesOfNumbersValidation = 'NoSeriesOfNumbersValidation', | ||
| PINOnlyContainDigitsValidation = 'PINOnlyContainDigitsValidation', | ||
|
|
@@ -24,6 +25,7 @@ export interface PINValidationsType { | |
|
|
||
| export const PINCreationValidations = (PIN: string, PINRules: PINValidationRules) => { | ||
| const PINValidations: PINValidationsType[] = [] | ||
|
|
||
| if (PINRules.no_cross_pattern) { | ||
| PINValidations.push({ | ||
| isInvalid: crossNumberPattern.includes(PIN), | ||
|
|
@@ -36,16 +38,21 @@ export const PINCreationValidations = (PIN: string, PINRules: PINValidationRules | |
| errorName: PINError.OddOrEvenSequenceValidation, | ||
| } as PINValidationsType) | ||
| } | ||
|
|
||
| if (1 == PINRules.no_repeated_numbers) { | ||
| const repetitionPattern = new RegExp(/(\d)\1{1,}/) | ||
| PINValidations.push({ | ||
| isInvalid: repetitionPattern.test(PIN), | ||
| errorName: PINError.NoRepetitionOfTheSameNumbersValidation | ||
| } as PINValidationsType) | ||
| } else if (1 < PINRules.no_repeated_numbers){ | ||
| const repetitionPattern = new RegExp(String.raw`(\d)\1{${PINRules.no_repeated_numbers},}`, "g") | ||
| PINValidations.push({ | ||
| isInvalid: repetitionPattern.test(PIN), | ||
| errorName: PINError.MaxAdjacentNumberRepetitionValidation | ||
| } as PINValidationsType) | ||
| } | ||
|
|
||
| if (PINRules.no_repetition_of_the_two_same_numbers) { | ||
| let noRepetitionOfTheTwoSameNumbers = new RegExp(/([0-9][0-9])\1{1,}/) | ||
| if (typeof PINRules.no_repetition_of_the_two_same_numbers === 'number') { | ||
|
|
@@ -58,6 +65,7 @@ export const PINCreationValidations = (PIN: string, PINRules: PINValidationRules | |
| errorName: PINError.NoRepetitionOfTheTwoSameNumbersValidation, | ||
| } as PINValidationsType) | ||
| } | ||
|
|
||
| if (PINRules.no_series_of_numbers) { | ||
| PINValidations.push({ | ||
| isInvalid: consecutiveSeriesOfThree.test(PIN), | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,7 +4,7 @@ const defaultPINRules = { | |
| only_numbers: false, | ||
| min_length: 6, | ||
| max_length: 6, | ||
| no_repeated_numbers: 0, | ||
| no_series_of_numbers: false, | ||
| no_repetition_of_the_two_same_numbers: false, | ||
| no_even_or_odd_series_of_numbers: false, | ||
|
|
@@ -44,6 +44,17 @@ describe('PIN creation validations', () => { | |
| } | ||
| }) | ||
|
|
||
| test('PIN adjacent number repetion is allowed when the repeating test is disabled', async () => { | ||
| const PINRepeating = '111111' | ||
| const PINValidations = PINCreationValidations(PINRepeating, defaultPINRules) | ||
|
|
||
| for (const PINValidation of PINValidations) { | ||
| if (PINValidation.errorName === 'PINTooLongValidation') { | ||
| expect(PINValidation.isInvalid).toBe(false) | ||
| } | ||
| } | ||
| }) | ||
|
|
||
| test('PIN without only number and only number validation to true should return PINOnlyContainDigitsValidation as invalid', async () => { | ||
| const PINRulesWithOnlyNumbers = { | ||
| ...defaultPINRules, | ||
|
|
@@ -74,10 +85,10 @@ describe('PIN creation validations', () => { | |
| } | ||
| }) | ||
|
|
||
| test('PIN with repeated numbers and no_repeated_numbers is 1, should return NoRepetitionOfTheSameNumbersValidation as invalid', async () => { | ||
| const PINRulesWithRepeatedNumbers = { | ||
| ...defaultPINRules, | ||
| no_repeated_numbers: 1, | ||
| } | ||
|
|
||
| const PINWithRepeatedNumbers = '113456' | ||
|
|
@@ -90,10 +101,10 @@ describe('PIN creation validations', () => { | |
| } | ||
| }) | ||
|
|
||
| test('PIN with 3 repeating adhacent numbers and no_repeated_numbers is 2, so the validation use that number as validation max limit, should return NoRepetitionOfTheSameNumbersValidation as invalid', async () => { | ||
| const PINRulesWithRepeatedNumbers = { | ||
| ...defaultPINRules, | ||
| max_repeated_numbers: 2, | ||
| } | ||
|
|
||
| const PINWithRepeatedNumbers = '111456' | ||
|
|
@@ -106,13 +117,13 @@ describe('PIN creation validations', () => { | |
| } | ||
| }) | ||
|
|
||
| test('PIN with 3 repeating adhacent numbers and no_repeated_numbers is 3, so the validation use that number as validation max limit, should return NoRepetitionOfTheSameNumbersValidation as valid', async () => { | ||
| const PINRulesWithRepeatedNumbers = { | ||
| ...defaultPINRules, | ||
| max_repeated_numbers: 2, | ||
| } | ||
|
|
||
| const PINWithRepeatedNumbers = '111456' | ||
| const PINValidations = PINCreationValidations(PINWithRepeatedNumbers, PINRulesWithRepeatedNumbers) | ||
|
|
||
| for (const PINValidation of PINValidations) { | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this is in draft but if it's doable could we keep the defaults the same and just allow for opt-in behavior with the injectable
PINSecurity.rulesconfig we have currently?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Put both PINSecurity and PINCreationValidation to IoC container, then the wallet variants can customize them without changinf Bifold default validating behavior. I will discuss with team. Thanks @bryce-mcmath
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Back to default, but change the validating logic for '0' as 'repeating times' instead of its boolean value, keep the extra message for numbers repeating allowed but the repeating times exceeding the max times rule