From 0a65a233d7ba2187fae4567ae7906dcc30f3443b Mon Sep 17 00:00:00 2001
From: Sivin Varghese <64252451+iamsivin@users.noreply.github.com>
Date: Mon, 9 Jan 2023 13:42:19 +0530
Subject: [PATCH] fix: Invalid portal domain validation (#6166)

* fix: Invalid portal domain validation


Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
Co-authored-by: Muhsin Keloth <muhsinkeramam@gmail.com>
---
 .../components/PortalSettingsBasicForm.vue       |  5 +++--
 app/javascript/shared/helpers/Validators.js      |  4 ++++
 .../helpers/specs/ValidatorsHelper.spec.js       | 16 ++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
index 4e430da5d..dbd662b1d 100644
--- a/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
+++ b/app/javascript/dashboard/routes/dashboard/helpcenter/components/PortalSettingsBasicForm.vue
@@ -81,7 +81,8 @@
 </template>
 
 <script>
-import { required, url, minLength } from 'vuelidate/lib/validators';
+import { required, minLength } from 'vuelidate/lib/validators';
+import { isDomain } from 'shared/helpers/Validators';
 import thumbnail from 'dashboard/components/widgets/Thumbnail';
 import { convertToCategorySlug } from 'dashboard/helper/commons.js';
 import { buildPortalURL } from 'dashboard/helper/portalHelper';
@@ -121,7 +122,7 @@ export default {
       required,
     },
     domain: {
-      url,
+      isDomain,
     },
   },
   computed: {
diff --git a/app/javascript/shared/helpers/Validators.js b/app/javascript/shared/helpers/Validators.js
index 8130482ed..372ab8449 100644
--- a/app/javascript/shared/helpers/Validators.js
+++ b/app/javascript/shared/helpers/Validators.js
@@ -17,3 +17,7 @@ export const isValidPassword = value => {
   );
 };
 export const isNumber = value => /^\d+$/.test(value);
+export const isDomain = value => {
+  const domainRegex = /^([\p{L}0-9]+(-[\p{L}0-9]+)*\.)+[a-z]{2,}$/gmu;
+  return domainRegex.test(value);
+};
diff --git a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
index f01b09269..686ec5e4e 100644
--- a/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
+++ b/app/javascript/shared/helpers/specs/ValidatorsHelper.spec.js
@@ -1,6 +1,7 @@
 import { shouldBeUrl } from '../Validators';
 import { isValidPassword } from '../Validators';
 import { isNumber } from '../Validators';
+import { isDomain } from '../Validators';
 
 describe('#shouldBeUrl', () => {
   it('should return correct url', () => {
@@ -35,3 +36,18 @@ describe('#isNumber', () => {
     expect(isNumber('string')).toEqual(false);
   });
 });
+
+describe('#isDomain', () => {
+  it('should return correct domain', () => {
+    expect(isDomain('test.com')).toEqual(true);
+    expect(isDomain('www.test.com')).toEqual(true);
+  });
+
+  it('should return wrong domain', () => {
+    expect(isDomain('test')).toEqual(false);
+    expect(isDomain('test.')).toEqual(false);
+    expect(isDomain('test.123')).toEqual(false);
+    expect(isDomain('http://www.test.com')).toEqual(false);
+    expect(isDomain('https://test.in')).toEqual(false);
+  });
+});