Skip to content

Commit

Permalink
feat(isUUID): add support for validation of version v1 and v2 (#1848)
Browse files Browse the repository at this point in the history
* fix(isUUID) for null version argument supply

* improve(isUUID) validation for version 1 and 2
  • Loading branch information
theteladras authored Oct 31, 2021
1 parent 769f6d5 commit af2b43c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ Validator | Description
**isStrongPassword(str [, options])** | Check if a password is strong or not. Allows for custom requirements or scoring rules. If `returnScore` is true, then the function returns an integer score for the password rather than a boolean.<br/>Default options: <br/>`{ minLength: 8, minLowercase: 1, minUppercase: 1, minNumbers: 1, minSymbols: 1, returnScore: false, pointsPerUnique: 1, pointsPerRepeat: 0.5, pointsForContainingLower: 10, pointsForContainingUpper: 10, pointsForContainingNumber: 10, pointsForContainingSymbol: 10 }`
**isTaxID(str, locale)** | Check if the given value is a valid Tax Identification Number. Default locale is `en-US`.<br/><br/>More info about exact TIN support can be found in `src/lib/isTaxID.js`<br/><br/>Supported locales: `[ 'bg-BG', 'cs-CZ', 'de-AT', 'de-DE', 'dk-DK', 'el-CY', 'el-GR', 'en-GB', 'en-IE', 'en-US', 'es-ES', 'et-EE', 'fi-FI', 'fr-BE', 'fr-FR', 'fr-LU', 'hr-HR', 'hu-HU', 'it-IT', 'lb-LU', 'lt-LT', 'lv-LV' 'mt-MT', 'nl-BE', 'nl-NL', 'pl-PL', 'pt-BR', 'pt-PT', 'ro-RO', 'sk-SK', 'sl-SI', 'sv-SE' ]`
**isURL(str [, options])** | check if the string is an URL.<br/><br/>`options` is an object which defaults to `{ protocols: ['http','https','ftp'], require_tld: true, require_protocol: false, require_host: true, require_port: false, require_valid_protocol: true, allow_underscores: false, host_whitelist: false, host_blacklist: false, allow_trailing_dot: false, allow_protocol_relative_urls: false, allow_fragments: true, allow_query_components: true, disallow_auth: false, validate_length: true }`.<br/><br/>require_protocol - if set as true isURL will return false if protocol is not present in the URL.<br/>require_valid_protocol - isURL will check if the URL's protocol is present in the protocols option.<br/>protocols - valid protocols can be modified with this option.<br/>require_host - if set as false isURL will not check if host is present in the URL.<br/>require_port - if set as true isURL will check if port is present in the URL.<br/>allow_protocol_relative_urls - if set as true protocol relative URLs will be allowed.<br/>allow_fragments - if set as false isURL will return false if fragments are present.<br/>allow_query_components - if set as false isURL will return false if query components are present.<br/>validate_length - if set as false isURL will skip string length validation (2083 characters is IE max URL length).
**isUUID(str [, version])** | check if the string is a UUID (version 3, 4 or 5).
**isUUID(str [, version])** | check if the string is a UUID (version 1, 2, 3, 4 or 5).
**isVariableWidth(str)** | check if the string contains a mixture of full and half-width chars.
**isVAT(str, countryCode)** | checks that the string is a [valid VAT number](https://en.wikipedia.org/wiki/VAT_identification_number) if validation is available for the given country code matching [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2). <br/><br/>Available country codes: `[ 'GB', 'IT','NL' ]`.
**isWhitelisted(str, chars)** | checks characters if they appear in the whitelist.
Expand Down
4 changes: 3 additions & 1 deletion src/lib/isUUID.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import assertString from './util/assertString';

const uuid = {
1: /^[0-9A-F]{8}-[0-9A-F]{4}-1[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i,
2: /^[0-9A-F]{8}-[0-9A-F]{4}-2[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i,
3: /^[0-9A-F]{8}-[0-9A-F]{4}-3[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}$/i,
4: /^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i,
5: /^[0-9A-F]{8}-[0-9A-F]{4}-5[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$/i,
Expand All @@ -10,5 +12,5 @@ const uuid = {
export default function isUUID(str, version) {
assertString(str);
const pattern = uuid[![undefined, null].includes(version) ? version : 'all'];
return pattern && pattern.test(str);
return !!pattern && pattern.test(str);
}
41 changes: 41 additions & 0 deletions test/validators.js
Original file line number Diff line number Diff line change
Expand Up @@ -4538,6 +4538,35 @@ describe('Validators', () => {
'A12AAAAA-1111-1111-AAAG-111111111111',
],
});
test({
validator: 'isUUID',
args: [1],
valid: [
'E034B584-7D89-11E9-9669-1AECF481A97B',
],
invalid: [
'xxxA987FBC9-4BED-3078-CF07-9141BA07C9F3',
'AAAAAAAA-1111-2222-AAAG',
'AAAAAAAA-1111-2222-AAAG-111111111111',
'A987FBC9-4BED-4078-8F07-9141BA07C9F3',
'A987FBC9-4BED-5078-AF07-9141BA07C9F3',
],
});
test({
validator: 'isUUID',
args: [2],
valid: [
'A987FBC9-4BED-2078-CF07-9141BA07C9F3',
],
invalid: [
'',
'xxxA987FBC9-4BED-3078-CF07-9141BA07C9F3',
'11111',
'AAAAAAAA-1111-1111-AAAG-111111111111',
'A987FBC9-4BED-4078-8F07-9141BA07C9F3',
'A987FBC9-4BED-5078-AF07-9141BA07C9F3',
],
});
test({
validator: 'isUUID',
args: [3],
Expand Down Expand Up @@ -4589,6 +4618,18 @@ describe('Validators', () => {
'A987FBC9-4BED-3078-CF07-9141BA07C9F3',
],
});
test({
validator: 'isUUID',
args: [6],
valid: [],
invalid: [
'987FBC97-4BED-1078-AF07-9141BA07C9F3',
'987FBC97-4BED-2078-AF07-9141BA07C9F3',
'987FBC97-4BED-3078-AF07-9141BA07C9F3',
'987FBC97-4BED-4078-AF07-9141BA07C9F3',
'987FBC97-4BED-5078-AF07-9141BA07C9F3',
],
});
});

it('should validate a string that is in another string or array', () => {
Expand Down

0 comments on commit af2b43c

Please sign in to comment.