From edc2a0c0976bf6bd603d4c2b1bffb4f70961978c Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 21 Nov 2019 11:58:59 -0700
Subject: [PATCH] SHIBUI-1602 Added regex validator for dynamic providers

---
 .../model/dynamic-http.provider.form.ts       | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
index 2096ac38b..395bf56e1 100644
--- a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
+++ b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
@@ -2,6 +2,10 @@ import { Wizard } from '../../../wizard/model';
 import { DynamicHttpMetadataProvider } from '../../domain/model/providers/dynamic-http-metadata-provider';
 import { BaseMetadataProviderEditor } from './base.provider.form';
 import { metadataFilterProcessor } from './utilities';
+import RegexValidator from '../../../shared/validation/regex.validator';
+import { memoize } from '../../../shared/memo';
+
+const checkRegex = memoize(RegexValidator.isValidRegex);
 
 export const DynamicHttpMetadataProviderWizard: Wizard<DynamicHttpMetadataProvider> = {
     ...BaseMetadataProviderEditor,
@@ -50,13 +54,30 @@ export const DynamicHttpMetadataProviderWizard: Wizard<DynamicHttpMetadataProvid
             if (!property.parent || !property.parent.value) {
                 return null;
             }
-            const isRegex = property.parent.value['@type'] === 'Regex';
-            const err = isRegex && !value ? {
-                code: 'REQUIRED',
+
+            const error = {
                 path: `#${property.path}`,
-                message: 'message.match-required',
                 params: [value]
-            } : null;
+            };
+
+            const isRegex = property.parent.value['@type'] === 'Regex';
+            let err = null;
+            if (isRegex) {
+                if (!value) {
+                    err = {
+                        ...error,
+                        code: 'REQUIRED',
+                        message: 'message.match-required'
+                    };
+                }
+                if (!checkRegex(value)) {
+                    err = {
+                        ...error,
+                        code: 'INVALID_REGEX',
+                        message: 'message.invalid-regex-pattern'
+                    };
+                }
+            }
             return err;
         };