Merge pull request #535 from communitiesuk/FS-4357-making-protocol-ca…

…se-insensitive FS-4357: Protocol validation made case insensitive
communitiesuk · May 15, 2024 · d992c8f · d992c8f
2 parents 45c4bf1 + 00bc1ff
commit d992c8f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/runner/src/server/plugins/engine/components/WebsiteField.ts b/runner/src/server/plugins/engine/components/WebsiteField.ts
@@ -33,7 +33,7 @@ export class WebsiteField extends TextField {
     this.formSchema = this.formSchema
       .label(def.title)
       .pattern(
-        /^(https?:\/\/)?(www\.)?[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})(\.[a-zA-Z0-9]{2,})?/
+        /^((https?|HTTPS?):\/\/)?(www\.)?[a-zA-Z0-9]{2,}(\.[a-zA-Z0-9]{2,})(\.[a-zA-Z0-9]{2,})?/
       )
       .message(def.options?.customValidationMessage ?? this.defaultMessage);
 

diff --git a/runner/src/server/views/partials/summary-row.html b/runner/src/server/views/partials/summary-row.html
@@ -9,7 +9,7 @@
                 {% for itemValue in item.value%}
                     {{itemValue}}<br>
                 {% endfor %}
-            {% elif item.type == 'NumberField' or item.type == 'WebsiteField' and not ( 'https://' in item.value or 'http://' in item.value ) %}
+            {% elif item.type == 'NumberField' or item.type == 'WebsiteField' and 'http' not in item.value|lower %}
                 {{item.prefix}}{{item.value}}
             {% elif item.type == 'ClientSideFileUploadField' %}
                 {% if item.value.files|length == 0 %}

diff --git a/version b/version
@@ -1 +1 @@
-VERSION=0.1.271
+VERSION=0.1.272