fix: Pre-encode value before other cases

hapijs · Mar 30, 2024 · 19f1f30 · 19f1f30
1 parent aa16489
commit 19f1f30
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/types/string.js b/lib/types/string.js
@@ -665,6 +665,10 @@ module.exports = Any.extend({
                     return helpers.error('string.uri');
                 }
 
+                if (helpers.prefs.convert && options.encodeUri) {
+                    value = encodeURI(value);
+                }
+
                 const match = regex.exec(value);
                 if (match) {
                     const matched = match[1] || match[2];
@@ -678,10 +682,6 @@ module.exports = Any.extend({
                     return value;
                 }
 
-                if (helpers.prefs.convert && options.encodeUri) {
-                    return encodeURI(value);
-                }
-
                 if (options.relativeOnly) {
                     return helpers.error('string.uriRelativeOnly');
                 }