fix: check for api url service subfolders, query, and fragment (#234)

* fix: check for url subfolders * fix: check for fragment and query in api service URI
microsoft · May 4, 2020 · 04a1696 · 04a1696
1 parent f6c8ffa
commit 04a1696
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/react/components/pages/projectSettings/editProjectForm.json b/src/react/components/pages/projectSettings/editProjectForm.json
@@ -19,8 +19,7 @@
         "apiUriBase": {
             "title": "Form recognizer service URI",
             "description": "Form recognizer service URI",
-            "type": "string",
-            "format": "uri"
+            "type": "string"
         },
         "apiKey": {
             "title": "API key",

diff --git a/src/react/components/pages/projectSettings/newProjectForm.json b/src/react/components/pages/projectSettings/newProjectForm.json
@@ -24,8 +24,7 @@
         "apiUriBase": {
             "title": "Form recognizer service URI",
             "description": "Form recognizer service URI",
-            "type": "string",
-            "format": "uri"
+            "type": "string"
         },
         "apiKey": {
             "title": "API key",

diff --git a/src/react/components/pages/projectSettings/projectForm.tsx b/src/react/components/pages/projectSettings/projectForm.tsx
@@ -175,6 +175,18 @@ export default class ProjectForm extends React.Component<IProjectFormProps, IPro
             Object.keys(project.sourceConnection).length === 0) {
             errors.sourceConnection.addError("is a required property");
         }
+        if (project.apiUriBase && errors.apiUriBase) {
+            const urlRegex = new RegExp(/^(https?:\/\/)([\w\-])+\.([a-zA-Z]{2,63})/);
+            if (urlRegex.test(project.apiUriBase)) {
+                if ((project.apiUriBase.match(/\//g) || []).length > 2 ||
+                    (project.apiUriBase.match(/\?/g) || []).length > 0 ||
+                    (project.apiUriBase.match(/#/g) || []).length > 0) {
+                    errors.apiUriBase.addError("should contain only protocol and domain name");
+                }
+            } else {
+                errors.apiUriBase.addError("should match URI format");
+            }
+        }
 
         if (this.state.classNames.indexOf("was-validated") === -1) {
             this.setState({