Merge pull request #2916 from hapijs/fix/email-options

fix: properly transform domain
hapijs · Feb 21, 2023 · d49e029 · d49e029
2 parents cc88b68 + 245e0c9
commit d49e029
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/benchmarks/package.json b/benchmarks/package.json
@@ -7,13 +7,13 @@
     "full-bench": "npm run bench-update -- --joi @hapi/joi && npm test"
   },
   "dependencies": {
-    "@hapi/bossy": "^4.0.3",
-    "@hapi/hoek": "^6.2.4",
+    "@hapi/bossy": "^6.0.1",
+    "@hapi/hoek": "^11.0.2",
     "@hapi/joi": "^15.1.0",
     "benchmark": "^2.1.4",
     "chalk": "^2.4.1",
-    "cli-table": "^0.3.1",
+    "cli-table": "^0.3.11",
     "d3-format": "^1.3.2",
-    "joi": "^17.6.4"
+    "joi": "^17.8.1"
   }
 }
diff --git a/browser/tests/index.js b/browser/tests/index.js
@@ -34,6 +34,11 @@ describe('Joi', () => {
         Assert.ok(!schema.validate('test@example.com').error);
         Assert.ok(schema.validate('test@example.com ').error);
         Assert.ok(!schema.validate('伊昭傑@郵件.商務').error);
+
+        const schema2 = Joi.string().email({ tlds: { allow: false } }).required();
+        Assert.ok(!schema2.validate('test@example.com').error);
+        Assert.ok(schema2.validate('test@example.com ').error);
+        Assert.ok(!schema2.validate('伊昭傑@郵件.商務').error);
     });
 
     it('validates domain', () => {
@@ -42,5 +47,10 @@ describe('Joi', () => {
         Assert.ok(!schema.validate('example.com').error);
         Assert.ok(schema.validate('example.com ').error);
         Assert.ok(!schema.validate('example.商務').error);
+
+        const schema2 = Joi.string().domain({ tlds: { allow: false } }).required();
+        Assert.ok(!schema2.validate('example.com').error);
+        Assert.ok(schema2.validate('example.com ').error);
+        Assert.ok(!schema2.validate('example.商務').error);
     });
 });
diff --git a/lib/types/string.js b/lib/types/string.js
@@ -772,7 +772,7 @@ internals.addressOptions = function (options) {
 
     const allow = options.tlds.allow;
     if (!allow) {
-        return options;
+        return { ...options, tlds: false };
     }
 
     if (allow === true) {