fix(registry/server): remove archived is-valid-domain lib using joi and regex

Author: stas-nc

.github/workflows/ci.yml

@@ -199,7 +199,7 @@ jobs:
                 options: --name=postgres --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
 
         steps:
-            - uses: actions/checkout@v64
+            - uses: actions/checkout@v6
               with:
                   ref: ${{ matrix.branch.ref }}
 

registry/package-lock.json

@@ -36,7 +36,6 @@
         "@types/escape-html": "^1.0.4",
         "@types/express": "^5.0.5",
         "@types/express-session": "^1.18.2",
-        "@types/is-valid-domain": "0.0.4",
         "@types/jsonwebtoken": "^9.0.10",
         "@types/lodash": "^4.17.21",
         "@types/mocha": "^10.0.10",
@@ -77,7 +76,6 @@
         "express-session": "^1.18.2",
         "http-shutdown": "^1.2.2",
         "ilc-plugins-sdk": "^2.3.0",
-        "is-valid-domain": "0.1.6",
         "joi": "^18.0.2",
         "knex": "^3.1.0",
         "lodash": "^4.17.21",

registry/package.json

@@ -1,7 +1,5 @@
 import Joi from 'joi';
-import isValidDomain from 'is-valid-domain';
 
-import { getJoiErr } from '../../util/helpers';
 import { templateNameSchema } from '../../templates/routes/validation';
 
 export default interface RouterDomains {
@@ -15,24 +13,18 @@ export default interface RouterDomains {
 
 export const routerDomainIdSchema = Joi.string().trim().required();
 
-const domainValidation = (fieldName: string) =>
-    Joi.string()
-        .trim()
-        .min(1)
-        .external((value) => {
-            if (!value) return;
-
-            if (value.match(/^(localhost|127\.0\.0\.1)(:\d{1,5})?$/) || isValidDomain(value)) {
-                return;
-            }
-
-            throw getJoiErr(fieldName, `Specified "${fieldName}" is not valid.`, value);
-        });
+const domainValidation = () =>
+    Joi.alternatives().try(
+        Joi.string()
+            .trim()
+            .pattern(/^(localhost|127\.0\.0\.1)(:\d{1,5})?$/),
+        Joi.string().trim().min(1).domain({ allowFullyQualified: true, tlds: false }),
+    );
 
 const commonRouterDomainsSchema = {
-    domainName: domainValidation('domainName').required(),
+    domainName: domainValidation().required(),
     template500: templateNameSchema.required(),
-    canonicalDomain: domainValidation('canonicalDomain').allow(null).default(null),
+    canonicalDomain: domainValidation().allow(null).default(null),
     props: Joi.object().allow(null).default(null),
     ssrProps: Joi.object().allow(null).default(null),
     versionId: Joi.string().strip(),

registry/server/routerDomains/interfaces/index.ts

@@ -71,7 +71,7 @@ describe(`Tests ${example.url}`, () => {
             await req
                 .post(example.url)
                 .send(incorrect)
-                .expect(422, '"domainName" must be a string\n' + '"template500" must be a string');
+                .expect(422, '"domainName" must be one of [string]\n' + '"template500" must be a string');
         });
 
         it('should not create record with non-existed template500', async () => {
@@ -323,7 +323,7 @@ describe(`Tests ${example.url}`, () => {
                 await req
                     .put(example.url + routerDomainsId)
                     .send(incorrect)
-                    .expect(422, '"domainName" must be a string\n' + '"template500" must be a string');
+                    .expect(422, '"domainName" must be one of [string]\n' + '"template500" must be a string');
             } finally {
                 routerDomainsId && (await req.delete(example.url + routerDomainsId));
             }