Improved uri validation

frictionlessdata · Dec 29, 2017 · 502b26e · 502b26e
1 parent 9574d58
commit 502b26e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/src/types/string.js b/src/types/string.js
@@ -1,6 +1,7 @@
 const isBase64 = require('validator/lib/isBase64')
 const isEmail = require('validator/lib/isEmail')
 const isUUID = require('validator/lib/isUUID')
+const isURL = require('validator/lib/isURL')
 const isString = require('lodash/isString')
 const {ERROR} = require('../config')
 
@@ -12,7 +13,7 @@ function castString(format, value) {
     return ERROR
   }
   if (format === 'uri') {
-    if (!_URI_PATTERN.exec(value)) {
+    if (!isURL(value)) {
       return ERROR
     }
   } else if (format === 'email') {
@@ -35,7 +36,3 @@ function castString(format, value) {
 module.exports = {
   castString,
 }
-
-// Internal
-
-const _URI_PATTERN = new RegExp('^http[s]?://')
diff --git a/test/types/string.js b/test/types/string.js
@@ -10,6 +10,7 @@ const TESTS = [
   ['default', '', ''],
   ['default', 0, ERROR],
   ['uri', 'http://google.com', 'http://google.com'],
+  ['uri', 'ftp://example.org/resource.txt', 'ftp://example.org/resource.txt'],
   ['uri', 'string', ERROR],
   ['uri', '', ERROR],
   ['uri', 0, ERROR],