From 48a5ca29e7b8cbeb053eaf1dee27fd9ed24747d3 Mon Sep 17 00:00:00 2001
From: Caleb Cox <canac@users.noreply.github.com>
Date: Tue, 22 Oct 2024 15:51:29 -0500
Subject: [PATCH 1/3] Prevent conference names from containing special
 characters

---
 app/scripts/controllers/eventDashboard.js  |  4 ---
 app/scripts/controllers/eventDetails.js    |  5 +++
 app/views/modals/createEvent.html          | 41 ++++++++++++++++------
 test/spec/controllers/eventDetails.spec.js | 16 +++++++++
 4 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/app/scripts/controllers/eventDashboard.js b/app/scripts/controllers/eventDashboard.js
index a8fb55df2..877228fbf 100644
--- a/app/scripts/controllers/eventDashboard.js
+++ b/app/scripts/controllers/eventDashboard.js
@@ -41,10 +41,6 @@ angular
             templateUrl: createEventModalTemplate,
           })
           .result.then(function (conferenceName) {
-            if (!conferenceName) {
-              return;
-            }
-
             ConfCache.create(conferenceName).then(function (conference) {
               $location.path('/eventDetails/' + conference.id);
             });
diff --git a/app/scripts/controllers/eventDetails.js b/app/scripts/controllers/eventDetails.js
index d8068a917..0980601e6 100644
--- a/app/scripts/controllers/eventDetails.js
+++ b/app/scripts/controllers/eventDetails.js
@@ -263,6 +263,11 @@ angular
         if (_.isEmpty($scope.conference.name)) {
           validationErrors.push('Please enter an event name.');
         }
+        if (/[&"]/.test($scope.conference.name)) {
+          validationErrors.push(
+            'Please remove double quotes (") and ampersands (&) from the event name.',
+          );
+        }
 
         if (_.isEmpty($scope.conference.abbreviation)) {
           validationErrors.push('Please enter an event abbreviation.');
diff --git a/app/views/modals/createEvent.html b/app/views/modals/createEvent.html
index ae3678f00..2c343d7c6 100644
--- a/app/views/modals/createEvent.html
+++ b/app/views/modals/createEvent.html
@@ -2,25 +2,46 @@
   <button type="button" class="close" ng-click="$dismiss()">&times;</button>
   <h3 translate>Create Event</h3>
 </div>
-<div class="modal-body">
+<div class="modal-body" ng-form="form">
   <p>
     <translate>First things, first.</translate><br />
     <translate>Let's give this event a name:</translate>
   </p>
-  <input
-    type="text"
-    class="form-control"
-    placeholder="Example: Fall Retreat 2017"
-    ng-model="name"
-    ng-enter="$close(name)"
-    auto-focus
-  />
+  <div class="form-group">
+    <input
+      type="text"
+      class="form-control"
+      placeholder="Example: Fall Retreat 2017"
+      name="name"
+      ng-model="name"
+      ng-required="true"
+      ng-pattern='/^[^&"]+$/'
+      ng-enter="$close(name)"
+      auto-focus
+    />
+  </div>
+  <div
+    class="alert alert-danger"
+    ng-if="form.name.$invalid && form.name.$touched"
+  >
+    <p ng-if="form.name.$error.required" translate>
+      Please choose an event name.
+    </p>
+    <p ng-if="form.name.$error.pattern" translate>
+      Please choose an event name without quotes (") or ampersands (&).
+    </p>
+  </div>
 </div>
 <div class="modal-footer">
   <button ng-click="$dismiss()" class="btn btn-default" translate>
     Cancel
   </button>
-  <button ng-click="$close(name)" class="btn btn-primary" translate>
+  <button
+    ng-disabled="form.$invalid"
+    ng-click="$close(name)"
+    class="btn btn-primary"
+    translate
+  >
     Create
   </button>
 </div>
diff --git a/test/spec/controllers/eventDetails.spec.js b/test/spec/controllers/eventDetails.spec.js
index a0958b87f..db2ea0ea3 100644
--- a/test/spec/controllers/eventDetails.spec.js
+++ b/test/spec/controllers/eventDetails.spec.js
@@ -279,6 +279,22 @@ describe('Controller: eventDetails', function () {
         'Please enter which Event Type',
       );
     });
+
+    it('saveEvent() should validate the Event Name', () => {
+      scope.conference.name = 'Men & Women Conference';
+      scope.saveEvent();
+
+      expect(scope.notify.message.toString()).toContain(
+        'Please remove double quotes (") and ampersands (&) from the event name.',
+      );
+
+      scope.conference.name = '"Cru" Conference';
+      scope.saveEvent();
+
+      expect(scope.notify.message.toString()).toContain(
+        'Please remove double quotes (") and ampersands (&) from the event name.',
+      );
+    });
   });
 
   describe('Conference (Cru event) without ministry hosting', function () {

From 41451bcae9b458b60af831ab6bc444607c4d7866 Mon Sep 17 00:00:00 2001
From: Caleb Cox <canac@users.noreply.github.com>
Date: Fri, 25 Oct 2024 10:03:20 -0500
Subject: [PATCH 2/3] Validate event abbreviation

---
 app/scripts/controllers/eventDetails.js    |  5 ++
 test/spec/controllers/eventDetails.spec.js | 58 ++++++++++++++--------
 2 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/app/scripts/controllers/eventDetails.js b/app/scripts/controllers/eventDetails.js
index 0980601e6..a311baf27 100644
--- a/app/scripts/controllers/eventDetails.js
+++ b/app/scripts/controllers/eventDetails.js
@@ -272,6 +272,11 @@ angular
         if (_.isEmpty($scope.conference.abbreviation)) {
           validationErrors.push('Please enter an event abbreviation.');
         }
+        if (/[&"]/.test($scope.conference.abbreviation)) {
+          validationErrors.push(
+            'Please remove double quotes (") and ampersands (&) from the event abbreviation.',
+          );
+        }
 
         if (
           $scope.conference.abbreviation &&
diff --git a/test/spec/controllers/eventDetails.spec.js b/test/spec/controllers/eventDetails.spec.js
index db2ea0ea3..ee4f28980 100644
--- a/test/spec/controllers/eventDetails.spec.js
+++ b/test/spec/controllers/eventDetails.spec.js
@@ -268,32 +268,50 @@ describe('Controller: eventDetails', function () {
       }),
     );
 
-    it('saveEvent() should validate the Ministry Purpose', () => {
-      scope.saveEvent();
+    describe('saveEvent', () => {
+      it('should validate the Ministry Purpose', () => {
+        scope.saveEvent();
 
-      expect(scope.notify.message.toString()).toContain(
-        'Please enter Ministry Purpose.',
-      );
+        expect(scope.notify.message.toString()).toContain(
+          'Please enter Ministry Purpose.',
+        );
 
-      expect(scope.notify.message.toString()).not.toContain(
-        'Please enter which Event Type',
-      );
-    });
+        expect(scope.notify.message.toString()).not.toContain(
+          'Please enter which Event Type',
+        );
+      });
 
-    it('saveEvent() should validate the Event Name', () => {
-      scope.conference.name = 'Men & Women Conference';
-      scope.saveEvent();
+      it('should validate the Event Name', () => {
+        scope.conference.name = 'Men & Women Conference';
+        scope.saveEvent();
 
-      expect(scope.notify.message.toString()).toContain(
-        'Please remove double quotes (") and ampersands (&) from the event name.',
-      );
+        expect(scope.notify.message.toString()).toContain(
+          'Please remove double quotes (") and ampersands (&) from the event name.',
+        );
 
-      scope.conference.name = '"Cru" Conference';
-      scope.saveEvent();
+        scope.conference.name = '"Cru" Conference';
+        scope.saveEvent();
 
-      expect(scope.notify.message.toString()).toContain(
-        'Please remove double quotes (") and ampersands (&) from the event name.',
-      );
+        expect(scope.notify.message.toString()).toContain(
+          'Please remove double quotes (") and ampersands (&) from the event name.',
+        );
+      });
+
+      it('should validate the Event Abbreviation', () => {
+        scope.conference.abbreviation = 'men&women';
+        scope.saveEvent();
+
+        expect(scope.notify.message.toString()).toContain(
+          'Please remove double quotes (") and ampersands (&) from the event abbreviation.',
+        );
+
+        scope.conference.abbreviation = '"cru"conf';
+        scope.saveEvent();
+
+        expect(scope.notify.message.toString()).toContain(
+          'Please remove double quotes (") and ampersands (&) from the event abbreviation.',
+        );
+      });
     });
   });
 

From 7992c16578d8dcc1f1e0a029adbecd240262867f Mon Sep 17 00:00:00 2001
From: Caleb Cox <canac@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:25:14 -0500
Subject: [PATCH 3/3] Add passing validation tests

---
 test/spec/controllers/eventDetails.spec.js | 29 +++++++++++++---------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/test/spec/controllers/eventDetails.spec.js b/test/spec/controllers/eventDetails.spec.js
index ee4f28980..21c3d9701 100644
--- a/test/spec/controllers/eventDetails.spec.js
+++ b/test/spec/controllers/eventDetails.spec.js
@@ -282,35 +282,40 @@ describe('Controller: eventDetails', function () {
       });
 
       it('should validate the Event Name', () => {
+        const errorMessage =
+          'Please remove double quotes (") and ampersands (&) from the event name.';
+
+        scope.saveEvent();
+
+        expect(scope.notify.message.toString()).not.toContain(errorMessage);
+
         scope.conference.name = 'Men & Women Conference';
         scope.saveEvent();
 
-        expect(scope.notify.message.toString()).toContain(
-          'Please remove double quotes (") and ampersands (&) from the event name.',
-        );
+        expect(scope.notify.message.toString()).toContain(errorMessage);
 
         scope.conference.name = '"Cru" Conference';
         scope.saveEvent();
 
-        expect(scope.notify.message.toString()).toContain(
-          'Please remove double quotes (") and ampersands (&) from the event name.',
-        );
+        expect(scope.notify.message.toString()).toContain(errorMessage);
       });
 
       it('should validate the Event Abbreviation', () => {
+        const errorMessage =
+          'Please remove double quotes (") and ampersands (&) from the event abbreviation.';
+        scope.saveEvent();
+
+        expect(scope.notify.message.toString()).not.toContain(errorMessage);
+
         scope.conference.abbreviation = 'men&women';
         scope.saveEvent();
 
-        expect(scope.notify.message.toString()).toContain(
-          'Please remove double quotes (") and ampersands (&) from the event abbreviation.',
-        );
+        expect(scope.notify.message.toString()).toContain(errorMessage);
 
         scope.conference.abbreviation = '"cru"conf';
         scope.saveEvent();
 
-        expect(scope.notify.message.toString()).toContain(
-          'Please remove double quotes (") and ampersands (&) from the event abbreviation.',
-        );
+        expect(scope.notify.message.toString()).toContain(errorMessage);
       });
     });
   });