From 32f4dc04c0890a47b6f28e466fc4f61155e9a1a0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Oct 2020 15:28:44 +0800
Subject: [PATCH 01/17] chore(deps-dev): bump ts-jest from 26.3.0 to 26.4.1
 (#496)

Bumps [ts-jest](https://github.com/kulshekhar/ts-jest) from 26.3.0 to 26.4.1.
- [Release notes](https://github.com/kulshekhar/ts-jest/releases)
- [Changelog](https://github.com/kulshekhar/ts-jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kulshekhar/ts-jest/compare/v26.3.0...v26.4.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 37 +++++++++++++++++++++----------------
 package.json      |  2 +-
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0787f17b5b..1be6333132 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16437,12 +16437,12 @@
       }
     },
     "jest-util": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.3.0.tgz",
-      "integrity": "sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==",
+      "version": "26.6.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.0.tgz",
+      "integrity": "sha512-/cUGqcnKeZMjvTQLfJo65nBOEZ/k0RB/8usv2JpfYya05u0XvBmKkIH5o5c4nCh9DD61B1YQjMGGqh1Ha0aXdg==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.3.0",
+        "@jest/types": "^26.6.0",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
@@ -16451,9 +16451,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.3.0.tgz",
-          "integrity": "sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==",
+          "version": "26.6.0",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.0.tgz",
+          "integrity": "sha512-8pDeq/JVyAYw7jBGU83v8RMYAkdrRxLG3BGnAJuqaQAUd6GWBmND2uyl+awI88+hit48suLoLjNFtR+ZXxWaYg==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16473,12 +16473,11 @@
           }
         },
         "ansi-styles": {
-          "version": "4.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
           "dev": true,
           "requires": {
-            "@types/color-name": "^1.1.1",
             "color-convert": "^2.0.1"
           }
         },
@@ -25285,22 +25284,22 @@
       }
     },
     "ts-jest": {
-      "version": "26.3.0",
-      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.3.0.tgz",
-      "integrity": "sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q==",
+      "version": "26.4.1",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.4.1.tgz",
+      "integrity": "sha512-F4aFq01aS6mnAAa0DljNmKr/Kk9y4HVZ1m6/rtJ0ED56cuxINGq3Q9eVAh+z5vcYKe5qnTMvv90vE8vUMFxomg==",
       "dev": true,
       "requires": {
         "@types/jest": "26.x",
         "bs-logger": "0.x",
         "buffer-from": "1.x",
         "fast-json-stable-stringify": "2.x",
-        "jest-util": "26.x",
+        "jest-util": "^26.1.0",
         "json5": "2.x",
         "lodash.memoize": "4.x",
         "make-error": "1.x",
         "mkdirp": "1.x",
         "semver": "7.x",
-        "yargs-parser": "18.x"
+        "yargs-parser": "20.x"
       },
       "dependencies": {
         "json5": {
@@ -25323,6 +25322,12 @@
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
           "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
           "dev": true
+        },
+        "yargs-parser": {
+          "version": "20.2.3",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.3.tgz",
+          "integrity": "sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww==",
+          "dev": true
         }
       }
     },
diff --git a/package.json b/package.json
index 6da8edc113..37f222bf9f 100644
--- a/package.json
+++ b/package.json
@@ -241,7 +241,7 @@
     "supertest-session": "^4.1.0",
     "terser-webpack-plugin": "^1.2.3",
     "testcafe": "^1.8.6",
-    "ts-jest": "^26.3.0",
+    "ts-jest": "^26.4.1",
     "ts-loader": "^7.0.5",
     "ts-mock-imports": "^1.3.0",
     "ts-node": "^9.0.0",

From 8476a17087d31cfa35d651de7fb1aa339bee1588 Mon Sep 17 00:00:00 2001
From: LoneRifle <LoneRifle@users.noreply.github.com>
Date: Tue, 20 Oct 2020 16:15:55 +0800
Subject: [PATCH 02/17] docs(readme): acknowledge TellForm, others (#495)

Acknowledge the contributions made by TellForm and its lead,
as well as those who have worked on FormSG who are not in
the commit log

Co-authored-by: Antariksh Mahajan <antarikshmahajan@gmail.com>
---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index f00489325e..e51e0212d1 100755
--- a/README.md
+++ b/README.md
@@ -192,3 +192,19 @@ We welcome all contributions, bug reports, bug fixes, documentation improvements
 ## Support
 
 Please contact FormSG (formsg@tech.gov.sg) for any details.
+
+## Acknowledgements
+
+FormSG acknowledges the work done by [Arielle Baldwynn](https://github.com/whitef0x0) to build and maintain [TellForm](https://github.com/tellform), on which FormSG is based. 
+
+Contributions have also been made by:  
+[@RyanAngJY](https://github.com/RyanAngJY)  
+[@jeantanzy](https://github.com/jeantanzy)  
+[@yong-jie](https://github.com/yong-jie)  
+[@pregnantboy](https://github.com/pregnantboy)  
+[@namnguyen08](https://github.com/namnguyen08)  
+[@zioul123](https://github.com/zioul123)  
+[@JoelWee](https://github.com/JoelWee)  
+[@limli](https://github.com/limli)  
+[@tankevan](https://github.com/tankevan)  
+[@LoneRifle](https://github.com/LoneRifle)

From 6c499f4e7a041966dd380bc010bb9bdf6f041391 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 20 Oct 2020 20:17:02 +0800
Subject: [PATCH 03/17] fix(deps): bump angular-sanitize from 1.8.0 to 1.8.1
 (#494)

Bumps [angular-sanitize](https://github.com/angular/angular.js) from 1.8.0 to 1.8.1.
- [Release notes](https://github.com/angular/angular.js/releases)
- [Changelog](https://github.com/angular/angular.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/angular/angular.js/compare/v1.8.0...v1.8.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 6 +++---
 package.json      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 1be6333132..ac776aa525 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5463,9 +5463,9 @@
       "integrity": "sha512-N3NmT+3qrfq6w4THWwNYiOVBjQp0U4AomRYyc7zd6QXFll+dQVNe/IfqzAHdSfYRg0EUAZflJzjsoWjVf5VqrA=="
     },
     "angular-sanitize": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.0.tgz",
-      "integrity": "sha512-j5GiOPCvfcDWK5svEOVoPb11X3UDVy/mdHPRWuy14Iyw86xaq+Bb+x/em2sAOa5MQQeY5ciLXbF3RRp8iCKcNg=="
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/angular-sanitize/-/angular-sanitize-1.8.1.tgz",
+      "integrity": "sha512-kDtbAQkN+biyvBMJ8mgFIDZureng5yl6qegFCQ+bUw50n3KOx4FCsZ9S5tNAQ/rjYYTC5tP4hREv7+2ha+8M2w=="
     },
     "angular-translate": {
       "version": "2.18.2",
diff --git a/package.json b/package.json
index 37f222bf9f..babb37552e 100644
--- a/package.json
+++ b/package.json
@@ -81,7 +81,7 @@
     "angular-moment": "~1.2.0",
     "angular-permission": "~1.1.1",
     "angular-resource": "^1.8.1",
-    "angular-sanitize": "^1.8.0",
+    "angular-sanitize": "^1.8.1",
     "angular-translate": "^2.18.2",
     "angular-translate-loader-partial": "^2.18.3",
     "angular-ui-bootstrap": "~2.5.6",

From 48f90353dcd717e8b2b3f79510ab09ec6cd4c359 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Oct 2020 19:38:45 +0800
Subject: [PATCH 04/17] fix(deps): bump selectize from 0.12.4 to 0.12.6 (#500)

Bumps [selectize](https://github.com/selectize/selectize.js) from 0.12.4 to 0.12.6.
- [Release notes](https://github.com/selectize/selectize.js/releases)
- [Changelog](https://github.com/selectize/selectize.js/blob/master/CHANGELOG.md)
- [Commits](https://github.com/selectize/selectize.js/compare/v0.12.4...v0.12.6)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 24 +++++++++++-------------
 package.json      |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d8aff78172..896485fd2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5781,6 +5781,14 @@
       "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
       "dev": true
     },
+    "async": {
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+      "requires": {
+        "lodash": "^4.17.14"
+      }
+    },
     "async-each": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
@@ -22417,9 +22425,9 @@
       "integrity": "sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0="
     },
     "selectize": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/selectize/-/selectize-0.12.4.tgz",
-      "integrity": "sha1-UMaXUmtgneoR2hU89yUrmJSPTA4=",
+      "version": "0.12.6",
+      "resolved": "https://registry.npmjs.org/selectize/-/selectize-0.12.6.tgz",
+      "integrity": "sha512-bWO5A7G+I8+QXyjLfQUgh31VI4WKYagUZQxAXlDyUmDDNrFxrASV0W9hxCOl0XJ/XQ1dZEu3G9HjXV4Wj0yb6w==",
       "requires": {
         "microplugin": "0.0.3",
         "sifter": "^0.5.1"
@@ -22594,16 +22602,6 @@
         "csv-parse": "^4.6.5",
         "humanize": "^0.0.9",
         "optimist": "^0.6.1"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        }
       }
     },
     "signal-exit": {
diff --git a/package.json b/package.json
index f7f739ac87..84ae71cef4 100644
--- a/package.json
+++ b/package.json
@@ -144,7 +144,7 @@
     "opossum": "^5.0.1",
     "promise-retry": "^2.0.1",
     "puppeteer-core": "3.1.0",
-    "selectize": "0.12.4",
+    "selectize": "0.12.6",
     "slick-carousel": "1.8.1",
     "sortablejs": "~1.10.2",
     "text-encoding": "^0.7.0",

From 24e77005f5a8baf396bafa275f397ad572677637 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Oct 2020 09:50:40 +0800
Subject: [PATCH 05/17] chore(deps-dev): bump @typescript-eslint/parser from
 4.0.1 to 4.5.0 (#501)

Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 4.0.1 to 4.5.0.
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/master/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v4.5.0/packages/parser)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 74 ++++++++++++++++++++++++++++++++++++++++-------
 package.json      |  2 +-
 2 files changed, 65 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 896485fd2a..a0816c6a4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5002,25 +5002,79 @@
       }
     },
     "@typescript-eslint/parser": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.0.1.tgz",
-      "integrity": "sha512-1+qLmXHNAWSQ7RB6fdSQszAiA7JTwzakj5cNYjBTUmpH2cqilxMZEIV+DRKjVZs8NzP3ALmKexB0w/ExjcK9Iw==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.5.0.tgz",
+      "integrity": "sha512-xb+gmyhQcnDWe+5+xxaQk5iCw6KqXd8VQxGiTeELTMoYeRjpocZYYRP1gFVM2C8Yl0SpUvLa1lhprwqZ00w3Iw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/scope-manager": "4.0.1",
-        "@typescript-eslint/types": "4.0.1",
-        "@typescript-eslint/typescript-estree": "4.0.1",
+        "@typescript-eslint/scope-manager": "4.5.0",
+        "@typescript-eslint/types": "4.5.0",
+        "@typescript-eslint/typescript-estree": "4.5.0",
         "debug": "^4.1.1"
       },
       "dependencies": {
+        "@typescript-eslint/scope-manager": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.5.0.tgz",
+          "integrity": "sha512-C0cEO0cTMPJ/w4RA/KVe4LFFkkSh9VHoFzKmyaaDWAnPYIEzVCtJ+Un8GZoJhcvq+mPFXEsXa01lcZDHDG6Www==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.5.0",
+            "@typescript-eslint/visitor-keys": "4.5.0"
+          }
+        },
+        "@typescript-eslint/types": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.5.0.tgz",
+          "integrity": "sha512-n2uQoXnyWNk0Les9MtF0gCK3JiWd987JQi97dMSxBOzVoLZXCNtxFckVqt1h8xuI1ix01t+iMY4h4rFMj/303g==",
+          "dev": true
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.5.0.tgz",
+          "integrity": "sha512-gN1mffq3zwRAjlYWzb5DanarOPdajQwx5MEWkWCk0XvqC8JpafDTeioDoow2L4CA/RkYZu7xEsGZRhqrTsAG8w==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.5.0",
+            "@typescript-eslint/visitor-keys": "4.5.0",
+            "debug": "^4.1.1",
+            "globby": "^11.0.1",
+            "is-glob": "^4.0.1",
+            "lodash": "^4.17.15",
+            "semver": "^7.3.2",
+            "tsutils": "^3.17.1"
+          }
+        },
+        "@typescript-eslint/visitor-keys": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.5.0.tgz",
+          "integrity": "sha512-UHq4FSa55NDZqscRU//O5ROFhHa9Hqn9KWTEvJGTArtTQp5GKv9Zqf6d/Q3YXXcFv4woyBml7fJQlQ+OuqRcHA==",
+          "dev": true,
+          "requires": {
+            "@typescript-eslint/types": "4.5.0",
+            "eslint-visitor-keys": "^2.0.0"
+          }
+        },
         "debug": {
-          "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-          "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+          "version": "4.2.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz",
+          "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==",
           "dev": true,
           "requires": {
-            "ms": "^2.1.1"
+            "ms": "2.1.2"
           }
+        },
+        "eslint-visitor-keys": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz",
+          "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==",
+          "dev": true
+        },
+        "semver": {
+          "version": "7.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+          "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+          "dev": true
         }
       }
     },
diff --git a/package.json b/package.json
index 84ae71cef4..92c177edb4 100644
--- a/package.json
+++ b/package.json
@@ -194,7 +194,7 @@
     "@types/uuid": "^8.3.0",
     "@types/validator": "^13.1.0",
     "@typescript-eslint/eslint-plugin": "^4.0.1",
-    "@typescript-eslint/parser": "^4.0.0",
+    "@typescript-eslint/parser": "^4.5.0",
     "auto-changelog": "^2.2.1",
     "axios-mock-adapter": "^1.18.2",
     "babel-loader": "^8.0.5",

From 5844618204c10873f1f4655242070eff1c07e5fd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Oct 2020 09:51:49 +0800
Subject: [PATCH 06/17] fix(deps): bump mongoose from 5.10.0 to 5.10.9 (#449)

Bumps [mongoose](https://github.com/Automattic/mongoose) from 5.10.0 to 5.10.9.
- [Release notes](https://github.com/Automattic/mongoose/releases)
- [Changelog](https://github.com/Automattic/mongoose/blob/master/History.md)
- [Commits](https://github.com/Automattic/mongoose/compare/5.10.0...5.10.9)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0816c6a4a..73549f4a8d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19001,13 +19001,13 @@
       "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE="
     },
     "mongoose": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.0.tgz",
-      "integrity": "sha512-5itAvBMVDG4+zTDtuLg/IyoTxEMgvpOSHnigQ9Cyh8LR4BEgMAChJj7JSaGkg+tr1AjCSY9DgSdU8bHqCOoxXg==",
+      "version": "5.10.9",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.9.tgz",
+      "integrity": "sha512-7dkr1d6Uyk87hELzoc6B7Zo7kkPTx8rKummk51Y0je2V2Ttsw0KFPwTp1G8JIbBta7Wpw8j15PJi0d33Ode2nw==",
       "requires": {
         "bson": "^1.1.4",
         "kareem": "2.3.1",
-        "mongodb": "3.6.0",
+        "mongodb": "3.6.2",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.7.0",
         "mquery": "3.2.2",
@@ -19024,11 +19024,11 @@
           "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="
         },
         "mongodb": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.0.tgz",
-          "integrity": "sha512-/XWWub1mHZVoqEsUppE0GV7u9kanLvHxho6EvBxQbShXTKYF9trhZC2NzbulRGeG7xMJHD8IOWRcdKx5LPjAjQ==",
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.2.tgz",
+          "integrity": "sha512-sSZOb04w3HcnrrXC82NEh/YGCmBuRgR+C1hZgmmv4L6dBz4BkRse6Y8/q/neXer9i95fKUBbFi4KgeceXmbsOA==",
           "requires": {
-            "bl": "^2.2.0",
+            "bl": "^2.2.1",
             "bson": "^1.1.4",
             "denque": "^1.4.1",
             "require_optional": "^1.0.1",
diff --git a/package.json b/package.json
index 92c177edb4..8d42e116e5 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "lodash": "^4.17.20",
     "moment-timezone": "0.5.31",
     "mongodb-uri": "^0.9.7",
-    "mongoose": "^5.10.0",
+    "mongoose": "^5.10.9",
     "multiparty": ">=4.2.2",
     "neverthrow": "^2.7.1",
     "ng-infinite-scroll": "^1.3.0",

From a6ac8ef67dbdaefbab0a1fecc1173fc4f6a70399 Mon Sep 17 00:00:00 2001
From: Yuan Ruo <yuanruo@data.gov.sg>
Date: Thu, 22 Oct 2020 11:58:08 +0800
Subject: [PATCH 07/17] build: revert "fix(deps): bump mongoose from 5.10.0 to
 5.10.9"

This reverts commit 5844618204c10873f1f4655242070eff1c07e5fd.
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 73549f4a8d..a0816c6a4a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19001,13 +19001,13 @@
       "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE="
     },
     "mongoose": {
-      "version": "5.10.9",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.9.tgz",
-      "integrity": "sha512-7dkr1d6Uyk87hELzoc6B7Zo7kkPTx8rKummk51Y0je2V2Ttsw0KFPwTp1G8JIbBta7Wpw8j15PJi0d33Ode2nw==",
+      "version": "5.10.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.0.tgz",
+      "integrity": "sha512-5itAvBMVDG4+zTDtuLg/IyoTxEMgvpOSHnigQ9Cyh8LR4BEgMAChJj7JSaGkg+tr1AjCSY9DgSdU8bHqCOoxXg==",
       "requires": {
         "bson": "^1.1.4",
         "kareem": "2.3.1",
-        "mongodb": "3.6.2",
+        "mongodb": "3.6.0",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.7.0",
         "mquery": "3.2.2",
@@ -19024,11 +19024,11 @@
           "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="
         },
         "mongodb": {
-          "version": "3.6.2",
-          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.2.tgz",
-          "integrity": "sha512-sSZOb04w3HcnrrXC82NEh/YGCmBuRgR+C1hZgmmv4L6dBz4BkRse6Y8/q/neXer9i95fKUBbFi4KgeceXmbsOA==",
+          "version": "3.6.0",
+          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.0.tgz",
+          "integrity": "sha512-/XWWub1mHZVoqEsUppE0GV7u9kanLvHxho6EvBxQbShXTKYF9trhZC2NzbulRGeG7xMJHD8IOWRcdKx5LPjAjQ==",
           "requires": {
-            "bl": "^2.2.1",
+            "bl": "^2.2.0",
             "bson": "^1.1.4",
             "denque": "^1.4.1",
             "require_optional": "^1.0.1",
diff --git a/package.json b/package.json
index 8d42e116e5..92c177edb4 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "lodash": "^4.17.20",
     "moment-timezone": "0.5.31",
     "mongodb-uri": "^0.9.7",
-    "mongoose": "^5.10.9",
+    "mongoose": "^5.10.0",
     "multiparty": ">=4.2.2",
     "neverthrow": "^2.7.1",
     "ng-infinite-scroll": "^1.3.0",

From 4fe70dec02f5ac9f403c57af524202aee992330f Mon Sep 17 00:00:00 2001
From: Yuan Ruo <yuanruo@data.gov.sg>
Date: Thu, 22 Oct 2020 12:37:57 +0800
Subject: [PATCH 08/17] build: pin mongoose version to 5.10.0 (#504)

Co-authored-by: Yuanruo Liang <yuanruo@open.gov.sg>
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 92c177edb4..fd37143e4b 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "lodash": "^4.17.20",
     "moment-timezone": "0.5.31",
     "mongodb-uri": "^0.9.7",
-    "mongoose": "^5.10.0",
+    "mongoose": "5.10.0",
     "multiparty": ">=4.2.2",
     "neverthrow": "^2.7.1",
     "ng-infinite-scroll": "^1.3.0",

From 1d3213aa99ff7e97dc17a6d43c3a6c987f71e33a Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Mon, 26 Oct 2020 10:12:49 +0800
Subject: [PATCH 09/17] feat: require non-empty domains if restrict domain is
 toggled on (#507)

* feat: require non-empty domains if restrict domain is toggled on

* style: add red border to edit panel textareas if input is invalid
---
 src/public/modules/forms/admin/css/edit-form.css         | 4 ++++
 .../forms/admin/views/edit-fields.client.modal.html      | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/public/modules/forms/admin/css/edit-form.css b/src/public/modules/forms/admin/css/edit-form.css
index 4f5d70d8e8..fe52d24398 100644
--- a/src/public/modules/forms/admin/css/edit-form.css
+++ b/src/public/modules/forms/admin/css/edit-form.css
@@ -961,6 +961,10 @@
   resize: vertical;
 }
 
+.edit-modal-window .edit-panel textarea.ng-invalid {
+  border: 2px solid #a94442 !important;
+}
+
 #admin-form .ui-sortable-placeholder {
   visibility: visible !important;
   border: none;
diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
index b93c8efdb0..f55d3bf29f 100644
--- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
@@ -635,13 +635,14 @@ <h2 class="modal-title">
         >
           <br />
           <div class="row label-custom label-medium">
-            <div class="col-md-12">Domains allowed</div>
+            <div class="col-md-12 label-bottom">Domains allowed</div>
           </div>
           <div class="row">
             <div class="col-md-12">
               <textarea
                 class="input-custom input-medium"
                 ng-disabled="!vm.field.isVerifiable || !vm.field.hasAllowedEmailDomains"
+                ng-required="vm.field.hasAllowedEmailDomains"
                 ng-model="vm.field.allowedEmailDomainsFromText"
                 name="allowedEmailDomainsFromText"
                 validate-email-domain-from-text
@@ -665,6 +666,12 @@ <h2 class="modal-title">
                     check that all the domains start with @.
                   </span>
                 </div>
+                <div class="alert-custom alert-error" ng-message="required">
+                  <i class="bx bx-exclamation bx-md icon-spacing"></i>
+                  <span class="alert-msg">
+                    Allowed domains cannot be empty.
+                  </span>
+                </div>
               </div>
             </div>
           </div>

From 5715eac99fbdd2c9dd635ce50068ca7ffc77390e Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Mon, 26 Oct 2020 16:28:19 +0800
Subject: [PATCH 10/17] fix(deps): unpin and bump mongoose from 5.10.0 to
 5.10.10 (#513)

---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0816c6a4a..42134237ec 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19001,13 +19001,13 @@
       "integrity": "sha1-D3ca0W9IOuZfQoeWlCjp+8SqYYE="
     },
     "mongoose": {
-      "version": "5.10.0",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.0.tgz",
-      "integrity": "sha512-5itAvBMVDG4+zTDtuLg/IyoTxEMgvpOSHnigQ9Cyh8LR4BEgMAChJj7JSaGkg+tr1AjCSY9DgSdU8bHqCOoxXg==",
+      "version": "5.10.10",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-5.10.10.tgz",
+      "integrity": "sha512-KjCbWXTJ36RHMe0g31UG0/sANpJ9ekCIena7FkrCFlq5E9gJj/B2SgE5XQzIEiR1h4xMOVGKzyenCnyTw9UHZQ==",
       "requires": {
         "bson": "^1.1.4",
         "kareem": "2.3.1",
-        "mongodb": "3.6.0",
+        "mongodb": "3.6.2",
         "mongoose-legacy-pluralize": "1.0.2",
         "mpath": "0.7.0",
         "mquery": "3.2.2",
@@ -19024,11 +19024,11 @@
           "integrity": "sha512-kDuEzldR21lHciPQAIulLs1LZlCXdLziXI6Mb/TDkwXhb//UORJNPXgcRs2CuO4H0DcMkpfT3/ySsP3unoZjBg=="
         },
         "mongodb": {
-          "version": "3.6.0",
-          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.0.tgz",
-          "integrity": "sha512-/XWWub1mHZVoqEsUppE0GV7u9kanLvHxho6EvBxQbShXTKYF9trhZC2NzbulRGeG7xMJHD8IOWRcdKx5LPjAjQ==",
+          "version": "3.6.2",
+          "resolved": "https://registry.npmjs.org/mongodb/-/mongodb-3.6.2.tgz",
+          "integrity": "sha512-sSZOb04w3HcnrrXC82NEh/YGCmBuRgR+C1hZgmmv4L6dBz4BkRse6Y8/q/neXer9i95fKUBbFi4KgeceXmbsOA==",
           "requires": {
-            "bl": "^2.2.0",
+            "bl": "^2.2.1",
             "bson": "^1.1.4",
             "denque": "^1.4.1",
             "require_optional": "^1.0.1",
diff --git a/package.json b/package.json
index fd37143e4b..9ee959132d 100644
--- a/package.json
+++ b/package.json
@@ -131,7 +131,7 @@
     "lodash": "^4.17.20",
     "moment-timezone": "0.5.31",
     "mongodb-uri": "^0.9.7",
-    "mongoose": "5.10.0",
+    "mongoose": "^5.10.10",
     "multiparty": ">=4.2.2",
     "neverthrow": "^2.7.1",
     "ng-infinite-scroll": "^1.3.0",

From 9823124336012d0149b2b70ee3d449555559c699 Mon Sep 17 00:00:00 2001
From: shuli-ogp <63710093+shuli-ogp@users.noreply.github.com>
Date: Mon, 26 Oct 2020 20:59:29 +0800
Subject: [PATCH 11/17] feat: log create form failure on GA (#505)

* feat: log create form failure on GA

* feat: add userEmail to log
---
 .../modules/core/services/gtag.client.service.js    | 13 +++++++++++++
 .../create-form-modal.client.controller.js          |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/src/public/modules/core/services/gtag.client.service.js b/src/public/modules/core/services/gtag.client.service.js
index 4060bcc4a8..ad5f9684d2 100644
--- a/src/public/modules/core/services/gtag.client.service.js
+++ b/src/public/modules/core/services/gtag.client.service.js
@@ -109,6 +109,19 @@ function GTag(Auth, $rootScope, $window) {
     }
   }
 
+  /**
+   * Logs an admin user's failure to create form
+   * @param  {Object} form The form object
+   * @return {Void}
+   */
+  gtagService.createFormFailed = () => {
+    _gtagEvents('create_form', {
+      event_category: 'Create Form',
+      event_action: 'Create Form failed',
+      event_label: getUserEmail(),
+    })
+  }
+
   /**
    * Logs an admin user landing on the Examples tab.
    * @return {Void}
diff --git a/src/public/modules/forms/admin/controllers/create-form-modal.client.controller.js b/src/public/modules/forms/admin/controllers/create-form-modal.client.controller.js
index 1e29a581cd..cb61907216 100644
--- a/src/public/modules/forms/admin/controllers/create-form-modal.client.controller.js
+++ b/src/public/modules/forms/admin/controllers/create-form-modal.client.controller.js
@@ -211,6 +211,7 @@ function CreateFormModalController(
     if (errorResponse && errorResponse.data) {
       Toastr.error(errorResponse.data.message)
     }
+    GTag.createFormFailed()
   }
 
   vm.createNewForm = function () {
@@ -301,6 +302,7 @@ function CreateFormModalController(
       }
     } else {
       Toastr.error('An error occurred creating the form, please try again')
+      GTag.createFormFailed()
     }
   }
 

From ef537eb5beffa91ace7dcc1b2480b17758e56c7f Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Tue, 27 Oct 2020 09:22:58 +0800
Subject: [PATCH 12/17] chore: fix node version used to 12.18.4 to be
 consistent (#516)

---
 docs/TROUBLESHOOTING.md | 3 ++-
 package.json            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/TROUBLESHOOTING.md b/docs/TROUBLESHOOTING.md
index 1bb4bed1ce..3498b03969 100644
--- a/docs/TROUBLESHOOTING.md
+++ b/docs/TROUBLESHOOTING.md
@@ -5,13 +5,14 @@ A list of common issues that developers face and how to resolve them.
 ## `Error: Module did not self-register.`
 
 This could happen if node modules were compiled with a different version of node, or if node modules fail to compile due to other configuration errors.
+Running tests locally requires `node` to specifically be of version `12.18.4`. You can use `nvm` to manually set the node version.
 
 ### [Node Versioning Error](https://stackoverflow.com/questions/28486891/uncaught-error-module-did-not-self-register)
 
 Run the following commands to set the node version and then re-install the node modules:
 
 ```
-nvm use 12.18.0
+nvm use 12.18.4
 rm -r node_modules
 npm install
 ```
diff --git a/package.json b/package.json
index 9ee959132d..6275f1290f 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "url": "https://github.com/datagovsg/formsg.git"
   },
   "engines": {
-    "node": "~12.18.0",
+    "node": "~12.18.4",
     "npm": "~6.4.0"
   },
   "scripts": {

From 8fc2f24066a0a175c608eee0ebf0e52026f67d4c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 09:23:11 +0800
Subject: [PATCH 13/17] chore(deps-dev): bump jasmine from 3.6.1 to 3.6.2
 (#508)

Bumps [jasmine](https://github.com/jasmine/jasmine-npm) from 3.6.1 to 3.6.2.
- [Release notes](https://github.com/jasmine/jasmine-npm/releases)
- [Commits](https://github.com/jasmine/jasmine-npm/compare/v3.6.1...v3.6.2)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 158 ++--------------------------------------------
 package.json      |   2 +-
 2 files changed, 5 insertions(+), 155 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 42134237ec..bf730e79a7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14241,170 +14241,20 @@
       }
     },
     "jasmine": {
-      "version": "3.6.1",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.1.tgz",
-      "integrity": "sha512-Jqp8P6ZWkTVFGmJwBK46p+kJNrZCdqkQ4GL+PGuBXZwK1fM4ST9BizkYgIwCFqYYqnTizAy6+XG2Ej5dFrej9Q==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.2.tgz",
+      "integrity": "sha512-Uc0o2MRnC8TS1MjDrB8jE1umKEo2mflzGvdg0Ncs+yuLtOJ+uz/Wz8VmGsNGtuASr8+E0LDgPkOpvdoC76m5WQ==",
       "dev": true,
       "requires": {
-        "fast-glob": "^2.2.6",
+        "glob": "^7.1.6",
         "jasmine-core": "~3.6.0"
       },
       "dependencies": {
-        "@nodelib/fs.stat": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz",
-          "integrity": "sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==",
-          "dev": true
-        },
-        "braces": {
-          "version": "2.3.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-          "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.1.0",
-            "array-unique": "^0.3.2",
-            "extend-shallow": "^2.0.1",
-            "fill-range": "^4.0.0",
-            "isobject": "^3.0.1",
-            "repeat-element": "^1.1.2",
-            "snapdragon": "^0.8.1",
-            "snapdragon-node": "^2.0.1",
-            "split-string": "^3.0.2",
-            "to-regex": "^3.0.1"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "fast-glob": {
-          "version": "2.2.7",
-          "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-2.2.7.tgz",
-          "integrity": "sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==",
-          "dev": true,
-          "requires": {
-            "@mrmlnc/readdir-enhanced": "^2.2.1",
-            "@nodelib/fs.stat": "^1.1.2",
-            "glob-parent": "^3.1.0",
-            "is-glob": "^4.0.0",
-            "merge2": "^1.2.3",
-            "micromatch": "^3.1.10"
-          }
-        },
-        "fill-range": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-          "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-          "dev": true,
-          "requires": {
-            "extend-shallow": "^2.0.1",
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1",
-            "to-regex-range": "^2.1.0"
-          },
-          "dependencies": {
-            "extend-shallow": {
-              "version": "2.0.1",
-              "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-              "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-              "dev": true,
-              "requires": {
-                "is-extendable": "^0.1.0"
-              }
-            }
-          }
-        },
-        "glob-parent": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-          "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-          "dev": true,
-          "requires": {
-            "is-glob": "^3.1.0",
-            "path-dirname": "^1.0.0"
-          },
-          "dependencies": {
-            "is-glob": {
-              "version": "3.1.0",
-              "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-              "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-              "dev": true,
-              "requires": {
-                "is-extglob": "^2.1.0"
-              }
-            }
-          }
-        },
-        "is-buffer": {
-          "version": "1.1.6",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-          "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-          "dev": true
-        },
-        "is-number": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-          "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^3.0.2"
-          },
-          "dependencies": {
-            "kind-of": {
-              "version": "3.2.2",
-              "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-              "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-              "dev": true,
-              "requires": {
-                "is-buffer": "^1.1.5"
-              }
-            }
-          }
-        },
         "jasmine-core": {
           "version": "3.6.0",
           "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.6.0.tgz",
           "integrity": "sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==",
           "dev": true
-        },
-        "micromatch": {
-          "version": "3.1.10",
-          "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-          "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-          "dev": true,
-          "requires": {
-            "arr-diff": "^4.0.0",
-            "array-unique": "^0.3.2",
-            "braces": "^2.3.1",
-            "define-property": "^2.0.2",
-            "extend-shallow": "^3.0.2",
-            "extglob": "^2.0.4",
-            "fragment-cache": "^0.2.1",
-            "kind-of": "^6.0.2",
-            "nanomatch": "^1.2.9",
-            "object.pick": "^1.3.0",
-            "regex-not": "^1.0.0",
-            "snapdragon": "^0.8.1",
-            "to-regex": "^3.0.2"
-          }
-        },
-        "to-regex-range": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-          "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-          "dev": true,
-          "requires": {
-            "is-number": "^3.0.0",
-            "repeat-string": "^1.6.1"
-          }
         }
       }
     },
diff --git a/package.json b/package.json
index 6275f1290f..a436bc1139 100644
--- a/package.json
+++ b/package.json
@@ -216,7 +216,7 @@
     "html-loader": "~0.5.5",
     "htmlhint": "^0.14.1",
     "husky": "^4.3.0",
-    "jasmine": "^3.6.1",
+    "jasmine": "^3.6.2",
     "jasmine-core": "^3.1.0",
     "jasmine-sinon": "^0.4.0",
     "jasmine-spec-reporter": "^6.0.0",

From ce99ac0ec874ffb3d530efe8b7edd3edb6083e9c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 09:23:27 +0800
Subject: [PATCH 14/17] chore(deps-dev): bump ts-node-dev from 1.0.0-pre.49 to
 1.0.0 (#510)

Bumps [ts-node-dev](https://github.com/whitecolor/ts-node-dev) from 1.0.0-pre.49 to 1.0.0.
- [Release notes](https://github.com/whitecolor/ts-node-dev/releases)
- [Changelog](https://github.com/whitecolor/ts-node-dev/blob/master/CHANGELOG.md)
- [Commits](https://github.com/whitecolor/ts-node-dev/commits/v1.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 47 ++++++++---------------------------------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bf730e79a7..3ea38bb792 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12754,7 +12754,8 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
       "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "handlebars": {
       "version": "4.7.6",
@@ -22489,7 +22490,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
       "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "sift": {
       "version": "7.0.1",
@@ -25274,9 +25276,9 @@
       }
     },
     "ts-node-dev": {
-      "version": "1.0.0-pre.49",
-      "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.0.0-pre.49.tgz",
-      "integrity": "sha512-iJd4QPPOaCAByl/WuEdmDX8xDR2GmoWYu6aKvGudGUcfP1sJRjpaHb7oFDuvBspQF1xhxUdbjfHuvEtZPwKZFQ==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/ts-node-dev/-/ts-node-dev-1.0.0.tgz",
+      "integrity": "sha512-leA/3TgGtnVU77fGngBwVZztqyDRXirytR7dMtMWZS5b2hGpLl+VDnB0F/gf3A+HEPSzS/KwxgXFP7/LtgX4MQ==",
       "dev": true,
       "requires": {
         "chokidar": "^3.4.0",
@@ -25284,40 +25286,20 @@
         "dynamic-dedupe": "^0.3.0",
         "minimist": "^1.2.5",
         "mkdirp": "^1.0.4",
-        "node-notifier": "^5.4.0",
         "resolve": "^1.0.0",
         "rimraf": "^2.6.1",
         "source-map-support": "^0.5.12",
         "tree-kill": "^1.2.2",
-        "ts-node": "^8.10.2",
+        "ts-node": "^9.0.0",
         "tsconfig": "^7.0.0"
       },
       "dependencies": {
-        "is-wsl": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
-          "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
-          "dev": true
-        },
         "mkdirp": {
           "version": "1.0.4",
           "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
           "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
           "dev": true
         },
-        "node-notifier": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.4.3.tgz",
-          "integrity": "sha512-M4UBGcs4jeOK9CjTsYwkvH6/MzuUmGCyTW+kCY7uO+1ZVr0+FHGdPdIf5CCLqAaxnRrWidyoQlNkMIIVwbKB8Q==",
-          "dev": true,
-          "requires": {
-            "growly": "^1.3.0",
-            "is-wsl": "^1.1.0",
-            "semver": "^5.5.0",
-            "shellwords": "^0.1.1",
-            "which": "^1.3.0"
-          }
-        },
         "rimraf": {
           "version": "2.7.1",
           "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -25326,19 +25308,6 @@
           "requires": {
             "glob": "^7.1.3"
           }
-        },
-        "ts-node": {
-          "version": "8.10.2",
-          "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz",
-          "integrity": "sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==",
-          "dev": true,
-          "requires": {
-            "arg": "^4.1.0",
-            "diff": "^4.0.1",
-            "make-error": "^1.1.1",
-            "source-map-support": "^0.5.17",
-            "yn": "3.1.1"
-          }
         }
       }
     },
diff --git a/package.json b/package.json
index a436bc1139..9ea6c09f68 100644
--- a/package.json
+++ b/package.json
@@ -245,7 +245,7 @@
     "ts-loader": "^7.0.5",
     "ts-mock-imports": "^1.3.0",
     "ts-node": "^9.0.0",
-    "ts-node-dev": "^1.0.0-pre.44",
+    "ts-node-dev": "^1.0.0",
     "typescript": "^4.0.2",
     "url-loader": "^1.1.2",
     "webpack": "^4.43.0",

From 455b38056e8875cd67ccc80e74e86e48b6fedb66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Oct 2020 09:24:25 +0800
Subject: [PATCH 15/17] fix(deps): bump twilio from 3.49.3 to 3.50.0 (#479)

Bumps [twilio](https://github.com/twilio/twilio-node) from 3.49.3 to 3.50.0.
- [Release notes](https://github.com/twilio/twilio-node/releases)
- [Changelog](https://github.com/twilio/twilio-node/blob/main/CHANGES.md)
- [Commits](https://github.com/twilio/twilio-node/compare/3.49.3...3.50.0)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 package-lock.json | 24 ++++++------------------
 package.json      |  2 +-
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3ea38bb792..11d91eded7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4431,7 +4431,6 @@
       "version": "4.17.8",
       "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz",
       "integrity": "sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==",
-      "dev": true,
       "requires": {
         "@types/body-parser": "*",
         "@types/express-serve-static-core": "*",
@@ -9817,9 +9816,9 @@
       }
     },
     "dayjs": {
-      "version": "1.8.36",
-      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.8.36.tgz",
-      "integrity": "sha512-3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.9.3.tgz",
+      "integrity": "sha512-V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw=="
     },
     "debug": {
       "version": "3.1.0",
@@ -25374,9 +25373,9 @@
       "integrity": "sha512-RKJBIj8lySrShN4w6i/BonWp2Z/uxwC3h4y7xsRrpP59ZboCd0GpEVsOnMDYLMmKBpYhb5TgHzZXy7wTfYFBRw=="
     },
     "twilio": {
-      "version": "3.49.3",
-      "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.49.3.tgz",
-      "integrity": "sha512-jdstMeMx+mlm8EggoPOxIE3vVPe4doaM2dKB64ib+wJgYtYGKmFztFb0jTVIx4/980/eI3KVGjkzKiZ9c6CJhQ==",
+      "version": "3.50.0",
+      "resolved": "https://registry.npmjs.org/twilio/-/twilio-3.50.0.tgz",
+      "integrity": "sha512-h/eWbi8YxdSBE6YgNfBHSDAYEhGUqGBrfqpaz4SF87MJQvygwSlfRvNA7WMajblQFP7Y68JqR20FFOjcYV3KJg==",
       "requires": {
         "@types/express": "^4.17.7",
         "@types/qs": "6.9.4",
@@ -25392,17 +25391,6 @@
         "xmlbuilder": "^13.0.2"
       },
       "dependencies": {
-        "@types/express": {
-          "version": "4.17.8",
-          "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz",
-          "integrity": "sha512-wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ==",
-          "requires": {
-            "@types/body-parser": "*",
-            "@types/express-serve-static-core": "*",
-            "@types/qs": "*",
-            "@types/serve-static": "*"
-          }
-        },
         "@types/qs": {
           "version": "6.9.4",
           "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.4.tgz",
diff --git a/package.json b/package.json
index 9ea6c09f68..c13aed8b4c 100644
--- a/package.json
+++ b/package.json
@@ -151,7 +151,7 @@
     "toastr": "^2.1.4",
     "triple-beam": "^1.3.0",
     "tweetnacl": "^1.0.1",
-    "twilio": "^3.49.3",
+    "twilio": "^3.50.0",
     "ui-select": "^0.19.8",
     "uid-generator": "^2.0.0",
     "uuid": "^8.3.0",

From c7edb6e8ad678d845eb1bce6020a0046b2cb6dc7 Mon Sep 17 00:00:00 2001
From: shuli-ogp <shuli@open.gov.sg>
Date: Tue, 27 Oct 2020 12:38:25 +0800
Subject: [PATCH 16/17] chore: bump version to v4.42.0

---
 CHANGELOG.md      | 24 ++++++++++++++++++++++++
 package-lock.json |  2 +-
 package.json      |  2 +-
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 70a15670f4..f8af739cb8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,31 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [v4.42.0](https://github.com/opengovsg/FormSG/compare/v4.41.0...v4.42.0)
+
+- fix(deps): bump twilio from 3.49.3 to 3.50.0 [`#479`](https://github.com/opengovsg/FormSG/pull/479)
+- chore(deps-dev): bump ts-node-dev from 1.0.0-pre.49 to 1.0.0 [`#510`](https://github.com/opengovsg/FormSG/pull/510)
+- chore(deps-dev): bump jasmine from 3.6.1 to 3.6.2 [`#508`](https://github.com/opengovsg/FormSG/pull/508)
+- chore: fix node version used to 12.18.4 to be consistent [`#516`](https://github.com/opengovsg/FormSG/pull/516)
+- feat: log create form failure on GA [`#505`](https://github.com/opengovsg/FormSG/pull/505)
+- fix(deps): unpin and bump mongoose from 5.10.0 to 5.10.10 [`#513`](https://github.com/opengovsg/FormSG/pull/513)
+- feat: require non-empty domains if restrict domain is toggled on [`#507`](https://github.com/opengovsg/FormSG/pull/507)
+- build: pin mongoose version to 5.10.0 [`#504`](https://github.com/opengovsg/FormSG/pull/504)
+- fix(deps): bump mongoose from 5.10.0 to 5.10.9 [`#449`](https://github.com/opengovsg/FormSG/pull/449)
+- chore(deps-dev): bump @typescript-eslint/parser from 4.0.1 to 4.5.0 [`#501`](https://github.com/opengovsg/FormSG/pull/501)
+- fix(deps): bump selectize from 0.12.4 to 0.12.6 [`#500`](https://github.com/opengovsg/FormSG/pull/500)
+- build: merge Release 4.41.0 into develop [`#497`](https://github.com/opengovsg/FormSG/pull/497)
+- fix(deps): bump angular-sanitize from 1.8.0 to 1.8.1 [`#494`](https://github.com/opengovsg/FormSG/pull/494)
+- docs(readme): acknowledge TellForm, others [`#495`](https://github.com/opengovsg/FormSG/pull/495)
+- chore(deps-dev): bump ts-jest from 26.3.0 to 26.4.1 [`#496`](https://github.com/opengovsg/FormSG/pull/496)
+- build: revert "fix(deps): bump mongoose from 5.10.0 to 5.10.9" [`a6ac8ef`](https://github.com/opengovsg/FormSG/commit/a6ac8ef67dbdaefbab0a1fecc1173fc4f6a70399)
+- fix: use mobile view for submission search / filter elements up till xl [`058ab66`](https://github.com/opengovsg/FormSG/commit/058ab6624431e88da6253b481246e44fbb920be4)
+- fix: missing period for decryption modal [`36c24e7`](https://github.com/opengovsg/FormSG/commit/36c24e7b46ca3f7b0f4743296e8ef65778490181)
+
 #### [v4.41.0](https://github.com/opengovsg/FormSG/compare/v4.40.0...v4.41.0)
 
+> 20 October 2020
+
 - feat: allow form transfer for email mode forms [`#488`](https://github.com/opengovsg/FormSG/pull/488)
 - chore(deps-dev): bump husky from 4.2.5 to 4.3.0 [`#480`](https://github.com/opengovsg/FormSG/pull/480)
 - refactor: use celebrate error handler [`#458`](https://github.com/opengovsg/FormSG/pull/458)
@@ -27,6 +50,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - fix(deps): bump validator from 13.1.1 to 13.1.17 [`#463`](https://github.com/opengovsg/FormSG/pull/463)
 - fix(deps): bump angular-resource from 1.8.0 to 1.8.1 [`#464`](https://github.com/opengovsg/FormSG/pull/464)
 - chore: merge release v4.40.0 back into develop [`#462`](https://github.com/opengovsg/FormSG/pull/462)
+- chore: bump version to 4.41.0 [`21a01d7`](https://github.com/opengovsg/FormSG/commit/21a01d71d90aed613f05df7a598b5673baec08f5)
 
 #### [v4.40.0](https://github.com/opengovsg/FormSG/compare/v4.39.0...v4.40.0)
 
diff --git a/package-lock.json b/package-lock.json
index 11d91eded7..0e3719d9af 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "FormSG",
-  "version": "4.41.0",
+  "version": "4.42.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index c13aed8b4c..9cab738cda 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "4.41.0",
+  "version": "4.42.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"

From 6b3348ea8112fb56559093bc0b2f7d1f82e5fcc8 Mon Sep 17 00:00:00 2001
From: shuli-ogp <shuli@open.gov.sg>
Date: Tue, 27 Oct 2020 13:28:59 +0800
Subject: [PATCH 17/17] fix: disable restrict email domains toggle if no otp
 verification

---
 .../modules/forms/admin/views/edit-fields.client.modal.html      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/public/modules/forms/admin/views/edit-fields.client.modal.html b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
index f55d3bf29f..70ca4a22d4 100644
--- a/src/public/modules/forms/admin/views/edit-fields.client.modal.html
+++ b/src/public/modules/forms/admin/views/edit-fields.client.modal.html
@@ -617,6 +617,7 @@ <h2 class="modal-title">
                 <input
                   type="checkbox"
                   ng-model="vm.field.hasAllowedEmailDomains"
+                  ng-disabled="!vm.field.isVerifiable"
                 />
                 <div class="toggle-selector-switch">
                   <i