From b915b504ef0c78100b01f9f4b2303c1594983a9e Mon Sep 17 00:00:00 2001
From: shuli-ogp <63710093+shuli-ogp@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:12:30 +0800
Subject: [PATCH 01/26] chore: shift webhook field to bottom of settings page,
 update copy (#553)

---
 .../modules/forms/admin/css/settings-form.css | 11 +++
 .../settings-form.client.view.html            | 69 ++++++++++---------
 2 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/src/public/modules/forms/admin/css/settings-form.css b/src/public/modules/forms/admin/css/settings-form.css
index 86209bac74..adf25f65f9 100644
--- a/src/public/modules/forms/admin/css/settings-form.css
+++ b/src/public/modules/forms/admin/css/settings-form.css
@@ -15,6 +15,17 @@
   margin: 0;
 }
 
+#settings-form #enable-webhooks .field-optional {
+  font-size: 15px;
+  font-weight: normal;
+  color: #b8b8b8;
+  margin-left: 10px;
+}
+
+#settings-form .webhook-divider {
+  margin-top: 40px;
+}
+
 #settings-form #enable-webhooks .glyphicon {
   margin-left: 40px !important;
 }
diff --git a/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html b/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
index be54e8eb11..4e955e2e06 100644
--- a/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
+++ b/src/public/modules/forms/admin/directiveViews/settings-form.client.view.html
@@ -251,6 +251,39 @@
 
       <div class="settings-divider"></div>
 
+      <!-- Form name and emails -->
+      <form-title-input-component
+        form-data="tempForm"
+        form-controller="settingsForm"
+        save-form="saveForm()"
+      >
+      </form-title-input-component>
+      <form-emails-input-component
+        form-data="tempForm"
+        form-controller="settingsForm"
+        save-form="saveForm()"
+        ng-if="!isFormEncrypt()"
+      >
+      </form-emails-input-component>
+
+      <div class="row form-option">
+        <div class="col-xs-9 label-custom label-large">
+          Mode for receiving form data<i
+            class="glyphicon glyphicon-question-sign"
+            uib-tooltip="This setting can't be changed after form creation. To change it, duplicate this form."
+            tooltip-trigger="'click mouseenter'"
+          ></i>
+        </div>
+        <div class="col-xs-3">
+          <span class="pull-right label-custom label-large">
+            <span ng-if="isFormEncrypt()">Storage</span>
+            <span ng-if="!isFormEncrypt()">Email</span>
+          </span>
+        </div>
+      </div>
+
+      <div class="settings-divider webhook-divider"></div>
+
       <!-- Webhooks for encrypted forms -->
       <div
         ng-if="isFormEncrypt()"
@@ -266,9 +299,10 @@
             <span class="beta-icon"> beta </span>
             <i
               class="glyphicon glyphicon-question-sign"
-              uib-tooltip="If specified, we will POST encrypted form submissions to a REST API supplied by you."
+              uib-tooltip="For developers and IT officers. We will POST encrypted form responses in real-time to the HTTPS endpoint specified here."
               tooltip-trigger="'click mouseenter'"
             ></i>
+            <span class="field-optional">(optional)</span>
           </label>
         </div>
         <div
@@ -321,39 +355,6 @@
           </div>
         </div>
       </div>
-
-      <div class="settings-divider"></div>
-
-      <!-- Form name and emails -->
-      <form-title-input-component
-        form-data="tempForm"
-        form-controller="settingsForm"
-        save-form="saveForm()"
-      >
-      </form-title-input-component>
-      <form-emails-input-component
-        form-data="tempForm"
-        form-controller="settingsForm"
-        save-form="saveForm()"
-        ng-if="!isFormEncrypt()"
-      >
-      </form-emails-input-component>
-
-      <div class="row form-option">
-        <div class="col-xs-9 label-custom label-large">
-          Mode for receiving form data<i
-            class="glyphicon glyphicon-question-sign"
-            uib-tooltip="This setting can't be changed after form creation. To change it, duplicate this form."
-            tooltip-trigger="'click mouseenter'"
-          ></i>
-        </div>
-        <div class="col-xs-3">
-          <span class="pull-right label-custom label-large">
-            <span ng-if="isFormEncrypt()">Storage</span>
-            <span ng-if="!isFormEncrypt()">Email</span>
-          </span>
-        </div>
-      </div>
     </div>
   </div>
 </div>

From f3320bbe8de88a706e57495ae087e11d9117b057 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Tue, 3 Nov 2020 14:19:45 +0800
Subject: [PATCH 02/26] refactor: convert MyInfo hash update to static domain
 method (#562)

---
 .../controllers/myinfo.server.controller.js   |  42 +----
 src/app/models/myinfo_hash.server.model.ts    |  35 ++++-
 src/types/myinfo_hash.ts                      |  19 ++-
 .../models/myinfo_hash.server.model.spec.ts   | 148 ++++++++++++++++++
 4 files changed, 200 insertions(+), 44 deletions(-)
 create mode 100644 tests/unit/backend/models/myinfo_hash.server.model.spec.ts

diff --git a/src/app/controllers/myinfo.server.controller.js b/src/app/controllers/myinfo.server.controller.js
index c393bf2625..43c899e06a 100644
--- a/src/app/controllers/myinfo.server.controller.js
+++ b/src/app/controllers/myinfo.server.controller.js
@@ -83,45 +83,17 @@ exports.addMyInfo = (myInfoService) => async (req, res, next) => {
 
   Promise.props(readOnlyHashPromises)
     .then((readOnlyHashes) => {
-      // Add to DB only if uinFin-form combo not already present
-      let filter = {
-        uinFin: hashedUinFin,
-        form: formId,
-      }
-      MyInfoHash.findOneAndUpdate(
-        filter,
-        {
-          $set: _.extend(
-            {
-              fields: readOnlyHashes,
-              expireAt: Date.now() + myInfoService.spCookieMaxAge,
-            },
-            filter,
-          ),
-        },
-        {
-          upsert: true,
-        },
-        (err) => {
-          if (err) {
-            res.locals.myInfoError = true
-            logger.error({
-              message: 'Error writing to DB',
-              meta: {
-                action: 'addMyInfo',
-                ...createReqMeta(req),
-                formId,
-              },
-              error: err,
-            })
-          }
-          return next()
-        },
+      return MyInfoHash.updateHashes(
+        hashedUinFin,
+        formId,
+        readOnlyHashes,
+        myInfoService.spCookieMaxAge,
       )
     })
+    .then(() => next())
     .catch((error) => {
       logger.error({
-        message: 'Error hashing MyInfo fields',
+        message: 'Error saving MyInfo hashes',
         meta: {
           action: 'addMyInfo',
           ...createReqMeta(req),
diff --git a/src/app/models/myinfo_hash.server.model.ts b/src/app/models/myinfo_hash.server.model.ts
index 29727d6a73..8ab2f54b6f 100644
--- a/src/app/models/myinfo_hash.server.model.ts
+++ b/src/app/models/myinfo_hash.server.model.ts
@@ -1,6 +1,6 @@
-import { Model, Mongoose, Schema } from 'mongoose'
+import { Mongoose, Schema } from 'mongoose'
 
-import { IMyInfoHashSchema } from '../../types'
+import { IHashes, IMyInfoHashModel, IMyInfoHashSchema } from '../../types'
 
 import { FORM_SCHEMA_ID } from './form.server.model'
 
@@ -43,8 +43,33 @@ MyInfoHashSchema.index({
 })
 MyInfoHashSchema.index({ expireAt: 1 }, { expireAfterSeconds: 0 })
 
+MyInfoHashSchema.statics.updateHashes = async function (
+  this: IMyInfoHashModel,
+  hashedUinFin: string,
+  formId: string,
+  readOnlyHashes: IHashes,
+  spCookieMaxAge: number,
+): Promise<IMyInfoHashSchema | null> {
+  return this.findOneAndUpdate(
+    {
+      uinFin: hashedUinFin,
+      form: formId,
+    },
+    {
+      $set: {
+        fields: readOnlyHashes,
+        expireAt: new Date(Date.now() + spCookieMaxAge),
+      },
+    },
+    { upsert: true, new: true },
+  )
+}
+
 const compileMyInfoHashModel = (db: Mongoose) =>
-  db.model<IMyInfoHashSchema>(MYINFO_HASH_SCHEMA_ID, MyInfoHashSchema)
+  db.model<IMyInfoHashSchema, IMyInfoHashModel>(
+    MYINFO_HASH_SCHEMA_ID,
+    MyInfoHashSchema,
+  )
 
 /**
  * Retrieves the MyInfoHash model on the given Mongoose instance. If the model is
@@ -52,9 +77,9 @@ const compileMyInfoHashModel = (db: Mongoose) =>
  * @param db The mongoose instance to retrieve the MyInfoHash model from
  * @returns The MyInfoHash model
  */
-const getMyInfoHashModel = (db: Mongoose) => {
+const getMyInfoHashModel = (db: Mongoose): IMyInfoHashModel => {
   try {
-    return db.model(MYINFO_HASH_SCHEMA_ID) as Model<IMyInfoHashSchema>
+    return db.model(MYINFO_HASH_SCHEMA_ID) as IMyInfoHashModel
   } catch {
     return compileMyInfoHashModel(db)
   }
diff --git a/src/types/myinfo_hash.ts b/src/types/myinfo_hash.ts
index 4a591a749d..32e51f23f8 100644
--- a/src/types/myinfo_hash.ts
+++ b/src/types/myinfo_hash.ts
@@ -1,11 +1,13 @@
-import { Document } from 'mongoose'
+import { Document, Model } from 'mongoose'
 
 import { MyInfoAttribute } from './field'
 import { IFormSchema } from './form'
 
-type IHashes = {
-  [key in MyInfoAttribute]: string
-}
+export type IHashes = Partial<
+  {
+    [key in MyInfoAttribute]: string
+  }
+>
 
 interface IMyInfoHash {
   uinFin: string
@@ -17,3 +19,12 @@ interface IMyInfoHash {
 }
 
 export interface IMyInfoHashSchema extends IMyInfoHash, Document {}
+
+export interface IMyInfoHashModel extends Model<IMyInfoHashSchema> {
+  updateHashes: (
+    hashedUinFin: string,
+    formId: string,
+    readOnlyHashes: IHashes,
+    spCookieMaxAge: number,
+  ) => Promise<IMyInfoHashSchema | null>
+}
diff --git a/tests/unit/backend/models/myinfo_hash.server.model.spec.ts b/tests/unit/backend/models/myinfo_hash.server.model.spec.ts
new file mode 100644
index 0000000000..784189d476
--- /dev/null
+++ b/tests/unit/backend/models/myinfo_hash.server.model.spec.ts
@@ -0,0 +1,148 @@
+import { ObjectId } from 'bson'
+import { omit, pick } from 'lodash'
+import mongoose from 'mongoose'
+
+import getMyInfoHashModel from 'src/app/models/myinfo_hash.server.model'
+
+import dbHandler from '../helpers/jest-db'
+
+const MyInfoHash = getMyInfoHashModel(mongoose)
+
+const DEFAULT_PARAMS = {
+  uinFin: 'testUinFin',
+  form: new ObjectId(),
+  fields: { name: 'mockHash' },
+  expireAt: new Date(Date.now()),
+  created: new Date(Date.now()),
+}
+const DEFAULT_COOKIE_MAX_AGE = 5
+
+describe('MyInfo Hash Model', () => {
+  beforeAll(async () => await dbHandler.connect())
+  beforeEach(async () => await dbHandler.clearDatabase())
+  afterAll(async () => await dbHandler.closeDatabase())
+
+  describe('Schema', () => {
+    it('should create and save successfully', async () => {
+      // Act
+      const actual = await MyInfoHash.create(DEFAULT_PARAMS)
+
+      // Assert
+      // All fields should exist
+      // Object Id should be defined when successfully saved to MongoDB.
+      expect(actual._id).toBeDefined()
+      expect(
+        pick(actual, ['uinFin', 'form', 'fields', 'created', 'expireAt']),
+      ).toEqual(DEFAULT_PARAMS)
+    })
+
+    it('should throw validation error on missing uinFin', async () => {
+      // Arrange
+      const missingParams = omit(DEFAULT_PARAMS, 'uinFin')
+
+      // Act
+      const myInfoHash = new MyInfoHash(missingParams)
+      const actualPromise = myInfoHash.save()
+
+      // Assert
+      await expect(actualPromise).rejects.toThrowError(
+        mongoose.Error.ValidationError,
+      )
+    })
+
+    it('should throw validation error on missing form', async () => {
+      // Arrange
+      const missingParams = omit(DEFAULT_PARAMS, 'form')
+
+      // Act
+      const myInfoHash = new MyInfoHash(missingParams)
+      const actualPromise = myInfoHash.save()
+
+      // Assert
+      await expect(actualPromise).rejects.toThrowError(
+        mongoose.Error.ValidationError,
+      )
+    })
+
+    it('should throw validation error on missing fields', async () => {
+      // Arrange
+      const missingParams = omit(DEFAULT_PARAMS, 'fields')
+
+      // Act
+      const myInfoHash = new MyInfoHash(missingParams)
+      const actualPromise = myInfoHash.save()
+
+      // Assert
+      await expect(actualPromise).rejects.toThrowError(
+        mongoose.Error.ValidationError,
+      )
+    })
+
+    it('should throw validation error on missing expireAt', async () => {
+      // Arrange
+      const missingParams = omit(DEFAULT_PARAMS, 'expireAt')
+
+      // Act
+      const myInfoHash = new MyInfoHash(missingParams)
+      const actualPromise = myInfoHash.save()
+
+      // Assert
+      await expect(actualPromise).rejects.toThrowError(
+        mongoose.Error.ValidationError,
+      )
+    })
+  })
+
+  describe('Statics', () => {
+    describe('updateHashes', () => {
+      it('should create successfully when document does not exist', async () => {
+        // Should have no documents yet.
+        await expect(MyInfoHash.countDocuments()).resolves.toEqual(0)
+
+        // Act
+        const actual = await MyInfoHash.updateHashes(
+          DEFAULT_PARAMS.uinFin,
+          DEFAULT_PARAMS.form.toHexString(),
+          DEFAULT_PARAMS.fields,
+          DEFAULT_COOKIE_MAX_AGE,
+        )
+
+        // Assert
+        // Should now have one document.
+        await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
+        const found = await MyInfoHash.findOne({})
+        // Both the returned document and the found document should match
+        expect(pick(actual, ['uinFin', 'form', 'fields'])).toEqual(
+          pick(DEFAULT_PARAMS, ['uinFin', 'form', 'fields']),
+        )
+        expect(pick(found, ['uinFin', 'form', 'fields'])).toEqual(
+          pick(DEFAULT_PARAMS, ['uinFin', 'form', 'fields']),
+        )
+      })
+
+      it('should update successfully when a document already exists', async () => {
+        // Arrange
+        // Insert mock document into collection.
+        await MyInfoHash.create(DEFAULT_PARAMS)
+        // Should have the added document.
+        await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
+
+        const mockFields = { sex: 'F' }
+
+        // Act
+        const actual = await MyInfoHash.updateHashes(
+          DEFAULT_PARAMS.uinFin,
+          DEFAULT_PARAMS.form.toHexString(),
+          mockFields,
+          DEFAULT_COOKIE_MAX_AGE,
+        )
+        // Assert
+        await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
+        const found = await MyInfoHash.findOne({})
+        // Both the returned document and the found document should match
+        expect(actual!.fields).toEqual(mockFields)
+        expect(found!.fields).toEqual(mockFields)
+      })
+    })
+  })
+})

From c7a6222a2148c1574b2116ed731eee6aabb330e4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:06:53 +0800
Subject: [PATCH 03/26] chore(deps-dev): bump jest from 26.5.3 to 26.6.2 (#570)

Bumps [jest](https://github.com/facebook/jest) from 26.5.3 to 26.6.2.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v26.5.3...v26.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 | 1345 ++++++++++++++++++---------------------------
 package.json      |    2 +-
 2 files changed, 545 insertions(+), 802 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 255f9976a3..120379ad85 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3055,23 +3055,23 @@
       "dev": true
     },
     "@jest/console": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.5.2.tgz",
-      "integrity": "sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
-        "jest-message-util": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3081,15 +3081,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3131,12 +3122,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -3156,34 +3147,34 @@
       }
     },
     "@jest/core": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.5.3.tgz",
-      "integrity": "sha512-CiU0UKFF1V7KzYTVEtFbFmGLdb2g4aTtY0WlyUfLgj/RtoTnJFhh50xKKr7OYkdmBUlGFSa2mD1TU3UZ6OLd4g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.2.tgz",
+      "integrity": "sha512-x0v0LVlEslGYGYk4StT90NUp7vbFBrh0K7KDyAg3hMhG0drrxOIQHsY05uC7XVlKHXFgGI+HdnU35qewMZOLFQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/reporters": "^26.5.3",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-changed-files": "^26.5.2",
-        "jest-config": "^26.5.3",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-resolve-dependencies": "^26.5.3",
-        "jest-runner": "^26.5.3",
-        "jest-runtime": "^26.5.3",
-        "jest-snapshot": "^26.5.3",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.3",
-        "jest-watcher": "^26.5.2",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.2",
+        "jest-runner": "^26.6.2",
+        "jest-runtime": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
         "micromatch": "^4.0.2",
         "p-each-series": "^2.1.0",
         "rimraf": "^3.0.0",
@@ -3192,9 +3183,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3204,15 +3195,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -3260,12 +3242,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -3294,21 +3276,21 @@
       }
     },
     "@jest/environment": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.5.2.tgz",
-      "integrity": "sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
       "dev": true,
       "requires": {
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2"
+        "jest-mock": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3318,15 +3300,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3379,23 +3352,23 @@
       }
     },
     "@jest/fake-timers": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.5.2.tgz",
-      "integrity": "sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@sinonjs/fake-timers": "^6.0.1",
         "@types/node": "*",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3405,15 +3378,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3455,12 +3419,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -3480,20 +3444,20 @@
       }
     },
     "@jest/globals": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.5.3.tgz",
-      "integrity": "sha512-7QztI0JC2CuB+Wx1VdnOUNeIGm8+PIaqngYsZXQCkH2QV0GFqzAYc9BZfU0nuqA6cbYrWh5wkuMzyii3P7deug==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/types": "^26.5.2",
-        "expect": "^26.5.3"
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3503,15 +3467,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3564,16 +3519,16 @@
       }
     },
     "@jest/reporters": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.5.3.tgz",
-      "integrity": "sha512-X+vR0CpfMQzYcYmMFKNY9n4jklcb14Kffffp7+H/MqitWnb0440bW2L76NGWKAa+bnXhNoZr+lCVtdtPmfJVOQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
       "dev": true,
       "requires": {
         "@bcoe/v8-coverage": "^0.2.3",
-        "@jest/console": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
@@ -3584,22 +3539,22 @@
         "istanbul-lib-report": "^3.0.0",
         "istanbul-lib-source-maps": "^4.0.0",
         "istanbul-reports": "^3.0.2",
-        "jest-haste-map": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "node-notifier": "^8.0.0",
         "slash": "^3.0.0",
         "source-map": "^0.6.0",
         "string-length": "^4.0.1",
         "terminal-link": "^2.0.0",
-        "v8-to-istanbul": "^6.0.1"
+        "v8-to-istanbul": "^7.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3609,15 +3564,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3659,12 +3605,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -3690,9 +3636,9 @@
       }
     },
     "@jest/source-map": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.5.0.tgz",
-      "integrity": "sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
       "dev": true,
       "requires": {
         "callsites": "^3.0.0",
@@ -3709,21 +3655,21 @@
       }
     },
     "@jest/test-result": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.5.2.tgz",
-      "integrity": "sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/istanbul-lib-coverage": "^2.0.0",
         "collect-v8-coverage": "^1.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3733,15 +3679,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3794,34 +3731,34 @@
       }
     },
     "@jest/test-sequencer": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.5.3.tgz",
-      "integrity": "sha512-Wqzb7aQ13L3T47xHdpUqYMOpiqz6Dx2QDDghp5AV/eUDXR7JieY+E1s233TQlNyl+PqtqgjVokmyjzX/HA51BA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.2.tgz",
+      "integrity": "sha512-iHiEXLMP69Ohe6kFMOVz6geADRxwK+OkLGg0VIGfZrUdkJGiCpghkMb2946FLh7jvzOwwZGyQoMi+kaHiOdM5g==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.5.2",
+        "@jest/test-result": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
-        "jest-runner": "^26.5.3",
-        "jest-runtime": "^26.5.3"
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.2",
+        "jest-runtime": "^26.6.2"
       }
     },
     "@jest/transform": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.5.2.tgz",
-      "integrity": "sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "babel-plugin-istanbul": "^6.0.0",
         "chalk": "^4.0.0",
         "convert-source-map": "^1.4.0",
         "fast-json-stable-stringify": "^2.0.0",
         "graceful-fs": "^4.2.4",
-        "jest-haste-map": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "micromatch": "^4.0.2",
         "pirates": "^4.0.1",
         "slash": "^3.0.0",
@@ -3830,9 +3767,9 @@
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -3842,15 +3779,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -3892,12 +3820,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -4346,9 +4274,9 @@
       "integrity": "sha512-zneUmi5I6oSkGBqkRP9rxbWX1mi6Yj7gNV+WNffmJLf8x4cnV0MGqXFNSP90NZ1kRRLCOdKBf9RIVD1TMg4aog=="
     },
     "@types/babel__core": {
-      "version": "7.1.10",
-      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz",
-      "integrity": "sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==",
+      "version": "7.1.11",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.11.tgz",
+      "integrity": "sha512-E5nSOzrjnvhURYnbOR2dClTqcyhPbPvtEwLHf7JJADKedPbcZsoJVfP+I2vBNfBjz4bnZIuhL/tNmRi5nJ7Jlw==",
       "dev": true,
       "requires": {
         "@babel/parser": "^7.1.0",
@@ -4576,9 +4504,9 @@
       }
     },
     "@types/graceful-fs": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz",
-      "integrity": "sha512-AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ==",
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz",
+      "integrity": "sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==",
       "dev": true,
       "requires": {
         "@types/node": "*"
@@ -4830,9 +4758,9 @@
       "dev": true
     },
     "@types/prettier": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.2.tgz",
-      "integrity": "sha512-IiPhNnenzkqdSdQH3ifk9LoX7oQe61ZlDdDO4+MUv6FyWdPGDPr26gCPVs3oguZEMq//nFZZpwUZcVuNJsG+DQ==",
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz",
+      "integrity": "sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==",
       "dev": true
     },
     "@types/promise-retry": {
@@ -6379,25 +6307,25 @@
       }
     },
     "babel-jest": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.5.2.tgz",
-      "integrity": "sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.2.tgz",
+      "integrity": "sha512-pysyz/mZ7T5sozKnvSa1n7QEf22W9yc+dUmn2zNuQTN0saG51q8A/8k9wbED9X4YNxmwjuhIwf4JRXXQGzui3Q==",
       "dev": true,
       "requires": {
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__core": "^7.1.7",
         "babel-plugin-istanbul": "^6.0.0",
-        "babel-preset-jest": "^26.5.0",
+        "babel-preset-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -6407,15 +6335,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -6521,9 +6440,9 @@
       }
     },
     "babel-plugin-jest-hoist": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz",
-      "integrity": "sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.3.3",
@@ -7026,9 +6945,9 @@
       }
     },
     "babel-preset-current-node-syntax": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz",
-      "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz",
+      "integrity": "sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==",
       "dev": true,
       "requires": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
@@ -7041,7 +6960,8 @@
         "@babel/plugin-syntax-numeric-separator": "^7.8.3",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-syntax-optional-chaining": "^7.8.3"
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-top-level-await": "^7.8.3"
       }
     },
     "babel-preset-env": {
@@ -7104,13 +7024,13 @@
       }
     },
     "babel-preset-jest": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz",
-      "integrity": "sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
       "dev": true,
       "requires": {
-        "babel-plugin-jest-hoist": "^26.5.0",
-        "babel-preset-current-node-syntax": "^0.1.3"
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
       }
     },
     "babel-preset-react": {
@@ -8250,6 +8170,12 @@
         "safe-buffer": "^5.0.1"
       }
     },
+    "cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true
+    },
     "class-utils": {
       "version": "0.3.6",
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
@@ -11527,23 +11453,23 @@
       }
     },
     "expect": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-26.5.3.tgz",
-      "integrity": "sha512-kkpOhGRWGOr+TEFUnYAjfGvv35bfP+OlPtqPIJpOCR9DVtv8QV+p8zG0Edqafh80fsjeE+7RBcVUq1xApnYglw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "ansi-styles": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
         "jest-regex-util": "^26.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -11553,15 +11479,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -11602,12 +11519,6 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -13890,6 +13801,15 @@
         "rgba-regex": "^1.0.0"
       }
     },
+    "is-core-module": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz",
+      "integrity": "sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
     "is-data-descriptor": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
@@ -14367,20 +14287,20 @@
       }
     },
     "jest": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-26.5.3.tgz",
-      "integrity": "sha512-uJi3FuVSLmkZrWvaDyaVTZGLL8WcfynbRnFXyAHuEtYiSZ+ijDDIMOw1ytmftK+y/+OdAtsG9QrtbF7WIBmOyA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.2.tgz",
+      "integrity": "sha512-lL0hW7mh/2hhQmpo/1fDWQji/BUB3Xcxxj7r0fAOa3t56OAnwbE0HEl2bZ7XjAwV5TXOt8UpCgaa/WBJBB0CYw==",
       "dev": true,
       "requires": {
-        "@jest/core": "^26.5.3",
+        "@jest/core": "^26.6.2",
         "import-local": "^3.0.2",
-        "jest-cli": "^26.5.3"
+        "jest-cli": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -14390,15 +14310,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -14440,33 +14351,33 @@
           "dev": true
         },
         "jest-cli": {
-          "version": "26.5.3",
-          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.5.3.tgz",
-          "integrity": "sha512-HkbSvtugpSXBf2660v9FrNVUgxvPkssN8CRGj9gPM8PLhnaa6zziFiCEKQAkQS4uRzseww45o0TR+l6KeRYV9A==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.2.tgz",
+          "integrity": "sha512-5SBxa0bXc43fTHgxMfonDFDWTmQTiC6RSS4GpKhVekWkwpaeMHWt/FvGIy5GlTHMbCpzULWV++N3v93OdlFfQA==",
           "dev": true,
           "requires": {
-            "@jest/core": "^26.5.3",
-            "@jest/test-result": "^26.5.2",
-            "@jest/types": "^26.5.2",
+            "@jest/core": "^26.6.2",
+            "@jest/test-result": "^26.6.2",
+            "@jest/types": "^26.6.2",
             "chalk": "^4.0.0",
             "exit": "^0.1.2",
             "graceful-fs": "^4.2.4",
             "import-local": "^3.0.2",
             "is-ci": "^2.0.0",
-            "jest-config": "^26.5.3",
-            "jest-util": "^26.5.2",
-            "jest-validate": "^26.5.3",
+            "jest-config": "^26.6.2",
+            "jest-util": "^26.6.2",
+            "jest-validate": "^26.6.2",
             "prompts": "^2.0.1",
             "yargs": "^15.4.1"
           }
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -14486,20 +14397,20 @@
       }
     },
     "jest-changed-files": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.5.2.tgz",
-      "integrity": "sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "execa": "^4.0.0",
         "throat": "^5.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -14509,15 +14420,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -14564,9 +14466,9 @@
           }
         },
         "execa": {
-          "version": "4.0.3",
-          "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz",
-          "integrity": "sha512-WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A==",
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+          "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
           "dev": true,
           "requires": {
             "cross-spawn": "^7.0.0",
@@ -14643,35 +14545,35 @@
       }
     },
     "jest-config": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.5.3.tgz",
-      "integrity": "sha512-NVhZiIuN0GQM6b6as4CI5FSCyXKxdrx5ACMCcv/7Pf+TeCajJhJc+6dwgdAVPyerUFB9pRBIz3bE7clSrRge/w==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.2.tgz",
+      "integrity": "sha512-0ApZqPd+L/BUWvNj1GHcptb5jwF23lo+BskjgJV/Blht1hgpu6eIwaYRgHPrS6I6HrxwRfJvlGbzoZZVb3VHTA==",
       "dev": true,
       "requires": {
         "@babel/core": "^7.1.0",
-        "@jest/test-sequencer": "^26.5.3",
-        "@jest/types": "^26.5.2",
-        "babel-jest": "^26.5.2",
+        "@jest/test-sequencer": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.2",
         "chalk": "^4.0.0",
         "deepmerge": "^4.2.2",
         "glob": "^7.1.1",
         "graceful-fs": "^4.2.4",
-        "jest-environment-jsdom": "^26.5.2",
-        "jest-environment-node": "^26.5.2",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-jasmine2": "^26.5.3",
+        "jest-jasmine2": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.3",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "micromatch": "^4.0.2",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -14681,15 +14583,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -14736,19 +14629,13 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -14757,15 +14644,15 @@
           }
         },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -14852,22 +14739,22 @@
       }
     },
     "jest-each": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.5.2.tgz",
-      "integrity": "sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2"
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -14877,15 +14764,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -14932,19 +14810,13 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -14953,15 +14825,15 @@
           }
         },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -14976,24 +14848,24 @@
       }
     },
     "jest-environment-jsdom": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz",
-      "integrity": "sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
         "jsdom": "^16.4.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15003,15 +14875,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15053,12 +14916,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -15078,23 +14941,23 @@
       }
     },
     "jest-environment-node": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.5.2.tgz",
-      "integrity": "sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
       "dev": true,
       "requires": {
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
-        "jest-mock": "^26.5.2",
-        "jest-util": "^26.5.2"
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15104,15 +14967,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15154,12 +15008,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -15185,12 +15039,12 @@
       "dev": true
     },
     "jest-haste-map": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.5.2.tgz",
-      "integrity": "sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/graceful-fs": "^4.1.2",
         "@types/node": "*",
         "anymatch": "^3.0.3",
@@ -15198,18 +15052,18 @@
         "fsevents": "^2.1.2",
         "graceful-fs": "^4.2.4",
         "jest-regex-util": "^26.0.0",
-        "jest-serializer": "^26.5.0",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "micromatch": "^4.0.2",
         "sane": "^4.0.3",
         "walker": "^1.0.7"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15219,15 +15073,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15269,12 +15114,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -15294,35 +15139,35 @@
       }
     },
     "jest-jasmine2": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.5.3.tgz",
-      "integrity": "sha512-nFlZOpnGlNc7y/+UkkeHnvbOM+rLz4wB1AimgI9QhtnqSZte0wYjbAm8hf7TCwXlXgDwZxAXo6z0a2Wzn9FoOg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.2.tgz",
+      "integrity": "sha512-Om6q632kogggOBGjSr34jErXGOQy0+IkxouGUbyzB0lQmufu8nm1AcxLIKpB/FN36I43f2T3YajeNlxwJZ94PQ==",
       "dev": true,
       "requires": {
         "@babel/traverse": "^7.1.0",
-        "@jest/environment": "^26.5.2",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "co": "^4.6.0",
-        "expect": "^26.5.3",
+        "expect": "^26.6.2",
         "is-generator-fn": "^2.0.0",
-        "jest-each": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-runtime": "^26.5.3",
-        "jest-snapshot": "^26.5.3",
-        "jest-util": "^26.5.2",
-        "pretty-format": "^26.5.2",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
         "throat": "^5.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15332,15 +15177,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -15388,12 +15224,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -15402,15 +15238,15 @@
           }
         },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -15425,19 +15261,19 @@
       }
     },
     "jest-leak-detector": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz",
-      "integrity": "sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
       "dev": true,
       "requires": {
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15447,15 +15283,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -15502,22 +15329,16 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -15532,21 +15353,21 @@
       }
     },
     "jest-matcher-utils": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz",
-      "integrity": "sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
       "dev": true,
       "requires": {
         "chalk": "^4.0.0",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15556,15 +15377,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -15606,9 +15418,9 @@
           "dev": true
         },
         "diff-sequences": {
-          "version": "26.5.0",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-          "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+          "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
           "dev": true
         },
         "has-flag": {
@@ -15618,33 +15430,27 @@
           "dev": true
         },
         "jest-diff": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
-          "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+          "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
-            "diff-sequences": "^26.5.0",
+            "diff-sequences": "^26.6.2",
             "jest-get-type": "^26.3.0",
-            "pretty-format": "^26.5.2"
+            "pretty-format": "^26.6.2"
           }
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -15659,25 +15465,26 @@
       }
     },
     "jest-message-util": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.5.2.tgz",
-      "integrity": "sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/stack-utils": "^2.0.0",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
         "slash": "^3.0.0",
         "stack-utils": "^2.0.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15687,14 +15494,11 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
         },
         "ansi-styles": {
           "version": "4.3.0",
@@ -15736,6 +15540,18 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
+        "pretty-format": {
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+          "dev": true,
+          "requires": {
+            "@jest/types": "^26.6.2",
+            "ansi-regex": "^5.0.0",
+            "ansi-styles": "^4.0.0",
+            "react-is": "^17.0.1"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -15748,19 +15564,19 @@
       }
     },
     "jest-mock": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.5.2.tgz",
-      "integrity": "sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15770,15 +15586,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15843,25 +15650,25 @@
       "dev": true
     },
     "jest-resolve": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.5.2.tgz",
-      "integrity": "sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "chalk": "^4.0.0",
         "graceful-fs": "^4.2.4",
         "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "read-pkg-up": "^7.0.1",
-        "resolve": "^1.17.0",
+        "resolve": "^1.18.1",
         "slash": "^3.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15871,15 +15678,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -15921,12 +15719,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -15934,6 +15732,16 @@
             "micromatch": "^4.0.2"
           }
         },
+        "resolve": {
+          "version": "1.18.1",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz",
+          "integrity": "sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.0.0",
+            "path-parse": "^1.0.6"
+          }
+        },
         "supports-color": {
           "version": "7.2.0",
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -15946,20 +15754,20 @@
       }
     },
     "jest-resolve-dependencies": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.3.tgz",
-      "integrity": "sha512-+KMDeke/BFK+mIQ2IYSyBz010h7zQaVt4Xie6cLqUGChorx66vVeQVv4ErNoMwInnyYHi1Ud73tDS01UbXbfLQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.2.tgz",
+      "integrity": "sha512-lXXQqBLlKlnOPyCfJZnrYydd7lZzWux9sMwKJxOmjsuVmoSlnmTOJ8kW1FYxotTyMzqoNtBuSF6qE+iXuAr6qQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-snapshot": "^26.5.3"
+        "jest-snapshot": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -15969,15 +15777,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -16030,37 +15829,37 @@
       }
     },
     "jest-runner": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.5.3.tgz",
-      "integrity": "sha512-qproP0Pq7IIule+263W57k2+8kWCszVJTC9TJWGUz0xJBr+gNiniGXlG8rotd0XxwonD5UiJloYoSO5vbUr5FQ==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.2.tgz",
+      "integrity": "sha512-OsWTIGx/MHSuPqjYwap1LAxT0qvlqmwTYSFOwc+G14AtyZlL7ngrrDes7moLRqFkDVpCHL2RT0i317jogyw81Q==",
       "dev": true,
       "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "chalk": "^4.0.0",
         "emittery": "^0.7.1",
         "exit": "^0.1.2",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.3",
+        "jest-config": "^26.6.2",
         "jest-docblock": "^26.0.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-leak-detector": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
-        "jest-runtime": "^26.5.3",
-        "jest-util": "^26.5.2",
-        "jest-worker": "^26.5.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
         "source-map-support": "^0.5.6",
         "throat": "^5.0.0"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16070,15 +15869,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -16114,9 +15904,9 @@
           "dev": true
         },
         "emittery": {
-          "version": "0.7.1",
-          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.1.tgz",
-          "integrity": "sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==",
+          "version": "0.7.2",
+          "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+          "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
           "dev": true
         },
         "has-flag": {
@@ -16126,12 +15916,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -16151,43 +15941,44 @@
       }
     },
     "jest-runtime": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.5.3.tgz",
-      "integrity": "sha512-IDjalmn2s/Tc4GvUwhPHZ0iaXCdMRq5p6taW9P8RpU+FpG01O3+H8z+p3rDCQ9mbyyyviDgxy/LHPLzrIOKBkQ==",
-      "dev": true,
-      "requires": {
-        "@jest/console": "^26.5.2",
-        "@jest/environment": "^26.5.2",
-        "@jest/fake-timers": "^26.5.2",
-        "@jest/globals": "^26.5.3",
-        "@jest/source-map": "^26.5.0",
-        "@jest/test-result": "^26.5.2",
-        "@jest/transform": "^26.5.2",
-        "@jest/types": "^26.5.2",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.2.tgz",
+      "integrity": "sha512-VEjfoim4tkvq8Gh8z7wMXlKva3DnIlgvmGR1AajiRK1nEHuXtuaR17jnVYOi+wW0i1dS3NH4jVdUQl08GodgZQ==",
+      "dev": true,
+      "requires": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/yargs": "^15.0.0",
         "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
         "collect-v8-coverage": "^1.0.0",
         "exit": "^0.1.2",
         "glob": "^7.1.3",
         "graceful-fs": "^4.2.4",
-        "jest-config": "^26.5.3",
-        "jest-haste-map": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-mock": "^26.5.2",
+        "jest-config": "^26.6.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
         "jest-regex-util": "^26.0.0",
-        "jest-resolve": "^26.5.2",
-        "jest-snapshot": "^26.5.3",
-        "jest-util": "^26.5.2",
-        "jest-validate": "^26.5.3",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
         "slash": "^3.0.0",
         "strip-bom": "^4.0.0",
         "yargs": "^15.4.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16197,15 +15988,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -16247,12 +16029,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -16278,9 +16060,9 @@
       }
     },
     "jest-serializer": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.5.0.tgz",
-      "integrity": "sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -16288,33 +16070,33 @@
       }
     },
     "jest-snapshot": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.5.3.tgz",
-      "integrity": "sha512-ZgAk0Wm0JJ75WS4lGaeRfa0zIgpL0KD595+XmtwlIEMe8j4FaYHyZhP1LNOO+8fXq7HJ3hll54+sFV9X4+CGVw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.0.0",
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "@types/babel__traverse": "^7.0.4",
         "@types/prettier": "^2.0.0",
         "chalk": "^4.0.0",
-        "expect": "^26.5.3",
+        "expect": "^26.6.2",
         "graceful-fs": "^4.2.4",
-        "jest-diff": "^26.5.2",
+        "jest-diff": "^26.6.2",
         "jest-get-type": "^26.3.0",
-        "jest-haste-map": "^26.5.2",
-        "jest-matcher-utils": "^26.5.2",
-        "jest-message-util": "^26.5.2",
-        "jest-resolve": "^26.5.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
         "natural-compare": "^1.4.0",
-        "pretty-format": "^26.5.2",
+        "pretty-format": "^26.6.2",
         "semver": "^7.3.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16324,15 +16106,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -16374,9 +16147,9 @@
           "dev": true
         },
         "diff-sequences": {
-          "version": "26.5.0",
-          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.5.0.tgz",
-          "integrity": "sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+          "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
           "dev": true
         },
         "has-flag": {
@@ -16386,33 +16159,27 @@
           "dev": true
         },
         "jest-diff": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.5.2.tgz",
-          "integrity": "sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+          "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
           "dev": true,
           "requires": {
             "chalk": "^4.0.0",
-            "diff-sequences": "^26.5.0",
+            "diff-sequences": "^26.6.2",
             "jest-get-type": "^26.3.0",
-            "pretty-format": "^26.5.2"
+            "pretty-format": "^26.6.2"
           }
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "semver": {
@@ -16520,23 +16287,23 @@
       }
     },
     "jest-validate": {
-      "version": "26.5.3",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.5.3.tgz",
-      "integrity": "sha512-LX07qKeAtY+lsU0o3IvfDdN5KH9OulEGOMN1sFo6PnEf5/qjS1LZIwNk9blcBeW94pQUI9dLN9FlDYDWI5tyaA==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
       "dev": true,
       "requires": {
-        "@jest/types": "^26.5.2",
+        "@jest/types": "^26.6.2",
         "camelcase": "^6.0.0",
         "chalk": "^4.0.0",
         "jest-get-type": "^26.3.0",
         "leven": "^3.1.0",
-        "pretty-format": "^26.5.2"
+        "pretty-format": "^26.6.2"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16546,15 +16313,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-regex": {
           "version": "5.0.0",
           "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -16571,9 +16329,9 @@
           }
         },
         "camelcase": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz",
-          "integrity": "sha512-WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ==",
+          "version": "6.2.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz",
+          "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==",
           "dev": true
         },
         "chalk": {
@@ -16607,22 +16365,16 @@
           "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
           "dev": true
         },
-        "jest-get-type": {
-          "version": "26.3.0",
-          "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
-          "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
-          "dev": true
-        },
         "pretty-format": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.5.2.tgz",
-          "integrity": "sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+          "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "ansi-regex": "^5.0.0",
             "ansi-styles": "^4.0.0",
-            "react-is": "^16.12.0"
+            "react-is": "^17.0.1"
           }
         },
         "supports-color": {
@@ -16637,24 +16389,24 @@
       }
     },
     "jest-watcher": {
-      "version": "26.5.2",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.5.2.tgz",
-      "integrity": "sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
       "dev": true,
       "requires": {
-        "@jest/test-result": "^26.5.2",
-        "@jest/types": "^26.5.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
         "@types/node": "*",
         "ansi-escapes": "^4.2.1",
         "chalk": "^4.0.0",
-        "jest-util": "^26.5.2",
+        "jest-util": "^26.6.2",
         "string-length": "^4.0.1"
       },
       "dependencies": {
         "@jest/types": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.5.2.tgz",
-          "integrity": "sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+          "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
           "dev": true,
           "requires": {
             "@types/istanbul-lib-coverage": "^2.0.0",
@@ -16664,15 +16416,6 @@
             "chalk": "^4.0.0"
           }
         },
-        "@types/istanbul-reports": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-          "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==",
-          "dev": true,
-          "requires": {
-            "@types/istanbul-lib-report": "*"
-          }
-        },
         "ansi-styles": {
           "version": "4.3.0",
           "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -16714,12 +16457,12 @@
           "dev": true
         },
         "jest-util": {
-          "version": "26.5.2",
-          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.5.2.tgz",
-          "integrity": "sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==",
+          "version": "26.6.2",
+          "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+          "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
           "dev": true,
           "requires": {
-            "@jest/types": "^26.5.2",
+            "@jest/types": "^26.6.2",
             "@types/node": "*",
             "chalk": "^4.0.0",
             "graceful-fs": "^4.2.4",
@@ -16739,9 +16482,9 @@
       }
     },
     "jest-worker": {
-      "version": "26.5.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz",
-      "integrity": "sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==",
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
       "dev": true,
       "requires": {
         "@types/node": "*",
@@ -21201,13 +20944,13 @@
       }
     },
     "prompts": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
-      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz",
+      "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
-        "sisteransi": "^1.0.4"
+        "sisteransi": "^1.0.5"
       }
     },
     "proxy-addr": {
@@ -21544,9 +21287,9 @@
       }
     },
     "react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "version": "17.0.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz",
+      "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==",
       "dev": true
     },
     "read-file-relative": {
@@ -26050,9 +25793,9 @@
       "dev": true
     },
     "v8-to-istanbul": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-6.0.1.tgz",
-      "integrity": "sha512-PzM1WlqquhBvsV+Gco6WSFeg1AGdD53ccMRkFeyHRE/KRZaVacPOmQYP3EeVgDBtKD2BJ8kgynBQ5OtKiHCH+w==",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz",
+      "integrity": "sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==",
       "dev": true,
       "requires": {
         "@types/istanbul-lib-coverage": "^2.0.1",
diff --git a/package.json b/package.json
index 402ea68165..b1b78d8dab 100644
--- a/package.json
+++ b/package.json
@@ -221,7 +221,7 @@
     "jasmine-core": "^3.1.0",
     "jasmine-sinon": "^0.4.0",
     "jasmine-spec-reporter": "^6.0.0",
-    "jest": "^26.5.3",
+    "jest": "^26.6.2",
     "lint-staged": "^10.4.0",
     "maildev": "^1.1.0",
     "mini-css-extract-plugin": "^0.5.0",

From 3746d84d1358a9002db072c9a35a77ca601f71ef Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:08:22 +0800
Subject: [PATCH 04/26] chore(deps-dev): bump eslint-plugin-import from 2.22.0
 to 2.22.1 (#580)

Bumps [eslint-plugin-import](https://github.com/benmosher/eslint-plugin-import) from 2.22.0 to 2.22.1.
- [Release notes](https://github.com/benmosher/eslint-plugin-import/releases)
- [Changelog](https://github.com/benmosher/eslint-plugin-import/blob/master/CHANGELOG.md)
- [Commits](https://github.com/benmosher/eslint-plugin-import/compare/v2.22.0...v2.22.1)

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

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

diff --git a/package-lock.json b/package-lock.json
index d73da25bbc..45e7e582b9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11120,9 +11120,9 @@
       "dev": true
     },
     "eslint-plugin-import": {
-      "version": "2.22.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz",
-      "integrity": "sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg==",
+      "version": "2.22.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz",
+      "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==",
       "dev": true,
       "requires": {
         "array-includes": "^3.1.1",
@@ -11130,7 +11130,7 @@
         "contains-path": "^0.1.0",
         "debug": "^2.6.9",
         "doctrine": "1.5.0",
-        "eslint-import-resolver-node": "^0.3.3",
+        "eslint-import-resolver-node": "^0.3.4",
         "eslint-module-utils": "^2.6.0",
         "has": "^1.0.3",
         "minimatch": "^3.0.4",
diff --git a/package.json b/package.json
index 6ad60d1c28..41f5d720e5 100644
--- a/package.json
+++ b/package.json
@@ -209,7 +209,7 @@
     "eslint": "^7.12.1",
     "eslint-config-prettier": "^6.15.0",
     "eslint-plugin-angular": "^4.0.1",
-    "eslint-plugin-import": "^2.22.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-jest": "^24.0.2",
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-simple-import-sort": "^5.0.3",

From 34705fc1b941b8cc4468b81e60ab3933ed77c0c2 Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Wed, 4 Nov 2020 16:06:50 +0800
Subject: [PATCH 05/26] feat: remove exclamation when user updates contact
 (#586)

---
 .../modules/core/components/avatar-dropdown.client.component.js  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/public/modules/core/components/avatar-dropdown.client.component.js b/src/public/modules/core/components/avatar-dropdown.client.component.js
index 2f21f54df9..633906acd5 100644
--- a/src/public/modules/core/components/avatar-dropdown.client.component.js
+++ b/src/public/modules/core/components/avatar-dropdown.client.component.js
@@ -98,6 +98,7 @@ function avatarDropdownController(
         if (returnVal) {
           vm.user = returnVal
           Auth.setUser(returnVal)
+          vm.showExclamation = !returnVal.contact
         }
       })
       .finally(angular.noop)

From 7c567978f630ec7ffefaea1b42806455c2469068 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Thu, 5 Nov 2020 00:09:57 +0800
Subject: [PATCH 06/26] feat: deprecate MYINFO_APP_KEY (#557)

---
 docs/DEPLOYMENT_SETUP.md                 | 1 -
 src/app/factories/spcp-myinfo.factory.js | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/docs/DEPLOYMENT_SETUP.md b/docs/DEPLOYMENT_SETUP.md
index 60f3b48beb..fdf42b1318 100644
--- a/docs/DEPLOYMENT_SETUP.md
+++ b/docs/DEPLOYMENT_SETUP.md
@@ -302,7 +302,6 @@ Note that MyInfo is currently not supported for storage mode forms and enabling
 | `CP_IDP_CERT_PATH`              | Path to National Digital Identity office's X.509 cert used for CorpPass related communication.                                                                                                  |
 | `MYINFO_CLIENT_CONFIG`          | Configures [MyInfoGovClient](https://github.com/opengovsg/myinfo-gov-client). Set this to either`stg` or `prod` to fetch MyInfo data from the corresponding endpoints.                          |
 | `MYINFO_FORMSG_KEY_PATH`        | Filepath to MyInfo private key, which is used to decrypt returned responses.                                                                                                                    |
-| `MYINFO_APP_KEY`                | (deprecated) Directly specify contents of the MyInfo FormSG private key. Only works if `NODE_ENV` is set to `development`.                                                                      |
 | `IS_SP_MAINTENANCE`             | If set, displays a banner message on SingPass forms. Overrides `IS_CP_MAINTENANCE`.                                                                                                             |
 | `IS_CP_MAINTENANCE`             | If set, displays a banner message on CorpPass forms.                                                                                                                                            |
 | `FILE_SYSTEM_ID`                | The id of the AWS Elastic File System (EFS) file system to mount onto the instances.                                                                                                            |
diff --git a/src/app/factories/spcp-myinfo.factory.js b/src/app/factories/spcp-myinfo.factory.js
index 6a1918a323..fb8befa061 100644
--- a/src/app/factories/spcp-myinfo.factory.js
+++ b/src/app/factories/spcp-myinfo.factory.js
@@ -66,11 +66,6 @@ const spcpFactory = ({ isEnabled, props }) => {
       myInfoConfig.appId = myInfoPrefix + myInfoConfig.singpassEserviceId
       myInfoConfig.mode = process.env.MYINFO_CLIENT_CONFIG
       myInfoGovClient = new MyInfoGovClient(myInfoConfig)
-    } else if (config.isDev && process.env.MYINFO_APP_KEY) {
-      myInfoConfig.appId = 'STG2-' + myInfoConfig.singpassEserviceId
-      myInfoConfig.privateKey = process.env.MYINFO_APP_KEY
-      myInfoConfig.mode = 'stg'
-      myInfoGovClient = new MyInfoGovClient(myInfoConfig)
     } else {
       logger.warn({
         message: `\n!!! WARNING !!!\nNo MyInfo keys detected.\nRequests to MyInfo will not work.\nThis should NEVER be seen in production.\nFalling back on MockPass.`,

From 720245fe41169897138f4d9973dd354a3bafba0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Nov 2020 13:50:45 +0800
Subject: [PATCH 07/26] chore(deps-dev): bump jasmine from 3.6.2 to 3.6.3
 (#587)

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

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 45e7e582b9..29cdfb2b79 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14245,9 +14245,9 @@
       }
     },
     "jasmine": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.2.tgz",
-      "integrity": "sha512-Uc0o2MRnC8TS1MjDrB8jE1umKEo2mflzGvdg0Ncs+yuLtOJ+uz/Wz8VmGsNGtuASr8+E0LDgPkOpvdoC76m5WQ==",
+      "version": "3.6.3",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.6.3.tgz",
+      "integrity": "sha512-Th91zHsbsALWjDUIiU5d/W5zaYQsZFMPTdeNmi8GivZPmAaUAK8MblSG3yQI4VMGC/abF2us7ex60NH1AAIMTA==",
       "dev": true,
       "requires": {
         "glob": "^7.1.6",
diff --git a/package.json b/package.json
index 41f5d720e5..348d6b6e6a 100644
--- a/package.json
+++ b/package.json
@@ -217,7 +217,7 @@
     "html-loader": "~0.5.5",
     "htmlhint": "^0.14.1",
     "husky": "^4.3.0",
-    "jasmine": "^3.6.2",
+    "jasmine": "^3.6.3",
     "jasmine-core": "^3.1.0",
     "jasmine-sinon": "^0.4.0",
     "jasmine-spec-reporter": "^6.0.0",

From 2905cbd618a5b846e6e001ab6088d73331427fa2 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Thu, 5 Nov 2020 21:39:53 +0800
Subject: [PATCH 08/26] feat: upgrade myinfo-gov-client (#593)

---
 package-lock.json | 28 +++++++++++++++++++++++++---
 package.json      |  2 +-
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 29cdfb2b79..f6cf32dc56 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4055,14 +4055,36 @@
       }
     },
     "@opengovsg/myinfo-gov-client": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@opengovsg/myinfo-gov-client/-/myinfo-gov-client-2.0.0.tgz",
-      "integrity": "sha512-pRkBhSGIDDq8S2YFhfEGc9toqwm1D0uKhG/U+etjSbp13UXj/8TvLK1dQwTFCJ9NAgSO/S3M6UWrGdUoboUAkw==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@opengovsg/myinfo-gov-client/-/myinfo-gov-client-2.1.2.tgz",
+      "integrity": "sha512-YrHswABeH1Gcl3ga6onQOMa09Ohqe57a+lrCOdFcehlvNSc6QOmN8Sd8Z/nkFJr2xOsgPGl+kcRTYfK4vooV9g==",
       "requires": {
+        "axios": "^0.21.0",
         "jose": "^0.3.2",
         "node-jose": "^2.0.0",
         "path": "^0.12.7",
+        "qs": "^6.9.4",
         "request": "^2.88.0"
+      },
+      "dependencies": {
+        "axios": {
+          "version": "0.21.0",
+          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.0.tgz",
+          "integrity": "sha512-fmkJBknJKoZwem3/IKSSLpkdNXZeBu5Q7GA/aRsr2btgrptmSCxi2oFjZHqGdK9DoTil9PIHlPIZw2EcRJXRvw==",
+          "requires": {
+            "follow-redirects": "^1.10.0"
+          }
+        },
+        "follow-redirects": {
+          "version": "1.13.0",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz",
+          "integrity": "sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="
+        },
+        "qs": {
+          "version": "6.9.4",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.4.tgz",
+          "integrity": "sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ=="
+        }
       }
     },
     "@opengovsg/ng-file-upload": {
diff --git a/package.json b/package.json
index 348d6b6e6a..8cb1e0534c 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "@opengovsg/angular-legacy-sortablejs-maintained": "^1.0.0",
     "@opengovsg/angular-recaptcha-fallback": "^5.0.0",
     "@opengovsg/formsg-sdk": "0.8.2",
-    "@opengovsg/myinfo-gov-client": "^2.0.0",
+    "@opengovsg/myinfo-gov-client": "^2.1.2",
     "@opengovsg/ng-file-upload": "^12.2.14",
     "@opengovsg/spcp-auth-client": "^1.3.6",
     "@sentry/browser": "^5.24.2",

From 7280e64e7ae1e0458c26d54032d14f54975b3ca4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 8 Nov 2020 21:04:46 +0800
Subject: [PATCH 09/26] fix(deps): bump angular-cookies from 1.8.1 to 1.8.2
 (#590)

Bumps [angular-cookies](https://github.com/angular/angular.js) from 1.8.1 to 1.8.2.
- [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.1...v1.8.2)

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 f6cf32dc56..3ae63501bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5503,9 +5503,9 @@
       "integrity": "sha512-eCQI6EwgY6bYHdzIUfDABHnZjoZ3bNYpCsnceQF4bLfbq1QtZ7raRPNca45sj6C9Pfjde6PNcEDvuLozFPYnrQ=="
     },
     "angular-cookies": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.8.1.tgz",
-      "integrity": "sha512-952lNWW2REfGRwErYB4kLiWCvCE+euaPtIq8iYdZso0T74D6KCz82zSQjO5xnxfIKWMeKp2X2yIMksyH++GZcw=="
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/angular-cookies/-/angular-cookies-1.8.2.tgz",
+      "integrity": "sha512-M6fCnsnw1pj1+nXuO28ilJ+h6pFCIXQKSEgy9/PIoN0sZr5FqsE9BK18PdBQa8dif+fnHCAYpPU8MgDzT/sZSg=="
     },
     "angular-drag-scroll": {
       "version": "0.2.2",
diff --git a/package.json b/package.json
index 8cb1e0534c..5122dbafc0 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "angular": "~1.8.0",
     "angular-animate": "^1.8.0",
     "angular-aria": "^1.8.0",
-    "angular-cookies": "~1.8.1",
+    "angular-cookies": "~1.8.2",
     "angular-drag-scroll": "^0.2.1",
     "angular-messages": "^1.8.1",
     "angular-moment": "~1.2.0",

From f77759c341c21f515eb7a971621193e964cdf4e5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:56:38 +0800
Subject: [PATCH 10/26] chore(deps-dev): bump ngrok from 3.2.7 to 3.3.0 (#578)

Bumps [ngrok](https://github.com/bubenshchykov/ngrok) from 3.2.7 to 3.3.0.
- [Release notes](https://github.com/bubenshchykov/ngrok/releases)
- [Commits](https://github.com/bubenshchykov/ngrok/commits/v3.3.0)

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

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

diff --git a/package-lock.json b/package-lock.json
index 3ae63501bb..b75cf1cd19 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18993,9 +18993,9 @@
       }
     },
     "ngrok": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/ngrok/-/ngrok-3.2.7.tgz",
-      "integrity": "sha512-B7K15HM0qRZplL2aO/yfxixYubH0M50Pfu0fa4PDcmXP7RC+wyYzu6YtX77BBHHCfbwCzkObX6YdO8ThpCR6Lg==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/ngrok/-/ngrok-3.3.0.tgz",
+      "integrity": "sha512-NuTfuxttodW6o9cPEKiJgjmjNzolKHoUPaK7I4SbaJVkHd4cuUTlv9YsXNzBFrcNFSsDLuCyCpjsaqe1OvIPSQ==",
       "dev": true,
       "requires": {
         "@types/node": "^8.10.50",
@@ -19007,9 +19007,9 @@
       },
       "dependencies": {
         "@types/node": {
-          "version": "8.10.62",
-          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.62.tgz",
-          "integrity": "sha512-76fupxOYVxk36kb7O/6KtrAPZ9jnSK3+qisAX4tQMEuGNdlvl7ycwatlHqjoE6jHfVtXFM3pCrCixZOidc5cuw==",
+          "version": "8.10.66",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz",
+          "integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw==",
           "dev": true
         },
         "uuid": {
diff --git a/package.json b/package.json
index 5122dbafc0..4fdd7a0c68 100644
--- a/package.json
+++ b/package.json
@@ -228,7 +228,7 @@
     "mockdate": "^3.0.2",
     "mockingoose": "^2.13.2",
     "mongodb-memory-server-core": "^6.9.2",
-    "ngrok": "^3.2.7",
+    "ngrok": "^3.3.0",
     "optimize-css-assets-webpack-plugin": "^5.0.1",
     "prettier": "^2.1.2",
     "proxyquire": "^2.1.3",

From 435b223290021ff2a8347393e8ada55265708343 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 09:56:59 +0800
Subject: [PATCH 11/26] chore(deps-dev): bump @types/node from 14.11.2 to
 14.14.6 (#588)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 14.11.2 to 14.14.6.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

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 b75cf1cd19..9f3de39d59 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4680,9 +4680,9 @@
       }
     },
     "@types/node": {
-      "version": "14.11.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.11.2.tgz",
-      "integrity": "sha512-jiE3QIxJ8JLNcb1Ps6rDbysDhN4xa8DJJvuC9prr6w+1tIh+QAbYyNF3tyiZNLDBIuBCf4KEcV2UvQm/V60xfA=="
+      "version": "14.14.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz",
+      "integrity": "sha512-6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw=="
     },
     "@types/nodemailer": {
       "version": "6.4.0",
diff --git a/package.json b/package.json
index 4fdd7a0c68..bd8cc7f9dd 100644
--- a/package.json
+++ b/package.json
@@ -184,7 +184,7 @@
     "@types/json-stringify-safe": "^5.0.0",
     "@types/mongodb-uri": "^0.9.0",
     "@types/mongoose": "^5.7.36",
-    "@types/node": "^14.11.2",
+    "@types/node": "^14.14.6",
     "@types/nodemailer": "^6.4.0",
     "@types/nodemailer-direct-transport": "^1.0.31",
     "@types/promise-retry": "^1.1.3",

From 0e1ecee4f2ab32532e7fbd7853c9be7462513084 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Mon, 9 Nov 2020 10:05:42 +0800
Subject: [PATCH 12/26] refactor: hash uinFin in domain layer (#596)

* ref: move updateHashes hashing into model

* test: update updateHashes tests

* ref: add findHashes method

* ref: use findHashes function

* test: add tests for findHashes

* test: update jasmine tests

* ref: return only fields
---
 .../controllers/myinfo.server.controller.js   | 163 ++++++++----------
 src/app/models/myinfo_hash.server.model.ts    |  24 ++-
 src/types/myinfo_hash.ts                      |   3 +-
 .../myinfo.server.controller.spec.js          |   5 +-
 .../models/myinfo_hash.server.model.spec.ts   |  82 +++++++--
 5 files changed, 161 insertions(+), 116 deletions(-)

diff --git a/src/app/controllers/myinfo.server.controller.js b/src/app/controllers/myinfo.server.controller.js
index 43c899e06a..1a818b192f 100644
--- a/src/app/controllers/myinfo.server.controller.js
+++ b/src/app/controllers/myinfo.server.controller.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const bcrypt = require('bcrypt')
-const crypto = require('crypto')
 const CircuitBreaker = require('opossum')
 const to = require('await-to-js').default
 const Promise = require('bluebird')
@@ -10,7 +9,6 @@ const mongoose = require('mongoose')
 const moment = require('moment')
 const { StatusCodes } = require('http-status-codes')
 
-const { sessionSecret } = require('../../config/config')
 const { createReqMeta } = require('../utils/request')
 const logger = require('../../config/logger').createLoggerWithLabel(module)
 const getMyInfoHashModel = require('../models/myinfo_hash.server.model').default
@@ -76,15 +74,10 @@ exports.addMyInfo = (myInfoService) => async (req, res, next) => {
   // Set current form fields to the new prefilledFields.
   req.form.form_fields = prefilledFields
 
-  const hashedUinFin = crypto
-    .createHmac('sha256', sessionSecret)
-    .update(uinFin)
-    .digest('hex')
-
   Promise.props(readOnlyHashPromises)
     .then((readOnlyHashes) => {
       return MyInfoHash.updateHashes(
-        hashedUinFin,
+        uinFin,
         formId,
         readOnlyHashes,
         myInfoService.spCookieMaxAge,
@@ -142,7 +135,7 @@ function _preHashCheckConversion(field) {
  * @param  {Object} res.locals.uinFin - UIN/FIN of form submitter
  * @param  {Object} next - Express next middleware function
  */
-exports.verifyMyInfoVals = function (req, res, next) {
+exports.verifyMyInfoVals = async function (req, res, next) {
   const { authType } = req.form
   const actualMyInfoFields = req.form.form_fields.filter(
     (field) => field.myInfo && field.myInfo.attr,
@@ -150,101 +143,85 @@ exports.verifyMyInfoVals = function (req, res, next) {
   if (authType === 'SP' && actualMyInfoFields.length > 0) {
     const uinFin = res.locals.uinFin
     const formObjId = req.form._id
-
-    let hashedUinFin = crypto
-      .createHmac('sha256', sessionSecret)
-      .update(uinFin)
-      .digest('hex')
-    MyInfoHash.findOne(
-      { uinFin: hashedUinFin, form: formObjId },
-      (err, hashedObj) => {
-        if (err) {
-          logger.error({
-            message: 'Error retrieving MyInfo hash from database',
-            meta: {
-              action: 'verifyMyInfoVals',
-              ...createReqMeta(req),
-            },
-            error: err,
-          })
-          return res.status(StatusCodes.SERVICE_UNAVAILABLE).json({
-            message: 'MyInfo verification unavailable, please try again later.',
-            spcpSubmissionFailure: true,
-          })
+    let hashedFields
+    try {
+      hashedFields = await MyInfoHash.findHashes(uinFin, formObjId)
+    } catch (error) {
+      logger.error({
+        message: 'Error retrieving MyInfo hash from database',
+        meta: {
+          action: 'verifyMyInfoVals',
+          ...createReqMeta(req),
+        },
+        error,
+      })
+      return res.status(StatusCodes.SERVICE_UNAVAILABLE).json({
+        message: 'MyInfo verification unavailable, please try again later.',
+        spcpSubmissionFailure: true,
+      })
+    }
+    if (!hashedFields) {
+      logger.error({
+        message: `Unable to find MyInfo hashes for ${formObjId}`,
+        meta: {
+          action: 'verifyMyInfoVals',
+          ...createReqMeta(req),
+          formId: formObjId,
+        },
+      })
+      return res.status(StatusCodes.GONE).json({
+        message: 'MyInfo verification expired, please refresh and try again.',
+        spcpSubmissionFailure: true,
+      })
+    }
+    // Fields from client submission
+    let clientFormFields = req.body.parsedResponses // responses were transformed in submissions.server.controller.js
+    let clientMyInfoFields = clientFormFields
+      .filter((field) => field.isVisible && field.myInfo && field.myInfo.attr)
+      .map(_preHashCheckConversion)
+
+    // compare hashed values to submission values
+    const bcryptCompares = clientMyInfoFields.map((clientField) => {
+      const expected = hashedFields[clientField.attr]
+      return expected
+        ? bcrypt.compare(clientField.val, expected)
+        : Promise.resolve(true)
+    })
+    Promise.all(bcryptCompares)
+      .then((compare) => {
+        return {
+          compare, // Array<Boolean> indicating hash pass/fail
+          fail: compare.some((v) => !v), // Whether any hashes failed
         }
+      })
+      .then((hashResults) => {
+        if (hashResults.fail) {
+          // Array of MyInfo attributes that failed verification
+          let hashFailedAttrs = _.zip(clientMyInfoFields, hashResults.compare)
+            .filter(([_, compare]) => compare === false)
+            .map(([clientField, _]) => clientField.attr)
 
-        if (!hashedObj) {
           logger.error({
-            message: `Unable to find MyInfo hashes for ${formObjId}`,
+            message: `Hash did not match for form ${formObjId}`,
             meta: {
               action: 'verifyMyInfoVals',
               ...createReqMeta(req),
-              formId: formObjId,
+              failedFields: hashFailedAttrs,
             },
           })
-          return res.status(StatusCodes.GONE).json({
-            message:
-              'MyInfo verification expired, please refresh and try again.',
+          return res.status(StatusCodes.UNAUTHORIZED).json({
+            message: 'MyInfo verification failed.',
             spcpSubmissionFailure: true,
           })
-        }
-        // Fields from client submission
-        let clientFormFields = req.body.parsedResponses // responses were transformed in submissions.server.controller.js
-        let clientMyInfoFields = clientFormFields
-          .filter(
-            (field) => field.isVisible && field.myInfo && field.myInfo.attr,
+        } else {
+          let verifiedKeys = _.intersection(
+            _.uniq(clientMyInfoFields.map((field) => field.attr)),
+            _.keys(hashedFields),
           )
-          .map(_preHashCheckConversion)
-
-        // Fields from saved hash
-        let hashedFields = hashedObj.fields
-        // compare hashed values to submission values
-        const bcryptCompares = clientMyInfoFields.map((clientField) => {
-          const expected = hashedFields[clientField.attr]
-          return expected
-            ? bcrypt.compare(clientField.val, expected)
-            : Promise.resolve(true)
-        })
-        Promise.all(bcryptCompares)
-          .then((compare) => {
-            return {
-              compare, // Array<Boolean> indicating hash pass/fail
-              fail: compare.some((v) => !v), // Whether any hashes failed
-            }
-          })
-          .then((hashResults) => {
-            if (hashResults.fail) {
-              // Array of MyInfo attributes that failed verification
-              let hashFailedAttrs = _.zip(
-                clientMyInfoFields,
-                hashResults.compare,
-              )
-                .filter(([_, compare]) => compare === false)
-                .map(([clientField, _]) => clientField.attr)
-
-              logger.error({
-                message: `Hash did not match for form ${formObjId}`,
-                meta: {
-                  action: 'verifyMyInfoVals',
-                  ...createReqMeta(req),
-                  failedFields: hashFailedAttrs,
-                },
-              })
-              return res.status(StatusCodes.UNAUTHORIZED).json({
-                message: 'MyInfo verification failed.',
-                spcpSubmissionFailure: true,
-              })
-            } else {
-              let verifiedKeys = _.intersection(
-                _.uniq(clientMyInfoFields.map((field) => field.attr)),
-                _.keys(hashedFields),
-              )
-              req.hashedFields = _.pick(hashedFields, verifiedKeys)
-              return next()
-            }
-          })
-      },
-    )
+          req.hashedFields = _.pick(hashedFields, verifiedKeys)
+          return next()
+        }
+      })
   } else {
     return next()
   }
diff --git a/src/app/models/myinfo_hash.server.model.ts b/src/app/models/myinfo_hash.server.model.ts
index 8ab2f54b6f..67376a3180 100644
--- a/src/app/models/myinfo_hash.server.model.ts
+++ b/src/app/models/myinfo_hash.server.model.ts
@@ -1,5 +1,7 @@
+import crypto from 'crypto'
 import { Mongoose, Schema } from 'mongoose'
 
+import { sessionSecret } from '../../config/config'
 import { IHashes, IMyInfoHashModel, IMyInfoHashSchema } from '../../types'
 
 import { FORM_SCHEMA_ID } from './form.server.model'
@@ -45,11 +47,15 @@ MyInfoHashSchema.index({ expireAt: 1 }, { expireAfterSeconds: 0 })
 
 MyInfoHashSchema.statics.updateHashes = async function (
   this: IMyInfoHashModel,
-  hashedUinFin: string,
+  uinFin: string,
   formId: string,
   readOnlyHashes: IHashes,
   spCookieMaxAge: number,
 ): Promise<IMyInfoHashSchema | null> {
+  const hashedUinFin = crypto
+    .createHmac('sha256', sessionSecret)
+    .update(uinFin)
+    .digest('hex')
   return this.findOneAndUpdate(
     {
       uinFin: hashedUinFin,
@@ -65,6 +71,22 @@ MyInfoHashSchema.statics.updateHashes = async function (
   )
 }
 
+MyInfoHashSchema.statics.findHashes = async function (
+  this: IMyInfoHashModel,
+  uinFin: string,
+  formId: string,
+): Promise<IHashes | null> {
+  const hashedUinFin = crypto
+    .createHmac('sha256', sessionSecret)
+    .update(uinFin)
+    .digest('hex')
+  const hashInfo = await this.findOne({
+    uinFin: hashedUinFin,
+    form: formId,
+  })
+  return hashInfo ? hashInfo.fields : null
+}
+
 const compileMyInfoHashModel = (db: Mongoose) =>
   db.model<IMyInfoHashSchema, IMyInfoHashModel>(
     MYINFO_HASH_SCHEMA_ID,
diff --git a/src/types/myinfo_hash.ts b/src/types/myinfo_hash.ts
index 32e51f23f8..81ce6391bf 100644
--- a/src/types/myinfo_hash.ts
+++ b/src/types/myinfo_hash.ts
@@ -22,9 +22,10 @@ export interface IMyInfoHashSchema extends IMyInfoHash, Document {}
 
 export interface IMyInfoHashModel extends Model<IMyInfoHashSchema> {
   updateHashes: (
-    hashedUinFin: string,
+    uinFin: string,
     formId: string,
     readOnlyHashes: IHashes,
     spCookieMaxAge: number,
   ) => Promise<IMyInfoHashSchema | null>
+  findHashes: (uinFin: string, formId: string) => Promise<IHashes | null>
 }
diff --git a/tests/unit/backend/controllers/myinfo.server.controller.spec.js b/tests/unit/backend/controllers/myinfo.server.controller.spec.js
index 2759682568..9335766ad1 100644
--- a/tests/unit/backend/controllers/myinfo.server.controller.spec.js
+++ b/tests/unit/backend/controllers/myinfo.server.controller.spec.js
@@ -495,7 +495,7 @@ const ALL_MYINFO_HASHES = {
     '$2b$10$eLakOm88NEuUawlGHsiPjeaImpYT5ZBH1JyZUseIRL9kCtDRIKdCe',
 }
 
-const SESSION_SECRET = 'secret'
+const SESSION_SECRET = process.env.SESSION_SECRET
 
 const User = dbHandler.makeModel('user.server.model', 'User')
 const Agency = dbHandler.makeModel('agency.server.model', 'Agency')
@@ -506,9 +506,6 @@ const Controller = spec(
   'dist/backend/app/controllers/myinfo.server.controller',
   {
     mongoose: Object.assign(mongoose, { '@noCallThru': true }),
-    '../../config/config': {
-      sessionSecret: SESSION_SECRET,
-    },
   },
 )
 
diff --git a/tests/unit/backend/models/myinfo_hash.server.model.spec.ts b/tests/unit/backend/models/myinfo_hash.server.model.spec.ts
index 784189d476..09fffbc2bf 100644
--- a/tests/unit/backend/models/myinfo_hash.server.model.spec.ts
+++ b/tests/unit/backend/models/myinfo_hash.server.model.spec.ts
@@ -1,31 +1,51 @@
 import { ObjectId } from 'bson'
+import crypto from 'crypto'
 import { omit, pick } from 'lodash'
 import mongoose from 'mongoose'
+import { mocked } from 'ts-jest/utils'
 
-import getMyInfoHashModel from 'src/app/models/myinfo_hash.server.model'
+import config from 'src/config/config'
 
 import dbHandler from '../helpers/jest-db'
 
+jest.mock('src/config/config')
+const MockConfig = mocked(config, true)
+
+// eslint-disable-next-line import/first
+import getMyInfoHashModel from 'src/app/models/myinfo_hash.server.model'
+
 const MyInfoHash = getMyInfoHashModel(mongoose)
 
-const DEFAULT_PARAMS = {
+const MOCK_SESSION_SECRET = 'mockSecret'
+const DEFAULT_INPUT_PARAMS = {
   uinFin: 'testUinFin',
   form: new ObjectId(),
   fields: { name: 'mockHash' },
   expireAt: new Date(Date.now()),
   created: new Date(Date.now()),
 }
+const DEFAULT_HASHED_UINFIN = crypto
+  .createHmac('sha256', MOCK_SESSION_SECRET)
+  .update(DEFAULT_INPUT_PARAMS.uinFin)
+  .digest('hex')
+const DEFAULT_SAVED_PARAMS = {
+  ...DEFAULT_INPUT_PARAMS,
+  uinFin: DEFAULT_HASHED_UINFIN,
+}
 const DEFAULT_COOKIE_MAX_AGE = 5
 
 describe('MyInfo Hash Model', () => {
-  beforeAll(async () => await dbHandler.connect())
+  beforeAll(async () => {
+    await dbHandler.connect()
+    MockConfig.sessionSecret = MOCK_SESSION_SECRET
+  })
   beforeEach(async () => await dbHandler.clearDatabase())
   afterAll(async () => await dbHandler.closeDatabase())
 
   describe('Schema', () => {
     it('should create and save successfully', async () => {
       // Act
-      const actual = await MyInfoHash.create(DEFAULT_PARAMS)
+      const actual = await MyInfoHash.create(DEFAULT_INPUT_PARAMS)
 
       // Assert
       // All fields should exist
@@ -33,12 +53,12 @@ describe('MyInfo Hash Model', () => {
       expect(actual._id).toBeDefined()
       expect(
         pick(actual, ['uinFin', 'form', 'fields', 'created', 'expireAt']),
-      ).toEqual(DEFAULT_PARAMS)
+      ).toEqual(DEFAULT_INPUT_PARAMS)
     })
 
     it('should throw validation error on missing uinFin', async () => {
       // Arrange
-      const missingParams = omit(DEFAULT_PARAMS, 'uinFin')
+      const missingParams = omit(DEFAULT_INPUT_PARAMS, 'uinFin')
 
       // Act
       const myInfoHash = new MyInfoHash(missingParams)
@@ -52,7 +72,7 @@ describe('MyInfo Hash Model', () => {
 
     it('should throw validation error on missing form', async () => {
       // Arrange
-      const missingParams = omit(DEFAULT_PARAMS, 'form')
+      const missingParams = omit(DEFAULT_INPUT_PARAMS, 'form')
 
       // Act
       const myInfoHash = new MyInfoHash(missingParams)
@@ -66,7 +86,7 @@ describe('MyInfo Hash Model', () => {
 
     it('should throw validation error on missing fields', async () => {
       // Arrange
-      const missingParams = omit(DEFAULT_PARAMS, 'fields')
+      const missingParams = omit(DEFAULT_INPUT_PARAMS, 'fields')
 
       // Act
       const myInfoHash = new MyInfoHash(missingParams)
@@ -80,7 +100,7 @@ describe('MyInfo Hash Model', () => {
 
     it('should throw validation error on missing expireAt', async () => {
       // Arrange
-      const missingParams = omit(DEFAULT_PARAMS, 'expireAt')
+      const missingParams = omit(DEFAULT_INPUT_PARAMS, 'expireAt')
 
       // Act
       const myInfoHash = new MyInfoHash(missingParams)
@@ -100,10 +120,11 @@ describe('MyInfo Hash Model', () => {
         await expect(MyInfoHash.countDocuments()).resolves.toEqual(0)
 
         // Act
+        // Note: we are passing the PLAIN uinFin
         const actual = await MyInfoHash.updateHashes(
-          DEFAULT_PARAMS.uinFin,
-          DEFAULT_PARAMS.form.toHexString(),
-          DEFAULT_PARAMS.fields,
+          DEFAULT_INPUT_PARAMS.uinFin,
+          DEFAULT_INPUT_PARAMS.form.toHexString(),
+          DEFAULT_INPUT_PARAMS.fields,
           DEFAULT_COOKIE_MAX_AGE,
         )
 
@@ -112,27 +133,30 @@ describe('MyInfo Hash Model', () => {
         await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
         const found = await MyInfoHash.findOne({})
         // Both the returned document and the found document should match
+        // Note: we are checking that the document contains the HASHED uinFin
         expect(pick(actual, ['uinFin', 'form', 'fields'])).toEqual(
-          pick(DEFAULT_PARAMS, ['uinFin', 'form', 'fields']),
+          pick(DEFAULT_SAVED_PARAMS, ['uinFin', 'form', 'fields']),
         )
         expect(pick(found, ['uinFin', 'form', 'fields'])).toEqual(
-          pick(DEFAULT_PARAMS, ['uinFin', 'form', 'fields']),
+          pick(DEFAULT_SAVED_PARAMS, ['uinFin', 'form', 'fields']),
         )
       })
 
       it('should update successfully when a document already exists', async () => {
         // Arrange
         // Insert mock document into collection.
-        await MyInfoHash.create(DEFAULT_PARAMS)
+        // Note: we are inserting the HASHED uinFin directly.
+        await MyInfoHash.create(DEFAULT_SAVED_PARAMS)
         // Should have the added document.
         await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
 
         const mockFields = { sex: 'F' }
 
         // Act
+        // Note: we are passing the PLAIN uinFin and checking that it gets hashed
         const actual = await MyInfoHash.updateHashes(
-          DEFAULT_PARAMS.uinFin,
-          DEFAULT_PARAMS.form.toHexString(),
+          DEFAULT_INPUT_PARAMS.uinFin,
+          DEFAULT_INPUT_PARAMS.form.toHexString(),
           mockFields,
           DEFAULT_COOKIE_MAX_AGE,
         )
@@ -142,6 +166,30 @@ describe('MyInfo Hash Model', () => {
         // Both the returned document and the found document should match
         expect(actual!.fields).toEqual(mockFields)
         expect(found!.fields).toEqual(mockFields)
+
+        expect(actual!.uinFin).toBe(DEFAULT_HASHED_UINFIN)
+        expect(found!.uinFin).toEqual(DEFAULT_HASHED_UINFIN)
+      })
+    })
+
+    describe('findHashes', () => {
+      it('should find the correct document', async () => {
+        // Arrange
+        // Insert mock document into collection.
+        // Note: we are inserting the HASHED uinFin directly.
+        await MyInfoHash.create(DEFAULT_SAVED_PARAMS)
+        // Should have the added document.
+        await expect(MyInfoHash.countDocuments()).resolves.toEqual(1)
+
+        // Act
+        // Note: we are passing the PLAIN uinFin and checking that it gets hashed
+        const actual = await MyInfoHash.findHashes(
+          DEFAULT_INPUT_PARAMS.uinFin,
+          DEFAULT_INPUT_PARAMS.form.toHexString(),
+        )
+        // Assert
+        // Both the returned document and the found document should match
+        expect(actual).toEqual(DEFAULT_SAVED_PARAMS.fields)
       })
     })
   })

From 7f9a0aa9cab3e9a48085bf3ec4abbf18813498df Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Mon, 9 Nov 2020 10:44:53 +0800
Subject: [PATCH 13/26] feat: use auth middleware to protect routes (#568)

* refactor: migrate extended express typing to vendor directory

* feat(AuthMiddleware): add withUserAuthentication middleware

* feat(ExampleRoutes): use withUserAuthentication middleware

* test: remove 401 checks on controller tests

As the authentication middleware is now on the router level and covered by integration tests

* test(AuthMdw): add unit tests for withUserAuthenticated

* refactor: replace auth.authenticateUser fn with withUserAuthentication

* chore: trigger travis rebuild
---
 .../authentication.server.controller.js       | 16 -------
 .../auth/__tests__/auth.middlewares.spec.ts   | 44 +++++++++++++++++++
 src/app/modules/auth/auth.middlewares.ts      | 20 +++++++++
 .../__tests__/billing.controller.spec.ts      | 20 ---------
 .../billing/__tests__/billing.routes.spec.ts  |  2 +-
 src/app/modules/billing/billing.controller.ts | 11 ++---
 src/app/modules/billing/billing.routes.ts     |  5 +++
 .../__tests__/examples.controller.spec.ts     | 38 ----------------
 .../modules/examples/examples.controller.ts   | 15 +------
 src/app/modules/examples/examples.routes.ts   |  6 +++
 src/app/routes/admin-forms.server.routes.js   |  9 ++--
 src/types/{ => vendor}/express.d.ts           |  0
 .../authentication.server.controller.spec.js  | 18 --------
 13 files changed, 87 insertions(+), 117 deletions(-)
 create mode 100644 src/app/modules/auth/__tests__/auth.middlewares.spec.ts
 create mode 100644 src/app/modules/auth/auth.middlewares.ts
 rename src/types/{ => vendor}/express.d.ts (100%)

diff --git a/src/app/controllers/authentication.server.controller.js b/src/app/controllers/authentication.server.controller.js
index f2a801a54b..8d30da5e0b 100755
--- a/src/app/controllers/authentication.server.controller.js
+++ b/src/app/controllers/authentication.server.controller.js
@@ -8,22 +8,6 @@ const PERMISSIONS = require('../utils/permission-levels').default
 const { createReqMeta } = require('../utils/request')
 const logger = require('../../config/logger').createLoggerWithLabel(module)
 
-/**
- * Middleware that authenticates admin-user
- * @param  {Object} req - Express request object
- * @param  {Object} res - Express response object
- * @param  {Object} next - Express next middleware function
- */
-exports.authenticateUser = function (req, res, next) {
-  if (req.session && req.session.user) {
-    return next()
-  } else {
-    return res
-      .status(StatusCodes.UNAUTHORIZED)
-      .json({ message: 'User is unauthorized.' })
-  }
-}
-
 /**
  * Returns the error message when a user cannot perform an action on a form
  * @param {String} user -  user email
diff --git a/src/app/modules/auth/__tests__/auth.middlewares.spec.ts b/src/app/modules/auth/__tests__/auth.middlewares.spec.ts
new file mode 100644
index 0000000000..eaecdc1928
--- /dev/null
+++ b/src/app/modules/auth/__tests__/auth.middlewares.spec.ts
@@ -0,0 +1,44 @@
+import expressHandler from 'tests/unit/backend/helpers/jest-express'
+
+import { withUserAuthentication } from '../auth.middlewares'
+
+describe('auth.middlewares', () => {
+  describe('withUserAuthentication', () => {
+    it('should pass on to the next handler if authenticated', async () => {
+      // Arrange
+      const mockReqAuthed = expressHandler.mockRequest({
+        session: {
+          user: {
+            _id: 'exists',
+          },
+        },
+      })
+
+      const mockRes = expressHandler.mockResponse()
+      const nextSpy = jest.fn()
+
+      // Act
+      await withUserAuthentication(mockReqAuthed, mockRes, nextSpy)
+
+      // Assert
+      expect(nextSpy).toHaveBeenCalled()
+    })
+
+    it('should return 401 if not authenticated', async () => {
+      // Arrange
+      const mockReqNotAuthed = expressHandler.mockRequest()
+      const mockRes = expressHandler.mockResponse()
+      const nextSpy = jest.fn()
+
+      // Act
+      await withUserAuthentication(mockReqNotAuthed, mockRes, nextSpy)
+
+      // Assert
+      expect(nextSpy).not.toHaveBeenCalled()
+      expect(mockRes.status).toHaveBeenCalledWith(401)
+      expect(mockRes.json).toHaveBeenCalledWith({
+        message: 'User is unauthorized.',
+      })
+    })
+  })
+})
diff --git a/src/app/modules/auth/auth.middlewares.ts b/src/app/modules/auth/auth.middlewares.ts
new file mode 100644
index 0000000000..32c086363b
--- /dev/null
+++ b/src/app/modules/auth/auth.middlewares.ts
@@ -0,0 +1,20 @@
+import { RequestHandler } from 'express'
+import { StatusCodes } from 'http-status-codes'
+
+import { isUserInSession } from './auth.utils'
+
+/**
+ * Middleware that only allows authenticated users to pass through to the next
+ * handler.
+ * @returns next if user exists in session
+ * @returns 401 if user does not exist in session
+ */
+export const withUserAuthentication: RequestHandler = (req, res, next) => {
+  if (isUserInSession(req.session)) {
+    return next()
+  }
+
+  return res
+    .status(StatusCodes.UNAUTHORIZED)
+    .json({ message: 'User is unauthorized.' })
+}
diff --git a/src/app/modules/billing/__tests__/billing.controller.spec.ts b/src/app/modules/billing/__tests__/billing.controller.spec.ts
index 45bf606aea..7e3c0da8b1 100644
--- a/src/app/modules/billing/__tests__/billing.controller.spec.ts
+++ b/src/app/modules/billing/__tests__/billing.controller.spec.ts
@@ -76,26 +76,6 @@ describe('billing.controller', () => {
       expect(mockRes.json).toBeCalledWith({ loginStats: mockLoginStats })
     })
 
-    it('should return 401 when user is not logged in', async () => {
-      // Arrange
-      const mockReqWithoutSession = expressHandler.mockRequest({
-        query: MOCK_REQ_QUERY,
-      })
-      const mockRes = expressHandler.mockResponse()
-
-      // Act
-      await BillingController.handleGetBillInfo(
-        mockReqWithoutSession,
-        mockRes,
-        jest.fn(),
-      )
-
-      // Assert
-      expect(MockBillingService.getSpLoginStats).not.toHaveBeenCalled()
-      expect(mockRes.status).toBeCalledWith(401)
-      expect(mockRes.json).toBeCalledWith('User is unauthorized.')
-    })
-
     it('should return 500 when database error occurs', async () => {
       // Arrange
       const mockRes = expressHandler.mockResponse()
diff --git a/src/app/modules/billing/__tests__/billing.routes.spec.ts b/src/app/modules/billing/__tests__/billing.routes.spec.ts
index c8865d7271..3dfa904ba7 100644
--- a/src/app/modules/billing/__tests__/billing.routes.spec.ts
+++ b/src/app/modules/billing/__tests__/billing.routes.spec.ts
@@ -183,7 +183,7 @@ describe('billing.routes', () => {
 
       // Assert
       expect(response.status).toEqual(401)
-      expect(response.body).toEqual('User is unauthorized.')
+      expect(response.body).toEqual({ message: 'User is unauthorized.' })
     })
 
     it('should return 500 when error occurs whilst querying the database', async () => {
diff --git a/src/app/modules/billing/billing.controller.ts b/src/app/modules/billing/billing.controller.ts
index 9d4a72f5e6..09d0032c34 100644
--- a/src/app/modules/billing/billing.controller.ts
+++ b/src/app/modules/billing/billing.controller.ts
@@ -5,7 +5,6 @@ import moment from 'moment-timezone'
 
 import { createLoggerWithLabel } from '../../../config/logger'
 import { createReqMeta } from '../../utils/request'
-import { isUserInSession } from '../auth/auth.utils'
 
 import { BillingFactory } from './billing.factory'
 
@@ -13,6 +12,8 @@ const logger = createLoggerWithLabel(module)
 
 /**
  * Handler for GET /billing endpoint.
+ * @security session
+ *
  * @return 200 with login statistics when query is valid
  * @return 401 when request does not contain a user session
  * @return 500 when error occurs whilst querying database
@@ -27,12 +28,8 @@ export const handleGetBillInfo: RequestHandler<
     mth: string
   }
 > = async (req, res) => {
-  // Restricted route.
-  if (!isUserInSession(req.session)) {
-    return res.status(StatusCodes.UNAUTHORIZED).json('User is unauthorized.')
-  }
-
   const { esrvcId, mth, yr } = req.query
+  const authedUser = (req.session as Express.AuthedSession).user
 
   const startOfMonth = moment
     .tz([parseInt(yr), parseInt(mth)], 'Asia/Singapore')
@@ -62,7 +59,7 @@ export const handleGetBillInfo: RequestHandler<
 
   // Retrieved login stats successfully.
   logger.info({
-    message: `Billing search for ${esrvcId} by ${req.session.user.email}`,
+    message: `Billing search for ${esrvcId} by ${authedUser.email}`,
     meta: {
       action: 'handleGetBillInfo',
       ...createReqMeta(req),
diff --git a/src/app/modules/billing/billing.routes.ts b/src/app/modules/billing/billing.routes.ts
index 3fab4cc2a2..ca53f8b546 100644
--- a/src/app/modules/billing/billing.routes.ts
+++ b/src/app/modules/billing/billing.routes.ts
@@ -1,10 +1,15 @@
 import { celebrate, Joi, Segments } from 'celebrate'
 import { Router } from 'express'
 
+import { withUserAuthentication } from '../auth/auth.middlewares'
+
 import * as BillingController from './billing.controller'
 
 export const BillingRouter = Router()
 
+// All routes in this router are protected.
+BillingRouter.use(withUserAuthentication)
+
 /**
  * Lists the SingPass/CorpPass (SPCP) logins made to forms
  * created by the user's agency, serving as the basis for billing
diff --git a/src/app/modules/examples/__tests__/examples.controller.spec.ts b/src/app/modules/examples/__tests__/examples.controller.spec.ts
index 217487053b..5e1efc357b 100644
--- a/src/app/modules/examples/__tests__/examples.controller.spec.ts
+++ b/src/app/modules/examples/__tests__/examples.controller.spec.ts
@@ -53,25 +53,6 @@ describe('examples.controller', () => {
       expect(mockRes.json).toBeCalledWith(mockResult)
     })
 
-    it('should return 401 when user is not in session', async () => {
-      // Arrange
-      const mockReqNoSession = expressHandler.mockRequest({
-        query: MOCK_REQ_QUERY,
-      })
-      const mockRes = expressHandler.mockResponse()
-
-      // Act
-      await ExamplesController.handleGetExamples(
-        mockReqNoSession,
-        mockRes,
-        jest.fn(),
-      )
-
-      // Assert
-      expect(mockRes.status).toBeCalledWith(401)
-      expect(mockRes.json).toBeCalledWith({ message: 'User is unauthorized.' })
-    })
-
     it('should return 500 when error occurs whilst retrieving example forms', async () => {
       // Arrange
       const mockRes = expressHandler.mockResponse()
@@ -144,25 +125,6 @@ describe('examples.controller', () => {
       expect(mockRes.json).toBeCalledWith(mockResult)
     })
 
-    it('should return 401 when user is not in session', async () => {
-      // Arrange
-      const mockReqNoSession = expressHandler.mockRequest({
-        params: MOCK_REQ_PARAMS,
-      })
-      const mockRes = expressHandler.mockResponse()
-
-      // Act
-      await ExamplesController.handleGetExampleByFormId(
-        mockReqNoSession,
-        mockRes,
-        jest.fn(),
-      )
-
-      // Assert
-      expect(mockRes.status).toBeCalledWith(401)
-      expect(mockRes.json).toBeCalledWith({ message: 'User is unauthorized.' })
-    })
-
     it('should return 404 when the form with given formId does not exist in the database', async () => {
       // Arrange
       const mockRes = expressHandler.mockResponse()
diff --git a/src/app/modules/examples/examples.controller.ts b/src/app/modules/examples/examples.controller.ts
index ddd0a86dff..0de411868e 100644
--- a/src/app/modules/examples/examples.controller.ts
+++ b/src/app/modules/examples/examples.controller.ts
@@ -4,7 +4,6 @@ import { StatusCodes } from 'http-status-codes'
 
 import { createLoggerWithLabel } from '../../../config/logger'
 import { createReqMeta } from '../../utils/request'
-import { isUserInSession } from '../auth/auth.utils'
 
 import { ExamplesFactory } from './examples.factory'
 import { ExamplesQueryParams } from './examples.types'
@@ -14,6 +13,7 @@ const logger = createLoggerWithLabel(module)
 
 /**
  * Handler for GET /examples endpoint.
+ * @security session
  * @returns 200 with an array of forms to be listed on the examples page
  * @returns 401 when user does not exist in session
  * @returns 500 when error occurs whilst querying the database
@@ -24,12 +24,6 @@ export const handleGetExamples: RequestHandler<
   unknown,
   Query & ExamplesQueryParams
 > = (req, res) => {
-  if (!isUserInSession(req.session)) {
-    return res
-      .status(StatusCodes.UNAUTHORIZED)
-      .json({ message: 'User is unauthorized.' })
-  }
-
   return ExamplesFactory.getExampleForms(req.query)
     .map((result) => res.status(StatusCodes.OK).json(result))
     .mapErr((error) => {
@@ -49,6 +43,7 @@ export const handleGetExamples: RequestHandler<
 
 /**
  * Handler for GET /examples/:formId endpoint.
+ * @security session
  * @returns 200 with the retrieved form example
  * @returns 401 when user does not exist in session
  * @returns 404 when the form with given formId does not exist in the database
@@ -57,12 +52,6 @@ export const handleGetExamples: RequestHandler<
 export const handleGetExampleByFormId: RequestHandler<{
   formId: string
 }> = (req, res) => {
-  if (!isUserInSession(req.session)) {
-    return res
-      .status(StatusCodes.UNAUTHORIZED)
-      .json({ message: 'User is unauthorized.' })
-  }
-
   const { formId } = req.params
 
   return ExamplesFactory.getSingleExampleForm(formId)
diff --git a/src/app/modules/examples/examples.routes.ts b/src/app/modules/examples/examples.routes.ts
index 488594db67..611a1547b9 100644
--- a/src/app/modules/examples/examples.routes.ts
+++ b/src/app/modules/examples/examples.routes.ts
@@ -1,12 +1,18 @@
 import { celebrate, Joi, Segments } from 'celebrate'
 import { Router } from 'express'
 
+import { withUserAuthentication } from '../auth/auth.middlewares'
+
 import * as ExamplesController from './examples.controller'
 
 export const ExamplesRouter = Router()
 
+// All routes in this router are protected.
+ExamplesRouter.use(withUserAuthentication)
+
 /**
  * Lists publicly available forms that can be used as templates.
+ * @security session
  * @route GET /examples
  * @param pageNo.query.required the page number of results returned
  * @param agency.query the _id of agency to filter examples by
diff --git a/src/app/routes/admin-forms.server.routes.js b/src/app/routes/admin-forms.server.routes.js
index 2475d3bc1c..14f1853ee6 100644
--- a/src/app/routes/admin-forms.server.routes.js
+++ b/src/app/routes/admin-forms.server.routes.js
@@ -15,6 +15,7 @@ let encryptSubmissions = require('../../app/controllers/encrypt-submissions.serv
 let PERMISSIONS = require('../utils/permission-levels').default
 const spcpFactory = require('../factories/spcp-myinfo.factory')
 const webhookVerifiedContentFactory = require('../factories/webhook-verified-content.factory')
+const { withUserAuthentication } = require('../modules/auth/auth.middlewares')
 
 const emailValOpts = {
   minDomainSegments: 2, // Number of segments required for the domain
@@ -28,7 +29,7 @@ const emailValOpts = {
  * @param {enum} requiredPermission
  */
 let authActiveForm = (requiredPermission) => [
-  auth.authenticateUser,
+  withUserAuthentication,
   forms.formById,
   adminForms.isFormActive,
   auth.verifyPermission(requiredPermission),
@@ -38,7 +39,7 @@ let authActiveForm = (requiredPermission) => [
  * Authenticates logged in user, before retrieving non-archived form.
  */
 let authAdminActiveAnyForm = [
-  auth.authenticateUser,
+  withUserAuthentication,
   forms.formById,
   adminForms.isFormActive,
 ]
@@ -85,8 +86,8 @@ module.exports = function (app) {
    */
   app
     .route('/adminform')
-    .get(auth.authenticateUser, adminForms.list)
-    .post(auth.authenticateUser, adminForms.create)
+    .get(withUserAuthentication, adminForms.list)
+    .post(withUserAuthentication, adminForms.create)
 
   /**
    * @typedef AdminForm
diff --git a/src/types/express.d.ts b/src/types/vendor/express.d.ts
similarity index 100%
rename from src/types/express.d.ts
rename to src/types/vendor/express.d.ts
diff --git a/tests/unit/backend/controllers/authentication.server.controller.spec.js b/tests/unit/backend/controllers/authentication.server.controller.spec.js
index 350c1b922e..dc0b9ffdfd 100644
--- a/tests/unit/backend/controllers/authentication.server.controller.spec.js
+++ b/tests/unit/backend/controllers/authentication.server.controller.spec.js
@@ -60,24 +60,6 @@ describe('Authentication Controller', () => {
     testForm = collections.form
   })
 
-  describe('authenticateUser', () => {
-    it('should pass on to the next middleware if authenticated', () => {
-      let next = jasmine.createSpy()
-      Controller.authenticateUser(req, res, next)
-      expect(next).toHaveBeenCalled()
-    })
-
-    it('should return 401 if not authenticated', (done) => {
-      req.session = null
-      res.status.and.callFake(() => {
-        expect(res.status).toHaveBeenCalledWith(StatusCodes.UNAUTHORIZED)
-        done()
-        return res
-      })
-      Controller.authenticateUser(req, res, () => {})
-    })
-  })
-
   describe('hasFormAdminAuthorization', () => {
     it('should authorize if session user is admin', () => {
       let next = jasmine.createSpy()

From b5f29bea33c5ec46af35b71b02c4613e1cd241ef Mon Sep 17 00:00:00 2001
From: tshuli <63710093+tshuli@users.noreply.github.com>
Date: Mon, 9 Nov 2020 11:00:01 +0800
Subject: [PATCH 14/26] fix: overflow when printing responses (#585)

* fix: overflow when printing responses

* refactor: shift print style to core.css
---
 src/public/modules/core/css/core.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/public/modules/core/css/core.css b/src/public/modules/core/css/core.css
index 612671eacb..feb60b77b9 100755
--- a/src/public/modules/core/css/core.css
+++ b/src/public/modules/core/css/core.css
@@ -717,3 +717,9 @@ i.glyphicon-question-sign {
   font-size: 60px;
   color: #3263cb;
 }
+
+@media print {
+  * {
+    overflow: visible !important;
+  }
+}

From fe75228d1e3f2193d6df38fd3920cf16d1df51dc Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Mon, 9 Nov 2020 11:06:00 +0800
Subject: [PATCH 15/26] feat: move public spcp login form messaging (#589)

* feat: move spcp gated form message to start page

* feat: move MyInfo error to outside of form title

* style: update styling of locked form message
---
 .../forms/base/componentViews/start-page.html | 20 ++++++++++++++++
 .../components/start-page.client.component.js |  1 +
 src/public/modules/forms/base/css/form.css    | 14 +++++++----
 .../submit-form.directive.view.html           | 24 +------------------
 4 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/src/public/modules/forms/base/componentViews/start-page.html b/src/public/modules/forms/base/componentViews/start-page.html
index 9f9c191f97..24faa382dc 100644
--- a/src/public/modules/forms/base/componentViews/start-page.html
+++ b/src/public/modules/forms/base/componentViews/start-page.html
@@ -95,6 +95,16 @@ <h1>{{ vm.formTitle }}</h1>
               <i class="bx bx-log-out"></i>
             </span>
           </button>
+          <div ng-if="!vm.userName && !vm.isTemplate">
+            <div ng-if="vm.authType==='SP'" class="form-locked-msg padded-view">
+              Login with SingPass to access this form. Your SingPass ID will be
+              included with your form submission.
+            </div>
+            <div ng-if="vm.authType==='CP'" class="form-locked-msg padded-view">
+              Login with CorpPass to access this form. Your Entity ID and
+              CorpPass ID will be included with your form submission.
+            </div>
+          </div>
           <label
             class="remember-me-btn"
             ng-if="(vm.authType==='SP') && !vm.userName && !vm.isTemplate && !vm.hasMyinfoFields"
@@ -119,6 +129,16 @@ <h1>{{ vm.formTitle }}</h1>
         </div>
       </div>
     </div>
+    <div
+      ng-if="vm.myInfoError"
+      class="form-locked-msg myinfo-error padded-view"
+    >
+      <i class="bx bx-exclamation"></i>
+      <span>
+        An error occurred while retrieving your MyInfo details. Kindly refresh
+        your browser, or try again later.
+      </span>
+    </div>
     <div ng-if="vm.paragraph" id="start-page-req" class="padded-view row">
       <div class="standard-padding">
         <div id="start-page-req-content">
diff --git a/src/public/modules/forms/base/components/start-page.client.component.js b/src/public/modules/forms/base/components/start-page.client.component.js
index df8213b3c4..e34893a636 100644
--- a/src/public/modules/forms/base/components/start-page.client.component.js
+++ b/src/public/modules/forms/base/components/start-page.client.component.js
@@ -12,6 +12,7 @@ angular.module('forms').component('startPageComponent', {
     logoState: '@',
     formTitle: '@',
     authType: '<',
+    myInfoError: '<',
     isAdminPreview: '<',
     hasMyinfoFields: '<',
     isTemplate: '<',
diff --git a/src/public/modules/forms/base/css/form.css b/src/public/modules/forms/base/css/form.css
index f740a766b8..b4059c1c80 100644
--- a/src/public/modules/forms/base/css/form.css
+++ b/src/public/modules/forms/base/css/form.css
@@ -87,15 +87,21 @@
 
 .public-form .form-locked-msg {
   text-align: center;
-  color: #484848;
+  color: white;
   font-size: 18px;
-  margin-bottom: 70px;
-  margin-left: 15px;
-  margin-right: 15px;
+  margin-bottom: 0;
+  margin-top: 40px;
+
+  /* Offset container padding */
+  margin-left: -35px;
+  margin-right: -35px;
 }
 
 .public-form.submit-form .form-locked-msg.myinfo-error {
   color: #a94442;
+  margin-left: 0;
+  margin-right: 0;
+  margin-bottom: 40px;
 }
 
 .public-form.submit-form .form-locked-msg.myinfo-error i {
diff --git a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
index d51fe881d1..ad3859a9db 100644
--- a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
+++ b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
@@ -7,6 +7,7 @@
       paragraph="{{ form.startPage.paragraph }}"
       logo-state="{{ form.startPage.logo.state }}"
       form-title="{{ form.title }}"
+      my-info-error="myInfoError"
       auth-type="form.authType"
       is-admin-preview="false"
       has-myinfo-fields="hasMyInfoFields"
@@ -63,29 +64,6 @@
       </div>
     </div>
   </div>
-  <div ng-if="!uiState.formSubmitted">
-    <div
-      ng-if="form.authType==='SP' && !SpcpSession.userName && !form.isTemplate"
-      class="form-locked-msg padded-view"
-    >
-      Login with SingPass to access this form. Your SingPass ID will be included
-      with your form submission.
-    </div>
-    <div
-      ng-if="form.authType==='CP' && !SpcpSession.userName && !form.isTemplate"
-      class="form-locked-msg padded-view"
-    >
-      Login with CorpPass to access this form. Your Entity ID and CorpPass ID
-      will be included with your form submission.
-    </div>
-    <div ng-if="myInfoError" class="form-locked-msg myinfo-error padded-view">
-      <i class="bx bx-exclamation"></i
-      ><span
-        >An error occurred while retrieving your MyInfo details. Kindly refresh
-        your browser, or try again later.</span
-      >
-    </div>
-  </div>
 </div>
 <!-- End Page View -->
 <div ng-if="uiState.formSubmitted">

From 0c3d778618f450d017a9189c2445d5326c783d53 Mon Sep 17 00:00:00 2001
From: Jiayee Lim <jiayeerawr@gmail.com>
Date: Mon, 9 Nov 2020 11:34:05 +0800
Subject: [PATCH 16/26] feat: display a Toast when reCAPTCHA fails while users
 are filling up a form (#582)

---
 .../base/directiveViews/submit-form.directive.view.html     | 1 +
 src/public/modules/forms/services/captcha.client.service.js | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
index ad3859a9db..8e908b3e4c 100644
--- a/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
+++ b/src/public/modules/forms/base/directiveViews/submit-form.directive.view.html
@@ -112,6 +112,7 @@
           size="invisible"
           on-create="captchaService.setWidget(widgetId)"
           on-success="captchaService.onSuccess(response, submitForm)"
+          on-error="captchaService.onError()"
           on-expire="captchaService.expire()"
           data-badge="inline"
         ></div>
diff --git a/src/public/modules/forms/services/captcha.client.service.js b/src/public/modules/forms/services/captcha.client.service.js
index e7e50e2ea2..a6f29df6c6 100644
--- a/src/public/modules/forms/services/captcha.client.service.js
+++ b/src/public/modules/forms/services/captcha.client.service.js
@@ -64,6 +64,12 @@ function captchaService($window, vcRecaptchaService, Toastr) {
     cb()
   }
 
+  this.onError = function () {
+    Toastr.error(
+      'Error: Cannot connect to reCAPTCHA. Please check your internet connectivity or try submitting on another device.',
+    )
+  }
+
   /**
    * Expire captcha if captcha enabled
    */

From aaacd5b07e34b1e47112e92b3879c414c1fd6812 Mon Sep 17 00:00:00 2001
From: Antariksh Mahajan <antarikshmahajan@gmail.com>
Date: Mon, 9 Nov 2020 15:03:35 +0800
Subject: [PATCH 17/26] refactor: validate MyInfo env vars using Convict (#559)

* refactor: validate myinfo env vars using convict

* refactor: combine imports

* test: add required env vars to tests

* ref: change myInfoClientMode default to prod
---
 src/app/factories/spcp-myinfo.factory.js         | 13 +++++++------
 src/config/feature-manager/spcp-myinfo.config.ts | 16 ++++++++++++++++
 src/config/feature-manager/types.ts              | 10 +++++++++-
 tests/.test-full-env                             |  4 +++-
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/app/factories/spcp-myinfo.factory.js b/src/app/factories/spcp-myinfo.factory.js
index fb8befa061..a4efa61f8a 100644
--- a/src/app/factories/spcp-myinfo.factory.js
+++ b/src/app/factories/spcp-myinfo.factory.js
@@ -6,7 +6,10 @@ const featureManager = require('../../config/feature-manager').default
 const config = require('../../config/config')
 const fs = require('fs')
 const SPCPAuthClient = require('@opengovsg/spcp-auth-client')
-const { MyInfoGovClient } = require('@opengovsg/myinfo-gov-client')
+const {
+  MyInfoGovClient,
+  Mode: MyInfoClientMode,
+} = require('@opengovsg/myinfo-gov-client')
 const MyInfoService = require('../services/myinfo.service')
 const logger = require('../../config/logger').createLoggerWithLabel(module)
 
@@ -59,12 +62,10 @@ const spcpFactory = ({ isEnabled, props }) => {
     // as part of convict (Issue #255)
     if (config.nodeEnv === 'production') {
       let myInfoPrefix =
-        process.env.MYINFO_CLIENT_CONFIG === 'stg' ? 'STG2-' : 'PROD2-'
-      myInfoConfig.privateKey = fs.readFileSync(
-        process.env.MYINFO_FORMSG_KEY_PATH,
-      )
+        props.myInfoClientMode === MyInfoClientMode.Staging ? 'STG2-' : 'PROD2-'
+      myInfoConfig.privateKey = fs.readFileSync(props.myInfoKeyPath)
       myInfoConfig.appId = myInfoPrefix + myInfoConfig.singpassEserviceId
-      myInfoConfig.mode = process.env.MYINFO_CLIENT_CONFIG
+      myInfoConfig.mode = props.myInfoClientMode
       myInfoGovClient = new MyInfoGovClient(myInfoConfig)
     } else {
       logger.warn({
diff --git a/src/config/feature-manager/spcp-myinfo.config.ts b/src/config/feature-manager/spcp-myinfo.config.ts
index bbf05bfb40..878da9a6bb 100644
--- a/src/config/feature-manager/spcp-myinfo.config.ts
+++ b/src/config/feature-manager/spcp-myinfo.config.ts
@@ -1,3 +1,5 @@
+import { Mode as MyInfoClientMode } from '@opengovsg/myinfo-gov-client'
+
 import { FeatureNames, RegisterableFeature } from './types'
 
 const HOUR_IN_MILLIS = 1000 * 60 * 60
@@ -151,6 +153,20 @@ const spcpMyInfoFeature: RegisterableFeature<FeatureNames.SpcpMyInfo> = {
       default: null,
       env: 'CP_IDP_CERT_PATH',
     },
+    myInfoClientMode: {
+      doc:
+        'Configures MyInfoGovClient. Set this to either `stg` or `prod` to fetch MyInfo data from the corresponding endpoints.',
+      format: Object.values(MyInfoClientMode),
+      default: MyInfoClientMode.Production,
+      env: 'MYINFO_CLIENT_CONFIG',
+    },
+    myInfoKeyPath: {
+      doc:
+        'Filepath to MyInfo private key, which is used to decrypt returned responses.',
+      format: String,
+      default: null,
+      env: 'MYINFO_FORMSG_KEY_PATH',
+    },
   },
 }
 
diff --git a/src/config/feature-manager/types.ts b/src/config/feature-manager/types.ts
index 6311f76413..4d1cf25623 100644
--- a/src/config/feature-manager/types.ts
+++ b/src/config/feature-manager/types.ts
@@ -1,3 +1,4 @@
+import { Mode as MyInfoClientMode } from '@opengovsg/myinfo-gov-client'
 import { Schema } from 'convict'
 
 export enum FeatureNames {
@@ -36,7 +37,7 @@ export interface ISms {
   twilioMsgSrvcSid: string
 }
 
-export interface ISpcpMyInfo {
+export interface ISpcpConfig {
   isSPMaintenance: string
   isCPMaintenance: string
   spCookieMaxAge: number
@@ -61,6 +62,13 @@ export interface ISpcpMyInfo {
   cpIdpCertPath: string
 }
 
+export interface IMyInfoConfig {
+  myInfoClientMode: MyInfoClientMode
+  myInfoKeyPath: string
+}
+
+export type ISpcpMyInfo = ISpcpConfig & IMyInfoConfig
+
 export interface IVerifiedFields {
   verificationSecretKey: string
 }
diff --git a/tests/.test-full-env b/tests/.test-full-env
index a948d307ec..a5ef50e7e2 100644
--- a/tests/.test-full-env
+++ b/tests/.test-full-env
@@ -10,6 +10,9 @@ SINGPASS_IDP_ID=https://saml-internet.singpass.gov.sg/FIM/sps/SingpassIDPFed/sam
 MOCKPASS_PORT=5156
 SINGPASS_ESRVC_ID=Test-eServiceId-Sp
 
+MYINFO_CLIENT_CONFIG=stg
+MYINFO_FORMSG_KEY_PATH=./node_modules/@opengovsg/mockpass/static/certs/key.pem
+
 CP_FORMSG_KEY_PATH=./node_modules/@opengovsg/mockpass/static/certs/key.pem
 CP_FORMSG_CERT_PATH=./node_modules/@opengovsg/mockpass/static/certs/server.crt
 CP_IDP_CERT_PATH=./node_modules/@opengovsg/mockpass/static/certs/spcp.crt
@@ -26,7 +29,6 @@ SHOW_LOGIN_PAGE=true
 IS_SP_MAINTENANCE=Date/Time-SP
 IS_CP_MAINTENANCE=Date/Time-CP
 
-MYINFO_CLIENT_CONFIG=stg
 MOCKPASS_NRIC=S6005038D
 MOCKPASS_UEN=123456789A
 

From 2dbf0bdf14b048d5ee4109a4c72c9a400bd35cfd Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Mon, 9 Nov 2020 16:00:16 +0800
Subject: [PATCH 18/26] refactor: migrate GET /adminform endpoint to Typescript
 (#575)

* refactor(FormModel): move types into form.types

* feat(FormModel): add getDashboardForms static function

* refactor: use form model static function to list dashboard forms

* feat(AdminFormSvc): add getDashboardForms service function

* feat(AdminFormCtl): add handler for GET /adminforms endpoint

* refactor(AdminFormRoutes): use new handleListDashboardForms impl

* test(AdminFormSvc): add tests for getDashboardForms

* feat(FormModel): return lean object when retrieving dashboard forms

* test(FormModel): add tests for getDashboardForms static fn

* test: remove test cases for removed list form fn

* test(AdminFormCtl): add tests

* feat(AdminFormsRoutes): update list flow to use middleware

* test(FormModel): add stronger test case to test return array
---
 .../admin-forms.server.controller.js          |  34 ----
 src/app/models/form.server.model.ts           |  42 +++--
 .../__tests__/admin-form.controller.spec.ts   |  68 ++++++++
 .../__tests__/admin-form.service.spec.ts      |  92 +++++++++++
 .../form/admin-form/admin-form.controller.ts  |  38 +++++
 .../form/admin-form/admin-form.service.ts     |  47 ++++++
 .../form/admin-form/admin-form.utils.ts       |  45 +++++
 src/app/modules/user/user.service.ts          |   4 +-
 src/app/routes/admin-forms.server.routes.js   |   3 +-
 src/types/form.ts                             |  23 ++-
 .../admin-forms.server.controller.spec.js     |  59 -------
 .../backend/models/form.server.model.spec.ts  | 156 ++++++++++++++----
 12 files changed, 472 insertions(+), 139 deletions(-)
 create mode 100644 src/app/modules/form/admin-form/__tests__/admin-form.controller.spec.ts
 create mode 100644 src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts
 create mode 100644 src/app/modules/form/admin-form/admin-form.controller.ts
 create mode 100644 src/app/modules/form/admin-form/admin-form.service.ts
 create mode 100644 src/app/modules/form/admin-form/admin-form.utils.ts

diff --git a/src/app/controllers/admin-forms.server.controller.js b/src/app/controllers/admin-forms.server.controller.js
index 46c907e1e6..a2bb30941e 100644
--- a/src/app/controllers/admin-forms.server.controller.js
+++ b/src/app/controllers/admin-forms.server.controller.js
@@ -422,40 +422,6 @@ function makeModule(connection) {
         }
       })
     },
-    /**
-     * List of all of user-created (and collaborated-on) forms
-     * @param  {Object} req - Express request object
-     * @param  {Object} res - Express response object
-     */
-    list: function (req, res) {
-      let Form = getFormModel(connection)
-      // List forms when either the user is an admin or collaborator
-      let searchFields = [
-        { 'permissionList.email': req.session.user.email },
-        { admin: req.session.user },
-      ]
-      let returnedFields = '_id title admin lastModified status form_fields'
-
-      Form.find({ $or: searchFields }, returnedFields)
-        .sort('-lastModified')
-        .populate({
-          path: 'admin',
-          populate: {
-            path: 'agency',
-          },
-        })
-        .exec(function (err, forms) {
-          if (err) {
-            return respondOnMongoError(req, res, err)
-          } else if (!forms) {
-            return res.status(StatusCodes.NOT_FOUND).json({
-              message: 'No user-created and collaborated-on forms found',
-            })
-          }
-          let activeForms = forms.filter((form) => form.status !== 'ARCHIVED')
-          return res.json(activeForms)
-        })
-    },
     /**
      * Return form feedback matching query
      * @param  {Object} req - Express request object
diff --git a/src/app/models/form.server.model.ts b/src/app/models/form.server.model.ts
index 9537330ecf..035349a756 100644
--- a/src/app/models/form.server.model.ts
+++ b/src/app/models/form.server.model.ts
@@ -1,6 +1,6 @@
 import BSON from 'bson-ext'
 import { compact, filter, pick, uniq } from 'lodash'
-import { Model, Mongoose, Schema, SchemaOptions } from 'mongoose'
+import { Mongoose, Schema, SchemaOptions } from 'mongoose'
 import validator from 'validator'
 
 import { FORM_DUPLICATE_KEYS } from '../../shared/constants'
@@ -8,11 +8,15 @@ import {
   AuthType,
   BasicField,
   Colors,
+  DashboardFormView,
   FormLogoState,
   FormOtpData,
+  IEmailFormModel,
   IEmailFormSchema,
+  IEncryptedFormModel,
   IEncryptedFormSchema,
   IForm,
+  IFormModel,
   IFormSchema,
   IPopulatedForm,
   LogicType,
@@ -86,14 +90,6 @@ const formSchemaOptions: SchemaOptions = {
   },
 }
 
-export interface IFormModel extends Model<IFormSchema> {
-  getOtpData(formId: string): Promise<FormOtpData | null>
-  getFullFormById(formId: string): Promise<IPopulatedForm | null>
-  deactivateById(formId: string): Promise<IFormSchema | null>
-}
-
-type IEncryptedFormModel = Model<IEncryptedFormSchema> & IFormModel
-
 const EncryptedFormSchema = new Schema<IEncryptedFormSchema>({
   publicKey: {
     type: String,
@@ -101,8 +97,6 @@ const EncryptedFormSchema = new Schema<IEncryptedFormSchema>({
   },
 })
 
-type IEmailFormModel = Model<IEmailFormSchema> & IFormModel
-
 // Converts 'test@hotmail.com, test@gmail.com' to ['test@hotmail.com', 'test@gmail.com']
 function transformEmailString(v: string): string[] {
   return v
@@ -501,6 +495,32 @@ const compileFormModel = (db: Mongoose): IFormModel => {
     return form.save()
   }
 
+  FormSchema.statics.getDashboardForms = async function (
+    this: IFormModel,
+    userId: IUserSchema['_id'],
+    userEmail: IUserSchema['email'],
+  ): Promise<DashboardFormView[]> {
+    return (
+      this.find()
+        // List forms when either the user is an admin or collaborator.
+        .or([{ 'permissionList.email': userEmail }, { admin: userId }])
+        // Filter out archived forms.
+        .where('status')
+        .ne(Status.Archived)
+        // Project selected fields.
+        .select('_id title admin lastModified status form_fields')
+        .sort('-lastModified')
+        .populate({
+          path: 'admin',
+          populate: {
+            path: 'agency',
+          },
+        })
+        .lean()
+        .exec()
+    )
+  }
+
   // Hooks
   FormSchema.pre<IFormSchema>('validate', async function (next) {
     // Reject save if form document is too large
diff --git a/src/app/modules/form/admin-form/__tests__/admin-form.controller.spec.ts b/src/app/modules/form/admin-form/__tests__/admin-form.controller.spec.ts
new file mode 100644
index 0000000000..ee57de02eb
--- /dev/null
+++ b/src/app/modules/form/admin-form/__tests__/admin-form.controller.spec.ts
@@ -0,0 +1,68 @@
+import { errAsync, okAsync } from 'neverthrow'
+import { mocked } from 'ts-jest/utils'
+
+import { DatabaseError } from 'src/app/modules/core/core.errors'
+import { MissingUserError } from 'src/app/modules/user/user.errors'
+
+import expressHandler from 'tests/unit/backend/helpers/jest-express'
+
+import { handleListDashboardForms } from '../admin-form.controller'
+import * as AdminFormService from '../admin-form.service'
+
+jest.mock('../admin-form.service')
+const MockAdminFormService = mocked(AdminFormService)
+
+describe('admin-form.controller', () => {
+  describe('handleListDashboardForms', () => {
+    const MOCK_REQ = expressHandler.mockRequest({
+      session: {
+        user: {
+          _id: 'exists',
+        },
+      },
+    })
+    it('should return 200 with list of forms', async () => {
+      // Arrange
+      const mockRes = expressHandler.mockResponse()
+      // Mock return array.
+      MockAdminFormService.getDashboardForms.mockReturnValueOnce(okAsync([]))
+
+      // Act
+      await handleListDashboardForms(MOCK_REQ, mockRes, jest.fn())
+
+      // Assert
+      expect(mockRes.json).toHaveBeenCalledWith([])
+    })
+
+    it('should return 422 on MissingUserError', async () => {
+      // Arrange
+      const mockRes = expressHandler.mockResponse()
+      MockAdminFormService.getDashboardForms.mockReturnValueOnce(
+        errAsync(new MissingUserError()),
+      )
+
+      // Act
+      await handleListDashboardForms(MOCK_REQ, mockRes, jest.fn())
+
+      // Assert
+      expect(mockRes.status).toBeCalledWith(422)
+      expect(mockRes.json).toBeCalledWith({ message: 'User not found' })
+    })
+
+    it('should return 500 when database error occurs', async () => {
+      // Arrange
+      const mockRes = expressHandler.mockResponse()
+      const mockErrorString = 'something went wrong'
+      MockAdminFormService.getDashboardForms.mockReturnValueOnce(
+        errAsync(new DatabaseError(mockErrorString)),
+      )
+
+      // Act
+      await handleListDashboardForms(MOCK_REQ, mockRes, jest.fn())
+
+      // Assert
+      expect(mockRes.status).toBeCalledWith(500)
+      expect(mockRes.json).toBeCalledWith({ message: mockErrorString })
+    })
+  })
+})
diff --git a/src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts b/src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts
new file mode 100644
index 0000000000..6907f68c77
--- /dev/null
+++ b/src/app/modules/form/admin-form/__tests__/admin-form.service.spec.ts
@@ -0,0 +1,92 @@
+import mongoose from 'mongoose'
+import { errAsync, okAsync } from 'neverthrow'
+import { mocked } from 'ts-jest/utils'
+
+import getFormModel from 'src/app/models/form.server.model'
+import { DatabaseError } from 'src/app/modules/core/core.errors'
+import { MissingUserError } from 'src/app/modules/user/user.errors'
+import * as UserService from 'src/app/modules/user/user.service'
+import { DashboardFormView, IPopulatedUser, IUserSchema } from 'src/types'
+
+import { getDashboardForms } from '../admin-form.service'
+
+const FormModel = getFormModel(mongoose)
+
+jest.mock('src/app/modules/user/user.service')
+const MockUserService = mocked(UserService)
+
+describe('admin-form.service', () => {
+  describe('getDashboardForms', () => {
+    it('should return list of forms user is authorized to view', async () => {
+      // Arrange
+      const mockUserId = 'mockUserId'
+      const mockUser: Partial<IUserSchema> = {
+        email: 'MOCK_EMAIL@example.com',
+        _id: mockUserId,
+      }
+      const mockDashboardForms: DashboardFormView[] = [
+        {
+          admin: {} as IPopulatedUser,
+          title: 'test form 1',
+        },
+        {
+          admin: {} as IPopulatedUser,
+          title: 'test form 2',
+        },
+      ]
+      // Mock user admin success.
+      MockUserService.findAdminById.mockReturnValueOnce(
+        okAsync(mockUser as IUserSchema),
+      )
+      const getSpy = jest
+        .spyOn(FormModel, 'getDashboardForms')
+        .mockResolvedValueOnce(mockDashboardForms)
+
+      // Act
+      const actualResult = await getDashboardForms(mockUserId)
+
+      // Assert
+      expect(getSpy).toHaveBeenCalledWith(mockUserId, mockUser.email)
+      expect(actualResult.isOk()).toEqual(true)
+      expect(actualResult._unsafeUnwrap()).toEqual(mockDashboardForms)
+    })
+
+    it('should return MissingUserError when user with userId does not exist', async () => {
+      // Arrange
+      const expectedError = new MissingUserError('not found')
+      MockUserService.findAdminById.mockReturnValueOnce(errAsync(expectedError))
+
+      // Act
+      const actualResult = await getDashboardForms('any')
+
+      // Assert
+      expect(actualResult.isErr()).toEqual(true)
+      // Error should passthrough.
+      expect(actualResult._unsafeUnwrapErr()).toEqual(expectedError)
+    })
+
+    it('should return DatabaseError when error occurs whilst querying the database', async () => {
+      // Arrange
+      const mockUserId = 'mockUserId'
+      const mockUser: Partial<IUserSchema> = {
+        email: 'MOCK_EMAIL@example.com',
+        _id: mockUserId,
+      }
+      // Mock user admin success.
+      MockUserService.findAdminById.mockReturnValueOnce(
+        okAsync(mockUser as IUserSchema),
+      )
+      const getSpy = jest
+        .spyOn(FormModel, 'getDashboardForms')
+        .mockRejectedValueOnce(new Error('some error'))
+
+      // Act
+      const actualResult = await getDashboardForms(mockUserId)
+
+      // Assert
+      expect(getSpy).toHaveBeenCalledWith(mockUserId, mockUser.email)
+      expect(actualResult.isErr()).toEqual(true)
+      expect(actualResult._unsafeUnwrapErr()).toEqual(new DatabaseError())
+    })
+  })
+})
diff --git a/src/app/modules/form/admin-form/admin-form.controller.ts b/src/app/modules/form/admin-form/admin-form.controller.ts
new file mode 100644
index 0000000000..873f81a811
--- /dev/null
+++ b/src/app/modules/form/admin-form/admin-form.controller.ts
@@ -0,0 +1,38 @@
+import { RequestHandler } from 'express'
+
+import { createLoggerWithLabel } from '../../../../config/logger'
+
+import { getDashboardForms } from './admin-form.service'
+import { mapRouteError } from './admin-form.utils'
+
+const logger = createLoggerWithLabel(module)
+
+/**
+ * Handler for GET /adminform endpoint.
+ * @security session
+ *
+ * @returns 200 with list of forms user can access when list is retrieved successfully
+ * @returns 422 when user of given id cannnot be found in the database
+ * @returns 500 when database errors occur
+ */
+export const handleListDashboardForms: RequestHandler = async (req, res) => {
+  const authedUserId = (req.session as Express.AuthedSession).user._id
+  const dashboardResult = await getDashboardForms(authedUserId)
+
+  if (dashboardResult.isErr()) {
+    const { error } = dashboardResult
+    logger.error({
+      message: 'Error listing dashboard forms',
+      meta: {
+        action: 'handleListDashboardForms',
+        userId: authedUserId,
+      },
+      error,
+    })
+    const { errorMessage, statusCode } = mapRouteError(error)
+    return res.status(statusCode).json({ message: errorMessage })
+  }
+
+  // Success.
+  return res.json(dashboardResult.value)
+}
diff --git a/src/app/modules/form/admin-form/admin-form.service.ts b/src/app/modules/form/admin-form/admin-form.service.ts
new file mode 100644
index 0000000000..a1b01eac6a
--- /dev/null
+++ b/src/app/modules/form/admin-form/admin-form.service.ts
@@ -0,0 +1,47 @@
+import mongoose from 'mongoose'
+import { ResultAsync } from 'neverthrow'
+
+import { createLoggerWithLabel } from '../../../../config/logger'
+import { DashboardFormView } from '../../../../types'
+import getFormModel from '../../../models/form.server.model'
+import { DatabaseError } from '../../core/core.errors'
+import { MissingUserError } from '../../user/user.errors'
+import { findAdminById } from '../../user/user.service'
+
+const logger = createLoggerWithLabel(module)
+const FormModel = getFormModel(mongoose)
+
+/**
+ * Retrieves a list of forms that the user of the given userId can access in
+ * their dashboard.
+ * @param userId the id of the user to retrieve accessible forms for.
+ * @returns ok(DashboardFormViewList)
+ * @returns err(MissingUserError) if user with userId does not exist in the database
+ * @returns err(DatabaseError) if error occurs whilst querying the database
+ */
+export const getDashboardForms = (
+  userId: string,
+): ResultAsync<DashboardFormView[], MissingUserError | DatabaseError> => {
+  // Step 1: Verify user exists.
+  return (
+    findAdminById(userId)
+      // Step 2: Retrieve lists users are authorized to see.
+      .andThen((admin) => {
+        return ResultAsync.fromPromise(
+          FormModel.getDashboardForms(userId, admin.email),
+          (error) => {
+            logger.error({
+              message: 'Database error when retrieving admin dashboard forms',
+              meta: {
+                action: 'getDashboardForms',
+                userId,
+              },
+              error,
+            })
+
+            return new DatabaseError()
+          },
+        )
+      })
+  )
+}
diff --git a/src/app/modules/form/admin-form/admin-form.utils.ts b/src/app/modules/form/admin-form/admin-form.utils.ts
new file mode 100644
index 0000000000..25d5ef6739
--- /dev/null
+++ b/src/app/modules/form/admin-form/admin-form.utils.ts
@@ -0,0 +1,45 @@
+import { StatusCodes } from 'http-status-codes'
+
+import { createLoggerWithLabel } from '../../../../config/logger'
+import { ApplicationError, DatabaseError } from '../../core/core.errors'
+import { ErrorResponseData } from '../../core/core.types'
+import { MissingUserError } from '../../user/user.errors'
+
+const logger = createLoggerWithLabel(module)
+
+/**
+ * Handler to map ApplicationErrors to their correct status code and error
+ * messages.
+ * @param error The error to retrieve the status codes and error messages
+ * @param coreErrorMessage Any error message to return instead of the default core error message, if any
+ */
+export const mapRouteError = (
+  error: ApplicationError,
+  coreErrorMessage?: string,
+): ErrorResponseData => {
+  switch (error.constructor) {
+    case MissingUserError:
+      return {
+        statusCode: StatusCodes.UNPROCESSABLE_ENTITY,
+        errorMessage: error.message,
+      }
+    case DatabaseError:
+      return {
+        statusCode: StatusCodes.INTERNAL_SERVER_ERROR,
+        errorMessage: coreErrorMessage ?? error.message,
+      }
+    default:
+      logger.error({
+        message: 'Unknown route error observed',
+        meta: {
+          action: 'mapRouteError',
+        },
+        error,
+      })
+
+      return {
+        statusCode: StatusCodes.INTERNAL_SERVER_ERROR,
+        errorMessage: 'Something went wrong. Please try again.',
+      }
+  }
+}
diff --git a/src/app/modules/user/user.service.ts b/src/app/modules/user/user.service.ts
index 4c7c428821..1f27e65766 100644
--- a/src/app/modules/user/user.service.ts
+++ b/src/app/modules/user/user.service.ts
@@ -239,7 +239,6 @@ export const retrieveUser = (
   )
 }
 
-// Private helper functions
 /**
  * Retrieves the user with the given id.
  * @param userId the id of the user to retrieve
@@ -247,7 +246,7 @@ export const retrieveUser = (
  * @returns err(DatabaseError) if database errors occurs whilst retrieving user
  * @returns err(MissingUserError) if user does not exist in the database
  */
-const findAdminById = (
+export const findAdminById = (
   userId: string,
 ): ResultAsync<IUserSchema, MissingUserError | DatabaseError> => {
   return ResultAsync.fromPromise(UserModel.findById(userId).exec(), (error) => {
@@ -268,6 +267,7 @@ const findAdminById = (
   })
 }
 
+// Private helper functions
 /**
  * Hashes both the given otp and contact data.
  * @param otp the otp to hash
diff --git a/src/app/routes/admin-forms.server.routes.js b/src/app/routes/admin-forms.server.routes.js
index 14f1853ee6..9e0155bce1 100644
--- a/src/app/routes/admin-forms.server.routes.js
+++ b/src/app/routes/admin-forms.server.routes.js
@@ -15,6 +15,7 @@ let encryptSubmissions = require('../../app/controllers/encrypt-submissions.serv
 let PERMISSIONS = require('../utils/permission-levels').default
 const spcpFactory = require('../factories/spcp-myinfo.factory')
 const webhookVerifiedContentFactory = require('../factories/webhook-verified-content.factory')
+const AdminFormController = require('../modules/form/admin-form/admin-form.controller')
 const { withUserAuthentication } = require('../modules/auth/auth.middlewares')
 
 const emailValOpts = {
@@ -86,7 +87,7 @@ module.exports = function (app) {
    */
   app
     .route('/adminform')
-    .get(withUserAuthentication, adminForms.list)
+    .get(withUserAuthentication, AdminFormController.handleListDashboardForms)
     .post(withUserAuthentication, adminForms.create)
 
   /**
diff --git a/src/types/form.ts b/src/types/form.ts
index f69e09b2b8..dd10ec360d 100644
--- a/src/types/form.ts
+++ b/src/types/form.ts
@@ -1,4 +1,4 @@
-import { Document } from 'mongoose'
+import { Document, Model } from 'mongoose'
 
 import { IFieldSchema, MyInfoAttribute } from './field'
 import { ILogicSchema } from './form_logic'
@@ -126,3 +126,24 @@ export interface IEmailForm extends IForm {
 }
 
 export type IEmailFormSchema = IEmailForm & IFormSchema
+
+export interface IFormModel extends Model<IFormSchema> {
+  getOtpData(formId: string): Promise<FormOtpData | null>
+  getFullFormById(formId: string): Promise<IPopulatedForm | null>
+  deactivateById(formId: string): Promise<IFormSchema | null>
+  getDashboardForms(
+    userId: IUserSchema['_id'],
+    userEmail: IUserSchema['email'],
+  ): Promise<DashboardFormView[]>
+}
+
+export type IEncryptedFormModel = Model<IEncryptedFormSchema> & IFormModel
+export type IEmailFormModel = Model<IEmailFormSchema> & IFormModel
+// Typing for the shape of the form document subset that is returned to the
+// frontend when admin lists their available forms in their dashboard.
+export type DashboardFormView = Pick<
+  IFormSchema,
+  'title' | 'admin' | 'lastModified' | 'status' | 'form_fields'
+> & {
+  admin: IPopulatedUser
+}
diff --git a/tests/unit/backend/controllers/admin-forms.server.controller.spec.js b/tests/unit/backend/controllers/admin-forms.server.controller.spec.js
index edc5e4032b..f28ca9165f 100644
--- a/tests/unit/backend/controllers/admin-forms.server.controller.spec.js
+++ b/tests/unit/backend/controllers/admin-forms.server.controller.spec.js
@@ -292,65 +292,6 @@ describe('Admin-Forms Controller', () => {
     })
   })
 
-  describe('list', () => {
-    it('should fetch forms with corresponding admin or collaborators and sorted by last modified', async (done) => {
-      const currentAdmin = testUser
-      // Insert additional user into User collection.
-      const collabAdmin = await User.create({
-        email: 'test1@test.gov.sg',
-        _id: mongoose.Types.ObjectId('000000000002'),
-        agency: testAgency._id,
-      })
-      // Is admin
-      let form1 = new Form({
-        title: 'Test Form1',
-        emails: currentAdmin.email,
-        admin: currentAdmin._id,
-      }).save()
-      // Is collab
-      let form2 = new Form({
-        title: 'Test Form2',
-        emails: collabAdmin.email,
-        admin: collabAdmin._id,
-        permissionList: [roles.collaborator(currentAdmin.email)],
-      }).save()
-      // Should not be fetched since archived
-      let form3 = new Form({
-        title: 'Test Form3',
-        emails: currentAdmin.email,
-        admin: currentAdmin._id,
-        status: 'ARCHIVED',
-      }).save()
-      // This form should not be fetched (not collab or admin)
-      let form4 = new Form({
-        title: 'Test Form3',
-        emails: currentAdmin.email,
-        admin: collabAdmin._id,
-        permissionList: [roles.collaborator('nofetch@test.gov.sg')],
-      }).save()
-
-      Promise.all([form1, form2, form3, form4])
-        .then(() => {
-          res.json.and.callFake((args) => {
-            let times = args.map((f) => f.lastModified)
-            // Should be sorted by last modified in descending order
-            expect(times).toEqual(
-              times.sort((a, b) => {
-                return b - a
-              }),
-            )
-            // 3 forms to be fetched
-            expect(args.length).toEqual(3)
-            done()
-          })
-          Controller.list(req, res)
-        })
-        .catch((err) => {
-          done(err)
-        })
-    })
-  })
-
   describe('getFeedback', () => {
     it('should retrieve correct response based on saved FormFeedbacks', (done) => {
       // Define feedback to be added to MongoMemoryServer db
diff --git a/tests/unit/backend/models/form.server.model.spec.ts b/tests/unit/backend/models/form.server.model.spec.ts
index fa3beacb7b..da52420f3f 100644
--- a/tests/unit/backend/models/form.server.model.spec.ts
+++ b/tests/unit/backend/models/form.server.model.spec.ts
@@ -1,5 +1,5 @@
-import { ObjectID } from 'bson'
-import { merge, omit } from 'lodash'
+import { ObjectId } from 'bson-ext'
+import { merge, omit, orderBy, pick } from 'lodash'
 import mongoose from 'mongoose'
 
 import getFormModel, {
@@ -7,9 +7,8 @@ import getFormModel, {
   getEncryptedFormModel,
 } from 'src/app/models/form.server.model'
 import {
-  IAgencySchema,
   IEncryptedForm,
-  IUserSchema,
+  IPopulatedUser,
   Permission,
   ResponseMode,
   Status,
@@ -21,7 +20,7 @@ const Form = getFormModel(mongoose)
 const EncryptedForm = getEncryptedFormModel(mongoose)
 const EmailForm = getEmailFormModel(mongoose)
 
-const MOCK_ADMIN_OBJ_ID = new ObjectID()
+const MOCK_ADMIN_OBJ_ID = new ObjectId()
 const MOCK_ADMIN_DOMAIN = 'example.com'
 const MOCK_ADMIN_EMAIL = `test@${MOCK_ADMIN_DOMAIN}`
 
@@ -63,7 +62,7 @@ const FORM_DEFAULTS = {
 }
 
 describe('Form Model', () => {
-  let preloadedAdmin: IUserSchema, preloadedAgency: IAgencySchema
+  let populatedAdmin: IPopulatedUser
 
   beforeAll(async () => await dbHandler.connect())
   beforeEach(async () => {
@@ -72,8 +71,7 @@ describe('Form Model', () => {
       mailDomain: MOCK_ADMIN_DOMAIN,
     })
 
-    preloadedAdmin = preloaded.user
-    preloadedAgency = preloaded.agency
+    populatedAdmin = merge(preloaded.user, { agency: preloaded.agency })
   })
   afterEach(async () => await dbHandler.clearDatabase())
   afterAll(async () => await dbHandler.closeDatabase())
@@ -169,7 +167,7 @@ describe('Form Model', () => {
         // Remove indeterministic id from actual permission list
         const actualPermissionList = saved
           .toObject()
-          .permissionList!.map((permission: Permission[]) =>
+          .permissionList.map((permission: Permission[]) =>
             omit(permission, '_id'),
           )
         expect(actualPermissionList).toEqual(permissionList)
@@ -177,7 +175,7 @@ describe('Form Model', () => {
 
       it('should reject when admin id is invalid', async () => {
         // Arrange
-        const invalidAdminId = new ObjectID()
+        const invalidAdminId = new ObjectId()
         const paramsWithInvalidAdmin = merge({}, MOCK_FORM_PARAMS, {
           admin: invalidAdminId,
         })
@@ -355,7 +353,7 @@ describe('Form Model', () => {
         expect(actualSavedObject).toEqual(expectedObject)
 
         // Remove indeterministic id from actual permission list
-        const actualPermissionList = (saved.toObject() as IEncryptedForm).permissionList!.map(
+        const actualPermissionList = (saved.toObject() as IEncryptedForm).permissionList?.map(
           (permission) => omit(permission, '_id'),
         )
         expect(actualPermissionList).toEqual(permissionList)
@@ -379,7 +377,7 @@ describe('Form Model', () => {
 
       it('should reject when admin id is invalid', async () => {
         // Arrange
-        const invalidAdminId = new ObjectID()
+        const invalidAdminId = new ObjectId()
         const paramsWithInvalidAdmin = merge({}, MOCK_ENCRYPTED_FORM_PARAMS, {
           admin: invalidAdminId,
         })
@@ -596,7 +594,7 @@ describe('Form Model', () => {
         // Remove indeterministic id from actual permission list
         const actualPermissionList = saved
           .toObject()
-          .permissionList!.map((permission: Permission[]) =>
+          .permissionList.map((permission: Permission[]) =>
             omit(permission, '_id'),
           )
         expect(actualPermissionList).toEqual(permissionList)
@@ -633,7 +631,7 @@ describe('Form Model', () => {
 
       it('should reject when admin id is invalid', async () => {
         // Arrange
-        const invalidAdminId = new ObjectID()
+        const invalidAdminId = new ObjectId()
         const paramsWithInvalidAdmin = merge({}, MOCK_EMAIL_FORM_PARAMS, {
           admin: invalidAdminId,
         })
@@ -715,7 +713,7 @@ describe('Form Model', () => {
     describe('deactivateById', () => {
       it('should correctly deactivate form for valid ID', async () => {
         const formParams = merge({}, MOCK_EMAIL_FORM_PARAMS, {
-          admin: preloadedAdmin,
+          admin: populatedAdmin,
           status: Status.Public,
         })
         const form = await Form.create(formParams)
@@ -726,7 +724,7 @@ describe('Form Model', () => {
 
       it('should not deactivate archived form', async () => {
         const formParams = merge({}, MOCK_EMAIL_FORM_PARAMS, {
-          admin: preloadedAdmin,
+          admin: populatedAdmin,
           status: Status.Archived,
         })
         const form = await Form.create(formParams)
@@ -736,7 +734,7 @@ describe('Form Model', () => {
       })
 
       it('should return null for invalid form ID', async () => {
-        const returned = await Form.deactivateById(String(new ObjectID()))
+        const returned = await Form.deactivateById(String(new ObjectId()))
         expect(returned).toBeNull()
       })
     })
@@ -744,7 +742,7 @@ describe('Form Model', () => {
     describe('getFullFormById', () => {
       it('should return null when the formId is invalid', async () => {
         // Arrange
-        const invalidFormId = new ObjectID()
+        const invalidFormId = new ObjectId()
 
         // Act
         const form = await Form.getFullFormById(String(invalidFormId))
@@ -756,13 +754,13 @@ describe('Form Model', () => {
       it('should return the populated email form when formId is valid', async () => {
         // Arrange
         const emailFormParams = merge({}, MOCK_EMAIL_FORM_PARAMS, {
-          admin: preloadedAdmin,
+          admin: populatedAdmin,
         })
         // Create a form
         const form = (await Form.create(emailFormParams)).toObject()
 
         // Act
-        const actualForm = (await Form.getFullFormById(form._id))!.toObject()
+        const actualForm = (await Form.getFullFormById(form._id))?.toObject()
 
         // Assert
         // Form should be returned
@@ -771,9 +769,9 @@ describe('Form Model', () => {
         expect(omit(actualForm, 'admin')).toEqual(omit(form, 'admin'))
         // Verify populated admin shape
         expect(actualForm.admin).not.toBeNull()
-        expect(actualForm.admin.email).toEqual(preloadedAdmin.email)
+        expect(actualForm.admin.email).toEqual(populatedAdmin.email)
         // Remove indeterministic keys
-        const expectedAgency = omit(preloadedAgency.toObject(), [
+        const expectedAgency = omit(populatedAdmin.agency.toObject(), [
           '_id',
           'created',
           'lastModified',
@@ -787,13 +785,13 @@ describe('Form Model', () => {
       it('should return the populated encrypt form when formId is valid', async () => {
         // Arrange
         const encryptFormParams = merge({}, MOCK_ENCRYPTED_FORM_PARAMS, {
-          admin: preloadedAdmin,
+          admin: populatedAdmin,
         })
         // Create a form
         const form = (await Form.create(encryptFormParams)).toObject()
 
         // Act
-        const actualForm = (await Form.getFullFormById(form._id))!.toObject()
+        const actualForm = (await Form.getFullFormById(form._id))?.toObject()
 
         // Assert
         // Form should be returned
@@ -802,9 +800,9 @@ describe('Form Model', () => {
         expect(omit(actualForm, 'admin')).toEqual(omit(form, 'admin'))
         // Verify populated admin shape
         expect(actualForm.admin).not.toBeNull()
-        expect(actualForm.admin.email).toEqual(preloadedAdmin.email)
+        expect(actualForm.admin.email).toEqual(populatedAdmin.email)
         // Remove indeterministic keys
-        const expectedAgency = omit(preloadedAgency.toObject(), [
+        const expectedAgency = omit(populatedAdmin.agency.toObject(), [
           '_id',
           'created',
           'lastModified',
@@ -819,7 +817,7 @@ describe('Form Model', () => {
     describe('getOtpData', () => {
       it('should return null when formId does not exist', async () => {
         // Arrange
-        const invalidFormId = new ObjectID()
+        const invalidFormId = new ObjectId()
 
         // Act
         const form = await Form.getOtpData(String(invalidFormId))
@@ -846,8 +844,8 @@ describe('Form Model', () => {
         const expectedOtpData = {
           form: form._id,
           formAdmin: {
-            email: preloadedAdmin.email,
-            userId: preloadedAdmin._id,
+            email: populatedAdmin.email,
+            userId: populatedAdmin._id,
           },
           msgSrvcName: emailFormParams.msgSrvcName,
         }
@@ -872,8 +870,8 @@ describe('Form Model', () => {
         const expectedOtpData = {
           form: form._id,
           formAdmin: {
-            email: preloadedAdmin.email,
-            userId: preloadedAdmin._id,
+            email: populatedAdmin.email,
+            userId: populatedAdmin._id,
           },
           msgSrvcName: encryptFormParams.msgSrvcName,
         }
@@ -881,4 +879,100 @@ describe('Form Model', () => {
       })
     })
   })
+
+  describe('getDashboardForms', () => {
+    it('should return empty array when user has no forms to view', async () => {
+      // Arrange
+      const randomUserId = new ObjectId()
+      const invalidEmail = 'not-valid@example.com'
+
+      // Act
+      const actual = await Form.getDashboardForms(randomUserId, invalidEmail)
+
+      // Assert
+      expect(actual).toEqual([])
+    })
+
+    it('should return array of forms user is permitted to view', async () => {
+      // Arrange
+      // Add additional user.
+      const differentUserId = new ObjectId()
+      const diffPreload = await dbHandler.insertFormCollectionReqs({
+        userId: differentUserId,
+        mailName: 'something-else',
+        mailDomain: MOCK_ADMIN_DOMAIN,
+      })
+      const diffPopulatedAdmin = merge(diffPreload.user, {
+        agency: diffPreload.agency,
+      })
+      // Populate multiple forms with different permissions.
+      // Is admin.
+      const userOwnedForm = await Form.create(MOCK_EMAIL_FORM_PARAMS)
+      // Has write permissions.
+      const userWritePermissionForm = await Form.create({
+        ...MOCK_ENCRYPTED_FORM_PARAMS,
+        admin: diffPopulatedAdmin._id,
+        permissionList: [{ email: populatedAdmin.email, write: true }],
+      })
+      // Has read permissions.
+      const userReadPermissionForm = await Form.create({
+        ...MOCK_ENCRYPTED_FORM_PARAMS,
+        admin: diffPopulatedAdmin._id,
+        // Only read permissions, no write permission.
+        permissionList: [{ email: populatedAdmin.email, write: false }],
+      })
+      // Should not be fetched since form is archived.
+      await Form.create({
+        ...MOCK_ENCRYPTED_FORM_PARAMS,
+        status: Status.Archived,
+      })
+      // Should not be fetched (not collab or admin).
+      await Form.create({
+        ...MOCK_ENCRYPTED_FORM_PARAMS,
+        admin: differentUserId,
+        // currentUser does not have permissions.
+      })
+
+      // Act
+      const actual = await Form.getDashboardForms(
+        populatedAdmin._id,
+        populatedAdmin.email,
+      )
+
+      // Assert
+      // Coerce into expected shape.
+      const keysToPick = [
+        '_id',
+        'title',
+        'lastModified',
+        'status',
+        'form_fields',
+        'responseMode',
+      ]
+      const expected = orderBy(
+        [
+          // Should return form with admin themselves.
+          merge(pick(userOwnedForm.toObject(), keysToPick), {
+            admin: populatedAdmin.toObject(),
+          }),
+          // Should return form where admin has write permission.
+          merge(pick(userWritePermissionForm.toObject(), keysToPick), {
+            admin: diffPopulatedAdmin.toObject(),
+          }),
+          // Should return form where admin has read permission.
+          merge(pick(userReadPermissionForm.toObject(), keysToPick), {
+            admin: diffPopulatedAdmin.toObject(),
+          }),
+        ],
+        'lastModified',
+        'desc',
+      )
+      // Should return list containing only three forms:
+      // (admin, read perms, write perms),
+      // even though there are 5 forms in the collection.
+      await expect(Form.countDocuments()).resolves.toEqual(5)
+      expect(actual.length).toEqual(3)
+      expect(actual).toEqual(expected)
+    })
+  })
 })

From c7667e50ec886afe6de6b457a1dfb27bb8f852f8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 17:11:22 +0800
Subject: [PATCH 19/26] chore(deps-dev): bump axios-mock-adapter from 1.18.2 to
 1.19.0 (#598)

Bumps [axios-mock-adapter](https://github.com/ctimmerm/axios-mock-adapter) from 1.18.2 to 1.19.0.
- [Release notes](https://github.com/ctimmerm/axios-mock-adapter/releases)
- [Changelog](https://github.com/ctimmerm/axios-mock-adapter/blob/master/CHANGELOG.md)
- [Commits](https://github.com/ctimmerm/axios-mock-adapter/compare/v1.18.2...v1.19.0)

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

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

diff --git a/package-lock.json b/package-lock.json
index 9f3de39d59..c71271722b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6015,12 +6015,12 @@
       }
     },
     "axios-mock-adapter": {
-      "version": "1.18.2",
-      "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.18.2.tgz",
-      "integrity": "sha512-e5aTsPy2Viov22zNpFTlid76W1Scz82pXeEwwCXdtO85LROhHAF8pHF2qDhiyMONLxKyY3lQ+S4UCsKgrlx8Hw==",
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/axios-mock-adapter/-/axios-mock-adapter-1.19.0.tgz",
+      "integrity": "sha512-D+0U4LNPr7WroiBDvWilzTMYPYTuZlbo6BI8YHZtj7wYQS8NkARlP9KBt8IWWHTQJ0q/8oZ0ClPBtKCCkx8cQg==",
       "dev": true,
       "requires": {
-        "fast-deep-equal": "^3.1.1",
+        "fast-deep-equal": "^3.1.3",
         "is-buffer": "^2.0.3"
       }
     },
diff --git a/package.json b/package.json
index bd8cc7f9dd..36388804f5 100644
--- a/package.json
+++ b/package.json
@@ -197,7 +197,7 @@
     "@typescript-eslint/eslint-plugin": "^4.0.1",
     "@typescript-eslint/parser": "^4.5.0",
     "auto-changelog": "^2.2.1",
-    "axios-mock-adapter": "^1.18.2",
+    "axios-mock-adapter": "^1.19.0",
     "babel-loader": "^8.0.5",
     "concurrently": "^5.3.0",
     "copy-webpack-plugin": "^6.0.2",

From d7d8812f3776c984b21ad124981e139a98f0f63e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:31:47 +0800
Subject: [PATCH 20/26] chore(deps-dev): bump @babel/preset-env from 7.11.5 to
 7.12.1 (#599)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.11.5 to 7.12.1.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.12.1/packages/babel-preset-env)

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

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

diff --git a/package-lock.json b/package-lock.json
index c71271722b..08f174d0c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,15 +14,10 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.11.0.tgz",
-      "integrity": "sha512-TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ==",
-      "dev": true,
-      "requires": {
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "semver": "^5.5.0"
-      }
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz",
+      "integrity": "sha512-DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg==",
+      "dev": true
     },
     "@babel/core": {
       "version": "7.12.3",
@@ -282,9 +277,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -295,29 +290,59 @@
       }
     },
     "@babel/helper-compilation-targets": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz",
-      "integrity": "sha512-a3rYhlsGV0UHNDvrtOXBg8/OpfV0OKTkxKPzIplS1zpx7CygDcWWxckxZeDd3gzPzC4kUT0A4nVFDK0wGMh4MQ==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz",
+      "integrity": "sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.10.4",
-        "browserslist": "^4.12.0",
-        "invariant": "^2.2.4",
-        "levenary": "^1.1.1",
+        "@babel/compat-data": "^7.12.5",
+        "@babel/helper-validator-option": "^7.12.1",
+        "browserslist": "^4.14.5",
         "semver": "^5.5.0"
+      },
+      "dependencies": {
+        "browserslist": {
+          "version": "4.14.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz",
+          "integrity": "sha512-zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001154",
+            "electron-to-chromium": "^1.3.585",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.65"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001157",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
+          "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.3.591",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.591.tgz",
+          "integrity": "sha512-ol/0WzjL4NS4Kqy9VD6xXQON91xIihDT36sYCew/G/bnd1v0/4D+kahp26JauQhgFUjrdva3kRSo7URcUmQ+qw==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.66",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz",
+          "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==",
+          "dev": true
+        }
       }
     },
     "@babel/helper-create-class-features-plugin": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz",
-      "integrity": "sha512-0nkdeijB7VlZoLT3r/mY3bUkw3T8WG/hNw+FATs/6+pG2039IJWjTYL0VTISqsNHMUTEnwbVnc89WIJX9Qed0A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz",
+      "integrity": "sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
-        "@babel/helper-member-expression-to-functions": "^7.10.5",
+        "@babel/helper-member-expression-to-functions": "^7.12.1",
         "@babel/helper-optimise-call-expression": "^7.10.4",
-        "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
+        "@babel/helper-replace-supers": "^7.12.1",
         "@babel/helper-split-export-declaration": "^7.10.4"
       },
       "dependencies": {
@@ -331,12 +356,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+          "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.12.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
@@ -362,12 +387,12 @@
           }
         },
         "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+          "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.1"
           }
         },
         "@babel/helper-optimise-call-expression": {
@@ -379,22 +404,16 @@
             "@babel/types": "^7.10.4"
           }
         },
-        "@babel/helper-plugin-utils": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
-          "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
-          "dev": true
-        },
         "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+          "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
           "dev": true,
           "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-member-expression-to-functions": "^7.12.1",
             "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/traverse": "^7.12.5",
+            "@babel/types": "^7.12.5"
           }
         },
         "@babel/helper-split-export-declaration": {
@@ -424,9 +443,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
         "@babel/template": {
@@ -441,26 +460,26 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+          "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
+            "@babel/generator": "^7.12.5",
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
+            "@babel/parser": "^7.12.5",
+            "@babel/types": "^7.12.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -469,25 +488,25 @@
           }
         },
         "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"
           }
         }
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz",
-      "integrity": "sha512-2/hu58IEPKeoLF45DBwx3XFqsbCXmkdAay4spVr2x0jYgRxrSNp+ePwvSsy9g6YSaNDcKIQVPXk1Ov8S2edk2g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.1.tgz",
+      "integrity": "sha512-rsZ4LGvFTZnzdNZR5HZdmJVuXK8834R5QkF3WvcnBhrlVtF0HSIUC6zbreL9MgjTywhKokn8RIYRiq99+DLAxA==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-regex": "^7.10.4",
-        "regexpu-core": "^4.7.0"
+        "regexpu-core": "^4.7.1"
       },
       "dependencies": {
         "@babel/helper-annotate-as-pure": {
@@ -506,9 +525,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -530,12 +549,12 @@
       }
     },
     "@babel/helper-explode-assignable-expression": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz",
-      "integrity": "sha512-ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz",
+      "integrity": "sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -545,9 +564,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -593,9 +612,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -615,12 +634,12 @@
       }
     },
     "@babel/helper-module-imports": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz",
-      "integrity": "sha512-nEQJHqYavI217oD9+s5MUBzk6x1IlvoS9WTPfgG43CbMEeStE0v+r+TucWdx8KFGowPGvyOkDT9+7DHedIDnVw==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz",
+      "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.5"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -630,9 +649,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -643,17 +662,19 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz",
-      "integrity": "sha512-02EVu8COMuTRO1TAzdMtpBPbe6aQ1w/8fePD2YgQmxZU4gpNWaL9gK3Jp7dxlkUlUCJOTaSeA+Hrm1BRQwqIhg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz",
+      "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
+        "@babel/helper-replace-supers": "^7.12.1",
+        "@babel/helper-simple-access": "^7.12.1",
         "@babel/helper-split-export-declaration": "^7.11.0",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "@babel/template": "^7.10.4",
-        "@babel/types": "^7.11.0",
+        "@babel/traverse": "^7.12.1",
+        "@babel/types": "^7.12.1",
         "lodash": "^4.17.19"
       },
       "dependencies": {
@@ -667,12 +688,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+          "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.12.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
@@ -698,12 +719,12 @@
           }
         },
         "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+          "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.1"
           }
         },
         "@babel/helper-optimise-call-expression": {
@@ -716,15 +737,15 @@
           }
         },
         "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+          "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
           "dev": true,
           "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-member-expression-to-functions": "^7.12.1",
             "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/traverse": "^7.12.5",
+            "@babel/types": "^7.12.5"
           }
         },
         "@babel/helper-split-export-declaration": {
@@ -754,9 +775,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
         "@babel/template": {
@@ -771,26 +792,26 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+          "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
+            "@babel/generator": "^7.12.5",
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
+            "@babel/parser": "^7.12.5",
+            "@babel/types": "^7.12.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -799,12 +820,12 @@
           }
         },
         "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"
           }
         }
       }
@@ -834,15 +855,14 @@
       }
     },
     "@babel/helper-remap-async-to-generator": {
-      "version": "7.11.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz",
-      "integrity": "sha512-tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-wrap-function": "^7.10.4",
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -855,12 +875,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+          "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.12.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
@@ -910,9 +930,9 @@
           "dev": true
         },
         "@babel/helper-wrap-function": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz",
-          "integrity": "sha512-6py45WvEF0MhiLrdxtRjKjufwLL1/ob2qDJgg5JgNdojBAZSAKnAjkyOCNug6n+OBl4VW76XjvgSFTdaMcW0Ug==",
+          "version": "7.12.3",
+          "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz",
+          "integrity": "sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==",
           "dev": true,
           "requires": {
             "@babel/helper-function-name": "^7.10.4",
@@ -933,9 +953,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
         "@babel/template": {
@@ -950,26 +970,26 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+          "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
+            "@babel/generator": "^7.12.5",
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
+            "@babel/parser": "^7.12.5",
+            "@babel/types": "^7.12.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -978,12 +998,12 @@
           }
         },
         "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"
           }
         }
       }
@@ -1001,62 +1021,24 @@
       }
     },
     "@babel/helper-simple-access": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz",
-      "integrity": "sha512-0fMy72ej/VEvF8ULmX6yb5MtHG4uH4Dbd6I/aHDb/JVg0bbivwt9Wg+h3uMvX+QSFtwr5MeItvazbrc4jtRAXw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz",
+      "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==",
       "dev": true,
       "requires": {
-        "@babel/template": "^7.10.4",
-        "@babel/types": "^7.10.4"
+        "@babel/types": "^7.12.1"
       },
       "dependencies": {
-        "@babel/code-frame": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-          "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-          "dev": true,
-          "requires": {
-            "@babel/highlight": "^7.10.4"
-          }
-        },
         "@babel/helper-validator-identifier": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
           "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
           "dev": true
         },
-        "@babel/highlight": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz",
-          "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "chalk": "^2.0.0",
-            "js-tokens": "^4.0.0"
-          }
-        },
-        "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
-          "dev": true
-        },
-        "@babel/template": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz",
-          "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==",
-          "dev": true,
-          "requires": {
-            "@babel/code-frame": "^7.10.4",
-            "@babel/parser": "^7.10.4",
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1067,12 +1049,12 @@
       }
     },
     "@babel/helper-skip-transparent-expression-wrappers": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz",
-      "integrity": "sha512-0XIdiQln4Elglgjbwo9wuJpL/K7AGCY26kmEt0+pRP0TAj4jjyNq1MjoRvikrTVqKcx4Gysxt4cXvVFXP/JO2Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz",
+      "integrity": "sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.11.0"
+        "@babel/types": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-validator-identifier": {
@@ -1082,9 +1064,9 @@
           "dev": true
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1109,6 +1091,12 @@
       "integrity": "sha512-5vW/JXLALhczRCWP0PnFDMCJAchlBvM7f4uk/jXritBnIa6E1KmqmtrS3yn1LAnxFBypQ3eneLuXjsnfQsgILw==",
       "dev": true
     },
+    "@babel/helper-validator-option": {
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz",
+      "integrity": "sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
       "version": "7.10.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.10.1.tgz",
@@ -1272,13 +1260,13 @@
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz",
-      "integrity": "sha512-cNMCVezQbrRGvXJwm9fu/1sJj9bHdGAgKodZdLqOQIpfoH3raqmRPBM17+lh7CzhiKRRBrGtZL9WcjxSoGYUSg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz",
+      "integrity": "sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4",
+        "@babel/helper-remap-async-to-generator": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0"
       },
       "dependencies": {
@@ -1291,12 +1279,12 @@
       }
     },
     "@babel/plugin-proposal-class-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz",
-      "integrity": "sha512-vhwkEROxzcHGNu2mzUC0OFFNXdZ4M23ib8aRRcJSsW8BZK9pQMD7QB7csl97NBbgGZO7ZyHUyKDnxzOaP4IrCg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz",
+      "integrity": "sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-create-class-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -1309,9 +1297,9 @@
       }
     },
     "@babel/plugin-proposal-dynamic-import": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz",
-      "integrity": "sha512-up6oID1LeidOOASNXgv/CFbgBqTuKJ0cJjz6An5tWD+NVBNlp3VNSBxv2ZdU7SYl3NxJC7agAQDApZusV6uFwQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz",
+      "integrity": "sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1327,9 +1315,9 @@
       }
     },
     "@babel/plugin-proposal-export-namespace-from": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz",
-      "integrity": "sha512-aNdf0LY6/3WXkhh0Fdb6Zk9j1NMD8ovj3F6r0+3j837Pn1S1PdNtcwJ5EG9WkVPNHPxyJDaxMaAOVq4eki0qbg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz",
+      "integrity": "sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1356,9 +1344,9 @@
       }
     },
     "@babel/plugin-proposal-json-strings": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz",
-      "integrity": "sha512-fCL7QF0Jo83uy1K0P2YXrfX11tj3lkpN7l4dMv9Y9VkowkhkQDwFHFd8IiwyK5MZjE8UpbgokkgtcReH88Abaw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz",
+      "integrity": "sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1374,9 +1362,9 @@
       }
     },
     "@babel/plugin-proposal-logical-assignment-operators": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz",
-      "integrity": "sha512-/f8p4z+Auz0Uaf+i8Ekf1iM7wUNLcViFUGiPxKeXvxTSl63B875YPiVdUDdem7hREcI0E0kSpEhS8tF5RphK7Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz",
+      "integrity": "sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1392,9 +1380,9 @@
       }
     },
     "@babel/plugin-proposal-nullish-coalescing-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz",
-      "integrity": "sha512-wq5n1M3ZUlHl9sqT2ok1T2/MTt6AXE0e1Lz4WzWBr95LsAZ5qDXe4KnFuauYyEyLiohvXFMdbsOTMyLZs91Zlw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz",
+      "integrity": "sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1410,9 +1398,9 @@
       }
     },
     "@babel/plugin-proposal-numeric-separator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz",
-      "integrity": "sha512-73/G7QoRoeNkLZFxsoCCvlg4ezE4eM+57PnOqgaPOozd5myfj7p0muD1mRVJvbUWbOzD+q3No2bWbaKy+DJ8DA==",
+      "version": "7.12.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz",
+      "integrity": "sha512-UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1428,14 +1416,14 @@
       }
     },
     "@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz",
-      "integrity": "sha512-wzch41N4yztwoRw0ak+37wxwJM2oiIiy6huGCoqkvSTA9acYWcPfn9Y4aJqmFFJ70KTJUu29f3DQ43uJ9HXzEA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz",
+      "integrity": "sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
-        "@babel/plugin-transform-parameters": "^7.10.4"
+        "@babel/plugin-transform-parameters": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
@@ -1447,9 +1435,9 @@
       }
     },
     "@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz",
-      "integrity": "sha512-LflT6nPh+GK2MnFiKDyLiqSqVHkQnVf7hdoAvyTnnKj9xB3docGRsdPuxp6qqqW19ifK3xgc9U5/FwrSaCNX5g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz",
+      "integrity": "sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -1465,13 +1453,13 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz",
-      "integrity": "sha512-v9fZIu3Y8562RRwhm1BbMRxtqZNFmFA2EG+pT2diuU8PT3H6T/KXoZ54KgYisfOFZHV6PfvAiBIZ9Rcz+/JCxA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.1.tgz",
+      "integrity": "sha512-c2uRpY6WzaVDzynVY9liyykS+kVU+WRZPMPYpkelXH8KBt1oXoI89kPbZKKG/jDT5UK92FTW2fZkZaJhdiBabw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0",
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0"
       },
       "dependencies": {
@@ -1484,12 +1472,12 @@
       }
     },
     "@babel/plugin-proposal-private-methods": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz",
-      "integrity": "sha512-wh5GJleuI8k3emgTg5KkJK6kHNsGEr0uBTDBuQUBJwckk9xs1ez79ioheEVVxMLyPscB0LfkbVHslQqIzWV6Bw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz",
+      "integrity": "sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-class-features-plugin": "^7.10.4",
+        "@babel/helper-create-class-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -1502,12 +1490,12 @@
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz",
-      "integrity": "sha512-H+3fOgPnEXFL9zGYtKQe4IDOPKYlZdF1kqFDQRRb8PK4B8af1vAGK04tF5iQAAsui+mHNBQSAtd2/ndEDe9wuA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz",
+      "integrity": "sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -1704,14 +1692,14 @@
       }
     },
     "@babel/plugin-transform-async-to-generator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz",
-      "integrity": "sha512-F6nREOan7J5UXTLsDsZG3DXmZSVofr2tGNwfdrVwkDWHfQckbQXnXSPfD7iO+c/2HGqycwyLST3DnZ16n+cBJQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz",
+      "integrity": "sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-remap-async-to-generator": "^7.10.4"
+        "@babel/helper-remap-async-to-generator": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
@@ -1723,9 +1711,9 @@
       }
     },
     "@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz",
-      "integrity": "sha512-WzXDarQXYYfjaV1szJvN3AD7rZgZzC1JtjJZ8dMHUyiK8mxPRahynp14zzNjU3VkPqPsO38CzxiWO1c9ARZ8JA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz",
+      "integrity": "sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1766,9 +1754,9 @@
       }
     },
     "@babel/plugin-transform-computed-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz",
-      "integrity": "sha512-JFwVDXcP/hM/TbyzGq3l/XWGut7p46Z3QvqFMXTfk6/09m7xZHJUN9xHfsv7vqqD4YnfI5ueYdSJtXqqBLyjBw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz",
+      "integrity": "sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1783,9 +1771,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz",
-      "integrity": "sha512-+WmfvyfsyF603iPa6825mq6Qrb7uLjTOsa3XOFzlYcYDHSS4QmpOWOL0NNBY5qMbvrcf3tq0Cw+v4lxswOBpgA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz",
+      "integrity": "sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1800,12 +1788,12 @@
       }
     },
     "@babel/plugin-transform-dotall-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz",
-      "integrity": "sha512-ZEAVvUTCMlMFAbASYSVQoxIbHm2OkG2MseW6bV2JjIygOjdVv8tuxrCTzj1+Rynh7ODb8GivUy7dzEXzEhuPaA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz",
+      "integrity": "sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -1818,9 +1806,9 @@
       }
     },
     "@babel/plugin-transform-duplicate-keys": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz",
-      "integrity": "sha512-GL0/fJnmgMclHiBTTWXNlYjYsA7rDrtsazHG6mglaGSTh0KsrW04qml+Bbz9FL0LcJIRwBWL5ZqlNHKTkU3xAA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz",
+      "integrity": "sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1835,9 +1823,9 @@
       }
     },
     "@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz",
-      "integrity": "sha512-S5HgLVgkBcRdyQAHbKj+7KyuWx8C6t5oETmUuwz1pt3WTWJhsUV0WIIXuVvfXMxl/QQyHKlSCNNtaIamG8fysw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz",
+      "integrity": "sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==",
       "dev": true,
       "requires": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.10.4",
@@ -1862,9 +1850,9 @@
       }
     },
     "@babel/plugin-transform-function-name": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz",
-      "integrity": "sha512-OcDCq2y5+E0dVD5MagT5X+yTRbcvFjDI2ZVAottGH6tzqjx/LKpgkUepu3hp/u4tZBzxxpNGwLsAvGBvQ2mJzg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz",
+      "integrity": "sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==",
       "dev": true,
       "requires": {
         "@babel/helper-function-name": "^7.10.4",
@@ -1924,9 +1912,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
         "@babel/template": {
@@ -1941,9 +1929,9 @@
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -1954,9 +1942,9 @@
       }
     },
     "@babel/plugin-transform-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz",
-      "integrity": "sha512-Xd/dFSTEVuUWnyZiMu76/InZxLTYilOSr1UlHV+p115Z/Le2Fi1KXkJUYz0b42DfndostYlPub3m8ZTQlMaiqQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz",
+      "integrity": "sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1971,9 +1959,9 @@
       }
     },
     "@babel/plugin-transform-member-expression-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz",
-      "integrity": "sha512-0bFOvPyAoTBhtcJLr9VcwZqKmSjFml1iVxvPL0ReomGU53CX53HsM4h2SzckNdkQcHox1bpAqzxBI1Y09LlBSw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz",
+      "integrity": "sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -1988,12 +1976,12 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz",
-      "integrity": "sha512-elm5uruNio7CTLFItVC/rIzKLfQ17+fX7EVz5W0TMgIHFo1zY0Ozzx+lgwhL4plzl8OzVn6Qasx5DeEFyoNiRw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz",
+      "integrity": "sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
@@ -2007,14 +1995,14 @@
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz",
-      "integrity": "sha512-Xj7Uq5o80HDLlW64rVfDBhao6OX89HKUmb+9vWYaLXBZOma4gA6tw4Ni1O5qVDoZWUV0fxMYA0aYzOawz0l+1w==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz",
+      "integrity": "sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-simple-access": "^7.10.4",
+        "@babel/helper-simple-access": "^7.12.1",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
@@ -2027,14 +2015,15 @@
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz",
-      "integrity": "sha512-f4RLO/OL14/FP1AEbcsWMzpbUz6tssRaeQg11RH1BP/XnPpRoVwgeYViMFacnkaw4k4wjRSjn3ip1Uw9TaXuMw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz",
+      "integrity": "sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.10.4",
-        "@babel/helper-module-transforms": "^7.10.5",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
+        "@babel/helper-validator-identifier": "^7.10.4",
         "babel-plugin-dynamic-import-node": "^2.3.3"
       },
       "dependencies": {
@@ -2043,16 +2032,22 @@
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
           "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
           "dev": true
+        },
+        "@babel/helper-validator-identifier": {
+          "version": "7.10.4",
+          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
+          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
+          "dev": true
         }
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz",
-      "integrity": "sha512-mohW5q3uAEt8T45YT7Qc5ws6mWgJAaL/8BfWD9Dodo1A3RKWli8wTS+WiQ/knF+tXlPirW/1/MqzzGfCExKECA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz",
+      "integrity": "sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.10.4",
+        "@babel/helper-module-transforms": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -2065,18 +2060,18 @@
       }
     },
     "@babel/plugin-transform-named-capturing-groups-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz",
-      "integrity": "sha512-V6LuOnD31kTkxQPhKiVYzYC/Jgdq53irJC/xBSmqcNcqFGV+PER4l6rU5SH2Vl7bH9mLDHcc0+l9HUOe4RNGKA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz",
+      "integrity": "sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4"
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1"
       }
     },
     "@babel/plugin-transform-new-target": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz",
-      "integrity": "sha512-YXwWUDAH/J6dlfwqlWsztI2Puz1NtUAubXhOPLQ5gjR/qmQ5U96DY4FQO8At33JN4XPBhrjB8I4eMmLROjjLjw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz",
+      "integrity": "sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2091,13 +2086,13 @@
       }
     },
     "@babel/plugin-transform-object-super": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz",
-      "integrity": "sha512-5iTw0JkdRdJvr7sY0vHqTpnruUpTea32JHmq/atIWqsnNussbRzjEDyWep8UNztt1B5IusBYg8Irb0bLbiEBCQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz",
+      "integrity": "sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-replace-supers": "^7.10.4"
+        "@babel/helper-replace-supers": "^7.12.1"
       },
       "dependencies": {
         "@babel/code-frame": {
@@ -2110,12 +2105,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+          "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.12.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
@@ -2141,12 +2136,12 @@
           }
         },
         "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+          "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.1"
           }
         },
         "@babel/helper-optimise-call-expression": {
@@ -2165,15 +2160,15 @@
           "dev": true
         },
         "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+          "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
           "dev": true,
           "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-member-expression-to-functions": "^7.12.1",
             "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/traverse": "^7.12.5",
+            "@babel/types": "^7.12.5"
           }
         },
         "@babel/helper-split-export-declaration": {
@@ -2203,9 +2198,9 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
         "@babel/template": {
@@ -2220,26 +2215,26 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+          "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
+            "@babel/generator": "^7.12.5",
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
+            "@babel/parser": "^7.12.5",
+            "@babel/types": "^7.12.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -2248,64 +2243,37 @@
           }
         },
         "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"
           }
         }
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz",
-      "integrity": "sha512-xPHwUj5RdFV8l1wuYiu5S9fqWGM2DrYc24TMvUiRrPVm+SM3XeqU9BcokQX/kEUe+p2RBwy+yoiR1w/Blq6ubw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz",
+      "integrity": "sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==",
       "dev": true,
       "requires": {
-        "@babel/helper-get-function-arity": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-get-function-arity": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz",
-          "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
           "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
           "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
         }
       }
     },
     "@babel/plugin-transform-property-literals": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz",
-      "integrity": "sha512-ofsAcKiUxQ8TY4sScgsGeR2vJIsfrzqvFb9GvJ5UdXDzl+MyYCaBj/FGzXuv7qE0aJcjWMILny1epqelnFlz8g==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz",
+      "integrity": "sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2320,18 +2288,18 @@
       }
     },
     "@babel/plugin-transform-regenerator": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz",
-      "integrity": "sha512-3thAHwtor39A7C04XucbMg17RcZ3Qppfxr22wYzZNcVIkPHfpM9J0SO8zuCV6SZa265kxBJSrfKTvDCYqBFXGw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz",
+      "integrity": "sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==",
       "dev": true,
       "requires": {
         "regenerator-transform": "^0.14.2"
       }
     },
     "@babel/plugin-transform-reserved-words": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz",
-      "integrity": "sha512-hGsw1O6Rew1fkFbDImZIEqA8GoidwTAilwCyWqLBM9f+e/u/sQMQu7uX6dyokfOayRuuVfKOW4O7HvaBWM+JlQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz",
+      "integrity": "sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2346,9 +2314,9 @@
       }
     },
     "@babel/plugin-transform-shorthand-properties": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz",
-      "integrity": "sha512-AC2K/t7o07KeTIxMoHneyX90v3zkm5cjHJEokrPEAGEy3UCp8sLKfnfOIGdZ194fyN4wfX/zZUWT9trJZ0qc+Q==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz",
+      "integrity": "sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2363,13 +2331,13 @@
       }
     },
     "@babel/plugin-transform-spread": {
-      "version": "7.11.0",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz",
-      "integrity": "sha512-UwQYGOqIdQJe4aWNyS7noqAnN2VbaczPLiEtln+zPowRNlD+79w3oi2TWfYe0eZgd+gjZCbsydN7lzWysDt+gw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz",
+      "integrity": "sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/helper-skip-transparent-expression-wrappers": "^7.11.0"
+        "@babel/helper-skip-transparent-expression-wrappers": "^7.12.1"
       },
       "dependencies": {
         "@babel/helper-plugin-utils": {
@@ -2381,9 +2349,9 @@
       }
     },
     "@babel/plugin-transform-sticky-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz",
-      "integrity": "sha512-Ddy3QZfIbEV0VYcVtFDCjeE4xwVTJWTmUtorAJkn6u/92Z/nWJNV+mILyqHKrUxXYKA2EoCilgoPePymKL4DvQ==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.1.tgz",
+      "integrity": "sha512-CiUgKQ3AGVk7kveIaPEET1jNDhZZEl1RPMWdTBE1799bdz++SwqDHStmxfCtDfBhQgCl38YRiSnrMuUMZIWSUQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4",
@@ -2399,53 +2367,26 @@
       }
     },
     "@babel/plugin-transform-template-literals": {
-      "version": "7.10.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz",
-      "integrity": "sha512-V/lnPGIb+KT12OQikDvgSuesRX14ck5FfJXt6+tXhdkJ+Vsd0lDCVtF6jcB4rNClYFzaB2jusZ+lNISDk2mMMw==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz",
+      "integrity": "sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==",
       "dev": true,
       "requires": {
-        "@babel/helper-annotate-as-pure": "^7.10.4",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
-        "@babel/helper-annotate-as-pure": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz",
-          "integrity": "sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==",
-          "dev": true,
-          "requires": {
-            "@babel/types": "^7.10.4"
-          }
-        },
         "@babel/helper-plugin-utils": {
           "version": "7.10.4",
           "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz",
           "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==",
           "dev": true
-        },
-        "@babel/helper-validator-identifier": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz",
-          "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==",
-          "dev": true
-        },
-        "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
-          "dev": true,
-          "requires": {
-            "@babel/helper-validator-identifier": "^7.10.4",
-            "lodash": "^4.17.19",
-            "to-fast-properties": "^2.0.0"
-          }
         }
       }
     },
     "@babel/plugin-transform-typeof-symbol": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz",
-      "integrity": "sha512-QqNgYwuuW0y0H+kUE/GWSR45t/ccRhe14Fs/4ZRouNNQsyd4o3PG4OtHiIrepbM2WKUBDAXKCAK/Lk4VhzTaGA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz",
+      "integrity": "sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2460,9 +2401,9 @@
       }
     },
     "@babel/plugin-transform-unicode-escapes": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz",
-      "integrity": "sha512-y5XJ9waMti2J+e7ij20e+aH+fho7Wb7W8rNuu72aKRwCHFqQdhkdU2lo3uZ9tQuboEJcUFayXdARhcxLQ3+6Fg==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz",
+      "integrity": "sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -2477,12 +2418,12 @@
       }
     },
     "@babel/plugin-transform-unicode-regex": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz",
-      "integrity": "sha512-wNfsc4s8N2qnIwpO/WP2ZiSyjfpTamT2C9V9FDH/Ljub9zw6P3SjkXcFmc0RQUt96k2fmIvtla2MMjgTwIAC+A==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz",
+      "integrity": "sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.10.4",
+        "@babel/helper-create-regexp-features-plugin": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4"
       },
       "dependencies": {
@@ -2495,30 +2436,31 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.11.5",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.11.5.tgz",
-      "integrity": "sha512-kXqmW1jVcnB2cdueV+fyBM8estd5mlNfaQi6lwLgRwCby4edpavgbFhiBNjmWA3JpB/yZGSISa7Srf+TwxDQoA==",
+      "version": "7.12.1",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.12.1.tgz",
+      "integrity": "sha512-H8kxXmtPaAGT7TyBvSSkoSTUK6RHh61So05SyEbpmr0MCZrsNYn7mGMzzeYoOUCdHzww61k8XBft2TaES+xPLg==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.11.0",
-        "@babel/helper-compilation-targets": "^7.10.4",
-        "@babel/helper-module-imports": "^7.10.4",
+        "@babel/compat-data": "^7.12.1",
+        "@babel/helper-compilation-targets": "^7.12.1",
+        "@babel/helper-module-imports": "^7.12.1",
         "@babel/helper-plugin-utils": "^7.10.4",
-        "@babel/plugin-proposal-async-generator-functions": "^7.10.4",
-        "@babel/plugin-proposal-class-properties": "^7.10.4",
-        "@babel/plugin-proposal-dynamic-import": "^7.10.4",
-        "@babel/plugin-proposal-export-namespace-from": "^7.10.4",
-        "@babel/plugin-proposal-json-strings": "^7.10.4",
-        "@babel/plugin-proposal-logical-assignment-operators": "^7.11.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.10.4",
-        "@babel/plugin-proposal-numeric-separator": "^7.10.4",
-        "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.10.4",
-        "@babel/plugin-proposal-optional-chaining": "^7.11.0",
-        "@babel/plugin-proposal-private-methods": "^7.10.4",
-        "@babel/plugin-proposal-unicode-property-regex": "^7.10.4",
+        "@babel/helper-validator-option": "^7.12.1",
+        "@babel/plugin-proposal-async-generator-functions": "^7.12.1",
+        "@babel/plugin-proposal-class-properties": "^7.12.1",
+        "@babel/plugin-proposal-dynamic-import": "^7.12.1",
+        "@babel/plugin-proposal-export-namespace-from": "^7.12.1",
+        "@babel/plugin-proposal-json-strings": "^7.12.1",
+        "@babel/plugin-proposal-logical-assignment-operators": "^7.12.1",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.12.1",
+        "@babel/plugin-proposal-numeric-separator": "^7.12.1",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.1",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.12.1",
+        "@babel/plugin-proposal-optional-chaining": "^7.12.1",
+        "@babel/plugin-proposal-private-methods": "^7.12.1",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.12.1",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
-        "@babel/plugin-syntax-class-properties": "^7.10.4",
+        "@babel/plugin-syntax-class-properties": "^7.12.1",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
         "@babel/plugin-syntax-export-namespace-from": "^7.8.3",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
@@ -2528,45 +2470,42 @@
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
-        "@babel/plugin-syntax-top-level-await": "^7.10.4",
-        "@babel/plugin-transform-arrow-functions": "^7.10.4",
-        "@babel/plugin-transform-async-to-generator": "^7.10.4",
-        "@babel/plugin-transform-block-scoped-functions": "^7.10.4",
-        "@babel/plugin-transform-block-scoping": "^7.10.4",
-        "@babel/plugin-transform-classes": "^7.10.4",
-        "@babel/plugin-transform-computed-properties": "^7.10.4",
-        "@babel/plugin-transform-destructuring": "^7.10.4",
-        "@babel/plugin-transform-dotall-regex": "^7.10.4",
-        "@babel/plugin-transform-duplicate-keys": "^7.10.4",
-        "@babel/plugin-transform-exponentiation-operator": "^7.10.4",
-        "@babel/plugin-transform-for-of": "^7.10.4",
-        "@babel/plugin-transform-function-name": "^7.10.4",
-        "@babel/plugin-transform-literals": "^7.10.4",
-        "@babel/plugin-transform-member-expression-literals": "^7.10.4",
-        "@babel/plugin-transform-modules-amd": "^7.10.4",
-        "@babel/plugin-transform-modules-commonjs": "^7.10.4",
-        "@babel/plugin-transform-modules-systemjs": "^7.10.4",
-        "@babel/plugin-transform-modules-umd": "^7.10.4",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.10.4",
-        "@babel/plugin-transform-new-target": "^7.10.4",
-        "@babel/plugin-transform-object-super": "^7.10.4",
-        "@babel/plugin-transform-parameters": "^7.10.4",
-        "@babel/plugin-transform-property-literals": "^7.10.4",
-        "@babel/plugin-transform-regenerator": "^7.10.4",
-        "@babel/plugin-transform-reserved-words": "^7.10.4",
-        "@babel/plugin-transform-shorthand-properties": "^7.10.4",
-        "@babel/plugin-transform-spread": "^7.11.0",
-        "@babel/plugin-transform-sticky-regex": "^7.10.4",
-        "@babel/plugin-transform-template-literals": "^7.10.4",
-        "@babel/plugin-transform-typeof-symbol": "^7.10.4",
-        "@babel/plugin-transform-unicode-escapes": "^7.10.4",
-        "@babel/plugin-transform-unicode-regex": "^7.10.4",
+        "@babel/plugin-syntax-top-level-await": "^7.12.1",
+        "@babel/plugin-transform-arrow-functions": "^7.12.1",
+        "@babel/plugin-transform-async-to-generator": "^7.12.1",
+        "@babel/plugin-transform-block-scoped-functions": "^7.12.1",
+        "@babel/plugin-transform-block-scoping": "^7.12.1",
+        "@babel/plugin-transform-classes": "^7.12.1",
+        "@babel/plugin-transform-computed-properties": "^7.12.1",
+        "@babel/plugin-transform-destructuring": "^7.12.1",
+        "@babel/plugin-transform-dotall-regex": "^7.12.1",
+        "@babel/plugin-transform-duplicate-keys": "^7.12.1",
+        "@babel/plugin-transform-exponentiation-operator": "^7.12.1",
+        "@babel/plugin-transform-for-of": "^7.12.1",
+        "@babel/plugin-transform-function-name": "^7.12.1",
+        "@babel/plugin-transform-literals": "^7.12.1",
+        "@babel/plugin-transform-member-expression-literals": "^7.12.1",
+        "@babel/plugin-transform-modules-amd": "^7.12.1",
+        "@babel/plugin-transform-modules-commonjs": "^7.12.1",
+        "@babel/plugin-transform-modules-systemjs": "^7.12.1",
+        "@babel/plugin-transform-modules-umd": "^7.12.1",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.12.1",
+        "@babel/plugin-transform-new-target": "^7.12.1",
+        "@babel/plugin-transform-object-super": "^7.12.1",
+        "@babel/plugin-transform-parameters": "^7.12.1",
+        "@babel/plugin-transform-property-literals": "^7.12.1",
+        "@babel/plugin-transform-regenerator": "^7.12.1",
+        "@babel/plugin-transform-reserved-words": "^7.12.1",
+        "@babel/plugin-transform-shorthand-properties": "^7.12.1",
+        "@babel/plugin-transform-spread": "^7.12.1",
+        "@babel/plugin-transform-sticky-regex": "^7.12.1",
+        "@babel/plugin-transform-template-literals": "^7.12.1",
+        "@babel/plugin-transform-typeof-symbol": "^7.12.1",
+        "@babel/plugin-transform-unicode-escapes": "^7.12.1",
+        "@babel/plugin-transform-unicode-regex": "^7.12.1",
         "@babel/preset-modules": "^0.1.3",
-        "@babel/types": "^7.11.5",
-        "browserslist": "^4.12.0",
+        "@babel/types": "^7.12.1",
         "core-js-compat": "^3.6.2",
-        "invariant": "^2.2.2",
-        "levenary": "^1.1.1",
         "semver": "^5.5.0"
       },
       "dependencies": {
@@ -2580,12 +2519,12 @@
           }
         },
         "@babel/generator": {
-          "version": "7.11.6",
-          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.11.6.tgz",
-          "integrity": "sha512-DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz",
+          "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.5",
+            "@babel/types": "^7.12.5",
             "jsesc": "^2.5.1",
             "source-map": "^0.5.0"
           }
@@ -2631,12 +2570,12 @@
           }
         },
         "@babel/helper-member-expression-to-functions": {
-          "version": "7.11.0",
-          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz",
-          "integrity": "sha512-JbFlKHFntRV5qKw3YC0CvQnDZ4XMwgzzBbld7Ly4Mj4cbFy3KywcR8NtNctRToMWJOVvLINJv525Gd6wwVEx/Q==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz",
+          "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==",
           "dev": true,
           "requires": {
-            "@babel/types": "^7.11.0"
+            "@babel/types": "^7.12.1"
           }
         },
         "@babel/helper-optimise-call-expression": {
@@ -2655,15 +2594,15 @@
           "dev": true
         },
         "@babel/helper-replace-supers": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz",
-          "integrity": "sha512-sPxZfFXocEymYTdVK1UNmFPBN+Hv5mJkLPsYWwGBxZAxaWfFu+xqp7b6qWD0yjNuNL2VKc6L5M18tOXUP7NU0A==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz",
+          "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==",
           "dev": true,
           "requires": {
-            "@babel/helper-member-expression-to-functions": "^7.10.4",
+            "@babel/helper-member-expression-to-functions": "^7.12.1",
             "@babel/helper-optimise-call-expression": "^7.10.4",
-            "@babel/traverse": "^7.10.4",
-            "@babel/types": "^7.10.4"
+            "@babel/traverse": "^7.12.5",
+            "@babel/types": "^7.12.5"
           }
         },
         "@babel/helper-split-export-declaration": {
@@ -2693,33 +2632,51 @@
           }
         },
         "@babel/parser": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.11.5.tgz",
-          "integrity": "sha512-X9rD8qqm695vgmeaQ4fvz/o3+Wk4ZzQvSHkDBgpYKxpD4qTAUm88ZKtHkVqIOsYFFbIQ6wQYhC6q7pjqVK0E0Q==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz",
+          "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==",
           "dev": true
         },
+        "@babel/plugin-syntax-class-properties": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz",
+          "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.10.4"
+          }
+        },
+        "@babel/plugin-syntax-top-level-await": {
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz",
+          "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==",
+          "dev": true,
+          "requires": {
+            "@babel/helper-plugin-utils": "^7.10.4"
+          }
+        },
         "@babel/plugin-transform-arrow-functions": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz",
-          "integrity": "sha512-9J/oD1jV0ZCBcgnoFWFq1vJd4msoKb/TCpGNFyyLt0zABdcvgK3aYikZ8HjzB14c26bc7E3Q1yugpwGy2aTPNA==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz",
+          "integrity": "sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==",
           "dev": true,
           "requires": {
             "@babel/helper-plugin-utils": "^7.10.4"
           }
         },
         "@babel/plugin-transform-block-scoping": {
-          "version": "7.11.1",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz",
-          "integrity": "sha512-00dYeDE0EVEHuuM+26+0w/SCL0BH2Qy7LwHuI4Hi4MH5gkC8/AqMN5uWFJIsoXZrAphiMm1iXzBw6L2T+eA0ew==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz",
+          "integrity": "sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==",
           "dev": true,
           "requires": {
             "@babel/helper-plugin-utils": "^7.10.4"
           }
         },
         "@babel/plugin-transform-classes": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz",
-          "integrity": "sha512-2oZ9qLjt161dn1ZE0Ms66xBncQH4In8Sqw1YWgBUZuGVJJS5c0OFZXL6dP2MRHrkU/eKhWg8CzFJhRQl50rQxA==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz",
+          "integrity": "sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==",
           "dev": true,
           "requires": {
             "@babel/helper-annotate-as-pure": "^7.10.4",
@@ -2727,15 +2684,15 @@
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-optimise-call-expression": "^7.10.4",
             "@babel/helper-plugin-utils": "^7.10.4",
-            "@babel/helper-replace-supers": "^7.10.4",
+            "@babel/helper-replace-supers": "^7.12.1",
             "@babel/helper-split-export-declaration": "^7.10.4",
             "globals": "^11.1.0"
           }
         },
         "@babel/plugin-transform-for-of": {
-          "version": "7.10.4",
-          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz",
-          "integrity": "sha512-ItdQfAzu9AlEqmusA/65TqJ79eRcgGmpPPFvBnGILXZH975G0LNjP1yjHvGgfuCxqrPPueXOPe+FsvxmxKiHHQ==",
+          "version": "7.12.1",
+          "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz",
+          "integrity": "sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==",
           "dev": true,
           "requires": {
             "@babel/helper-plugin-utils": "^7.10.4"
@@ -2753,26 +2710,26 @@
           }
         },
         "@babel/traverse": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.11.5.tgz",
-          "integrity": "sha512-EjiPXt+r7LiCZXEfRpSJd+jUMnBd4/9OUv7Nx3+0u9+eimMwJmG0Q98lw4/289JCoxSE8OolDMNZaaF/JZ69WQ==",
+          "version": "7.12.5",
+          "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz",
+          "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==",
           "dev": true,
           "requires": {
             "@babel/code-frame": "^7.10.4",
-            "@babel/generator": "^7.11.5",
+            "@babel/generator": "^7.12.5",
             "@babel/helper-function-name": "^7.10.4",
             "@babel/helper-split-export-declaration": "^7.11.0",
-            "@babel/parser": "^7.11.5",
-            "@babel/types": "^7.11.5",
+            "@babel/parser": "^7.12.5",
+            "@babel/types": "^7.12.5",
             "debug": "^4.1.0",
             "globals": "^11.1.0",
             "lodash": "^4.17.19"
           }
         },
         "@babel/types": {
-          "version": "7.11.5",
-          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.11.5.tgz",
-          "integrity": "sha512-bvM7Qz6eKnJVFIn+1LPtjlBFPVN5jNDc1XmN15vWe7Q3DPBufWWsLiIvUu7xW87uTG6QoggpIDnUgLQvPheU+Q==",
+          "version": "7.12.6",
+          "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz",
+          "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==",
           "dev": true,
           "requires": {
             "@babel/helper-validator-identifier": "^7.10.4",
@@ -2781,12 +2738,12 @@
           }
         },
         "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"
           }
         }
       }
@@ -9106,15 +9063,45 @@
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.6.5.tgz",
-      "integrity": "sha512-7ItTKOhOZbznhXAQ2g/slGg1PJV5zDO/WdkTwi7UEOJmkvsE32PWvx6mKtDjiMpjnR2CNf6BAD6sSxIlv7ptng==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz",
+      "integrity": "sha512-V8yBI3+ZLDVomoWICO6kq/CD28Y4r1M7CWeO4AGpMdMfseu8bkSubBmUPySMGKRTS+su4XQ07zUkAsiu9FCWTg==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.14.6",
         "semver": "7.0.0"
       },
       "dependencies": {
+        "browserslist": {
+          "version": "4.14.6",
+          "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz",
+          "integrity": "sha512-zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A==",
+          "dev": true,
+          "requires": {
+            "caniuse-lite": "^1.0.30001154",
+            "electron-to-chromium": "^1.3.585",
+            "escalade": "^3.1.1",
+            "node-releases": "^1.1.65"
+          }
+        },
+        "caniuse-lite": {
+          "version": "1.0.30001157",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001157.tgz",
+          "integrity": "sha512-gOerH9Wz2IRZ2ZPdMfBvyOi3cjaz4O4dgNwPGzx8EhqAs4+2IL/O+fJsbt+znSigujoZG8bVcIAUM/I/E5K3MA==",
+          "dev": true
+        },
+        "electron-to-chromium": {
+          "version": "1.3.591",
+          "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.591.tgz",
+          "integrity": "sha512-ol/0WzjL4NS4Kqy9VD6xXQON91xIihDT36sYCew/G/bnd1v0/4D+kahp26JauQhgFUjrdva3kRSo7URcUmQ+qw==",
+          "dev": true
+        },
+        "node-releases": {
+          "version": "1.1.66",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.66.tgz",
+          "integrity": "sha512-JHEQ1iWPGK+38VLB2H9ef2otU4l8s3yAMt9Xf934r6+ojCYDMHPMqvCc9TnzfeFSP1QEOeU6YZEd3+De0LTCgg==",
+          "dev": true
+        },
         "semver": {
           "version": "7.0.0",
           "resolved": "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz",
@@ -10760,6 +10747,12 @@
         "through": "~2.3.6"
       }
     },
+    "escalade": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+      "dev": true
+    },
     "escape-html": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
@@ -16814,15 +16807,6 @@
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true
     },
-    "levenary": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/levenary/-/levenary-1.1.1.tgz",
-      "integrity": "sha512-mkAdOIt79FD6irqjYSs4rdbnlT5vRonMEvBVPVb3XmevfS8kgRXwfes0dhPdEtzTWD/1eNE/Bm/G1iRt6DcnQQ==",
-      "dev": true,
-      "requires": {
-        "leven": "^3.1.0"
-      }
-    },
     "levn": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
@@ -21628,9 +21612,9 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
-      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
+      "version": "4.7.1",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz",
+      "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
diff --git a/package.json b/package.json
index 36388804f5..d1c3cc13c9 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.12.3",
-    "@babel/preset-env": "^7.11.5",
+    "@babel/preset-env": "^7.12.1",
     "@opengovsg/mockpass": "^2.5.5",
     "@shelf/jest-mongodb": "^1.2.3",
     "@types/bcrypt": "^3.0.0",

From 0ca60ad851ba485625d51a5398f8896f3eed9d81 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:32:31 +0800
Subject: [PATCH 21/26] fix(deps): bump @sentry/integrations from 5.25.0 to
 5.27.3 (#600)

Bumps [@sentry/integrations](https://github.com/getsentry/sentry-javascript) from 5.25.0 to 5.27.3.
- [Release notes](https://github.com/getsentry/sentry-javascript/releases)
- [Changelog](https://github.com/getsentry/sentry-javascript/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-javascript/compare/5.25.0...5.27.3)

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, 13 insertions(+), 13 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 08f174d0c6..99b8124f07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4106,27 +4106,27 @@
       }
     },
     "@sentry/integrations": {
-      "version": "5.25.0",
-      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.25.0.tgz",
-      "integrity": "sha512-ZN2rKQBLWXEAVO3VGOygSh7wnohNj8k45PJZRCLLZoQKz1ldg83RAun+pmmHvEdyuCExw0iivCkU+80DfUeBxA==",
+      "version": "5.27.3",
+      "resolved": "https://registry.npmjs.org/@sentry/integrations/-/integrations-5.27.3.tgz",
+      "integrity": "sha512-lmkYH3g1ZW9I8g3SXQNYIfNc9gaNoqJUxgTI9d0AQph+mSB8Y3lx50NYMAfK74XgiC3VJ9j8kWstdQCMbgfXpQ==",
       "requires": {
-        "@sentry/types": "5.25.0",
-        "@sentry/utils": "5.25.0",
+        "@sentry/types": "5.27.3",
+        "@sentry/utils": "5.27.3",
         "localforage": "1.8.1",
         "tslib": "^1.9.3"
       },
       "dependencies": {
         "@sentry/types": {
-          "version": "5.25.0",
-          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.25.0.tgz",
-          "integrity": "sha512-8M4PREbcar+15wrtEqcwfcU33SS+2wBSIOd/NrJPXJPTYxi49VypCN1mZBDyWkaK+I+AuQwI3XlRPCfsId3D1A=="
+          "version": "5.27.3",
+          "resolved": "https://registry.npmjs.org/@sentry/types/-/types-5.27.3.tgz",
+          "integrity": "sha512-PkWhMArFMxBb1g3HtMEL8Ea9PYae2MU0z9CMIWiqzerFy2ZpKG98IU3pt8ic4JkmKQdwB8hDiZpRPMHhW0WYwQ=="
         },
         "@sentry/utils": {
-          "version": "5.25.0",
-          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.25.0.tgz",
-          "integrity": "sha512-Hz5spdIkMSRH5NR1YFOp5qbsY5Ud2lKhEQWlqxcVThMG5YNUc10aYv5ijL19v0YkrC2rqPjCRm7GrVtzOc7bXQ==",
+          "version": "5.27.3",
+          "resolved": "https://registry.npmjs.org/@sentry/utils/-/utils-5.27.3.tgz",
+          "integrity": "sha512-R9WvFrRBALZvCzu/9BsuXBCfkNxz4MwdBNSXaBsJo4afQw1ljkjIc9DpHzlL9S9goIwXo81Buwmr5gGDO6aH+Q==",
           "requires": {
-            "@sentry/types": "5.25.0",
+            "@sentry/types": "5.27.3",
             "tslib": "^1.9.3"
           }
         }
diff --git a/package.json b/package.json
index d1c3cc13c9..f11b13bda7 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "@opengovsg/ng-file-upload": "^12.2.14",
     "@opengovsg/spcp-auth-client": "^1.3.6",
     "@sentry/browser": "^5.24.2",
-    "@sentry/integrations": "^5.25.0",
+    "@sentry/integrations": "^5.27.3",
     "@stablelib/base64": "^1.0.0",
     "JSONStream": "^1.3.5",
     "angular": "~1.8.0",

From 47509a0c3beaa150dc5f89a8243f25eac02d8ede Mon Sep 17 00:00:00 2001
From: tshuli <63710093+tshuli@users.noreply.github.com>
Date: Mon, 9 Nov 2020 21:23:44 +0800
Subject: [PATCH 22/26] chore: set datepicker default view to minimum date
 (#574)

* chore: set datepicker default view to minimum date

* refactor: set initDate only if minDate
---
 .../forms/base/components/field-date.client.component.js    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/public/modules/forms/base/components/field-date.client.component.js b/src/public/modules/forms/base/components/field-date.client.component.js
index 2143a1919b..17649f6008 100644
--- a/src/public/modules/forms/base/components/field-date.client.component.js
+++ b/src/public/modules/forms/base/components/field-date.client.component.js
@@ -24,6 +24,7 @@ function dateFieldComponentController() {
     yearColumns: 3,
     minDate: null,
     maxDate: null,
+    initDate: null,
   }
 
   vm.$onChanges = (changesObj) => {
@@ -55,6 +56,11 @@ function dateFieldComponentController() {
       if (get(vm.field, 'dateValidation.customMaxDate')) {
         vm.dateOptions.maxDate = new Date(vm.field.dateValidation.customMaxDate)
       }
+
+      // If minDate is set, default view upon opening datepicker to be month of minDate
+      if (vm.dateOptions.minDate) {
+        vm.dateOptions.initDate = vm.dateOptions.minDate
+      }
     }
   }
 

From f4838eb70cd0f156d569ed2eeb7faa14cfd6c73a Mon Sep 17 00:00:00 2001
From: Kar Rui Lau <karrui.lau@gmail.com>
Date: Tue, 10 Nov 2020 09:53:17 +0800
Subject: [PATCH 23/26] feat: update landing page footer (#584)

* feat: add initial footer component

* feat: replace current links with i18n translations

social links are not replaced yet

* feat: add social links to footer

* feat: replace old footer with new footer component

* style: remove border from second footer section

* style: fix styling for ie11

move full color svg to file for better dimensions, update css

* feat: update app name in landing footer from FormSG to Form
---
 .htmlhintrc                                   |   4 +-
 src/public/main.css                           |   1 +
 src/public/main.js                            |   5 +
 .../modules/core/componentViews/footer.html   | 117 ++++++++
 .../components/footer.client.component.js     |   5 +
 src/public/modules/core/css/footer.css        | 249 ++++++++++++++++++
 src/public/modules/core/css/landing.css       |  68 -----
 .../modules/core/img/ogp-logo-full-color.svg  |  24 ++
 .../core/views/landing.client.view.html       |  69 +----
 src/public/translations/en-SG/landing.json    |  12 +-
 10 files changed, 414 insertions(+), 140 deletions(-)
 create mode 100644 src/public/modules/core/componentViews/footer.html
 create mode 100644 src/public/modules/core/components/footer.client.component.js
 create mode 100644 src/public/modules/core/css/footer.css
 create mode 100644 src/public/modules/core/img/ogp-logo-full-color.svg

diff --git a/.htmlhintrc b/.htmlhintrc
index 6ff5446c7d..f4020a3fc6 100644
--- a/.htmlhintrc
+++ b/.htmlhintrc
@@ -1,6 +1,6 @@
 {
-  "tagname-lowercase": true,
-  "attr-lowercase": ["viewBox"],
+  "tagname-lowercase": ["clipPath"],
+  "attr-lowercase": ["viewBox", "maskUnits"],
   "attr-value-double-quotes": true,
   "doctype-first": false,
   "tag-pair": true,
diff --git a/src/public/main.css b/src/public/main.css
index bf28a358e8..b83df576be 100644
--- a/src/public/main.css
+++ b/src/public/main.css
@@ -17,6 +17,7 @@
 @import './modules/core/css/edit-contact-number-modal.css';
 @import './modules/core/css/admin-form-header.css';
 @import './modules/core/css/sg-govt-banner.css';
+@import './modules/core/css/footer.css';
 @import './modules/core/css/landing.css';
 @import './modules/core/css/banner.css';
 @import './modules/core/css/how-it-works.css';
diff --git a/src/public/main.js b/src/public/main.js
index e2bf4e6f68..46d8a1ff63 100644
--- a/src/public/main.js
+++ b/src/public/main.js
@@ -163,6 +163,7 @@ require('./modules/core/components/navbar.client.component.js')
 require('./modules/core/components/avatar-dropdown.client.component')
 require('./modules/core/components/banner.client.component.js')
 require('./modules/core/components/sg-govt-banner.client.component.js')
+require('./modules/core/components/footer.client.component.js')
 
 /**
  * Forms module
@@ -345,6 +346,10 @@ app.run([
       'modules/core/componentViews/sg-govt-banner.html',
       require('./modules/core/componentViews/sg-govt-banner.html'),
     )
+    $templateCache.put(
+      'modules/core/componentViews/footer.html',
+      require('./modules/core/componentViews/footer.html'),
+    )
 
     // Core views
     $templateCache.put(
diff --git a/src/public/modules/core/componentViews/footer.html b/src/public/modules/core/componentViews/footer.html
new file mode 100644
index 0000000000..44e265226f
--- /dev/null
+++ b/src/public/modules/core/componentViews/footer.html
@@ -0,0 +1,117 @@
+<footer class="landing__footer">
+  <div class="footer__section footer__section--bottom-border">
+    <div class="footer__tagline">
+      <h1 class="tagline--name" translate="FOOTER.APP_NAME"></h1>
+      <span class="tagline--caption" translate="FOOTER.APP_TEXT"></span>
+    </div>
+    <div class="footer__links">
+      <a
+        class="footer__links--link"
+        translate-attr="{ href: 'FOOTER.USER_GUIDE.HREF' }"
+        translate="FOOTER.USER_GUIDE.TEXT"
+        target="_blank"
+      ></a>
+      <a
+        class="footer__links--link"
+        ui-sref="privacy"
+        target="_blank"
+        translate="FOOTER.PRIVACY.TEXT"
+      ></a>
+      <a
+        class="footer__links--link"
+        ui-sref="terms"
+        target="_blank"
+        translate="FOOTER.TOS.TEXT"
+      ></a>
+      <a
+        class="footer__links--link footer__links--link--last"
+        translate-attr="{ href: 'FOOTER.REPORT_VULNS.HREF' }"
+        translate="FOOTER.REPORT_VULNS.TEXT"
+        target="_blank"
+      ></a>
+    </div>
+  </div>
+  <div class="footer__section">
+    <div>
+      <a
+        class="footer__logo"
+        translate-attr="{ href: 'FOOTER.COPYRIGHT.HREF' }"
+        target="_blank"
+      >
+        <span class="footer__logo--builtby"> Built by </span>
+        <img
+          class="footer__logo--logo"
+          src="/public/modules/core/img/ogp-logo-full-color.svg"
+        />
+      </a>
+    </div>
+    <div class="footer__socials">
+      <div class="footer__socials--links">
+        <a
+          class="footer__socials--link footer__socials--link--first"
+          translate-attr="{ href: 'FOOTER.SOCIALS.LINKEDIN' }"
+          target="_blank"
+        >
+          <i class="bx bxl-linkedin"></i>
+        </a>
+        <a
+          class="footer__socials--link"
+          translate-attr="{ href: 'FOOTER.SOCIALS.FACEBOOK' }"
+          target="_blank"
+        >
+          <i class="bx bxl-facebook"></i>
+        </a>
+        <a
+          class="footer__socials--link footer__socials--link--last"
+          translate-attr="{ href: 'FOOTER.SOCIALS.OGP' }"
+          target="_blank"
+        >
+          <!-- Not using image as we want to change the color on active states -->
+          <svg
+            xmlns="http://www.w3.org/2000/svg"
+            width="32"
+            height="32"
+            fill="currentColor"
+            viewBox="0 0 32 32"
+          >
+            <mask
+              id="uz33y1jqaa"
+              width="9"
+              height="24"
+              x="2"
+              y="4"
+              maskUnits="userSpaceOnUse"
+            >
+              <path fill="#EEE" d="M2.286 4h8.47v23.999h-8.47V4z" />
+            </mask>
+            <g mask="url(#uz33y1jqaa)">
+              <path
+                fill="currentColor"
+                fill-rule="evenodd"
+                d="M10.676 25.58c.077-.137.1-.298.065-.452-.035-.154-.126-.288-.255-.375-2.78-1.868-4.617-5.09-4.617-8.754 0-3.663 1.837-6.884 4.617-8.753.129-.087.22-.22.255-.375.035-.153.012-.315-.065-.452L9.489 4.311c-.041-.073-.097-.137-.163-.187-.066-.05-.142-.087-.222-.107-.08-.02-.164-.022-.245-.008-.081.014-.16.045-.228.091C4.815 6.614 2.286 11.003 2.286 16c0 4.997 2.53 9.385 6.345 11.899.069.046.147.077.228.091.081.014.165.012.245-.008.08-.02.156-.056.222-.106.066-.05.121-.115.163-.188l1.187-2.108z"
+                clip-rule="evenodd"
+              />
+            </g>
+            <path
+              fill="currentColor"
+              fill-rule="evenodd"
+              d="M22.646 4.311L21.459 6.42c-.077.136-.1.298-.065.451.035.154.126.288.255.375 2.78 1.868 4.616 5.09 4.616 8.754 0 3.663-1.837 6.885-4.617 8.753-.128.087-.219.221-.254.375s-.012.315.065.452l1.187 2.108c.041.073.097.137.163.188.066.05.142.086.222.106.08.02.164.022.245.008.081-.014.159-.045.228-.091 3.816-2.514 6.345-6.902 6.345-11.9 0-4.996-2.53-9.385-6.345-11.899-.07-.046-.147-.077-.228-.091-.081-.014-.165-.012-.245.008-.08.02-.156.056-.222.107-.066.05-.122.114-.163.187"
+              clip-rule="evenodd"
+            />
+          </svg>
+        </a>
+      </div>
+      <a
+        class="footer__copyright"
+        translate-attr="{ href: 'FOOTER.COPYRIGHT.HREF' }"
+        target="_blank"
+      >
+        <span
+          translate="FOOTER.COPYRIGHT.TEXT.LINE_1"
+          translate-value-year="{{vm.currentYear}}"
+        ></span>
+        <span translate="FOOTER.COPYRIGHT.TEXT.LINE_2"></span>
+      </a>
+    </div>
+  </div>
+</footer>
diff --git a/src/public/modules/core/components/footer.client.component.js b/src/public/modules/core/components/footer.client.component.js
new file mode 100644
index 0000000000..4a4c318fa5
--- /dev/null
+++ b/src/public/modules/core/components/footer.client.component.js
@@ -0,0 +1,5 @@
+'use strict'
+
+angular.module('core').component('footerComponent', {
+  templateUrl: 'modules/core/componentViews/footer.html',
+})
diff --git a/src/public/modules/core/css/footer.css b/src/public/modules/core/css/footer.css
new file mode 100644
index 0000000000..ea6aef8405
--- /dev/null
+++ b/src/public/modules/core/css/footer.css
@@ -0,0 +1,249 @@
+footer-component a {
+  outline: none;
+  text-decoration-line: none;
+}
+
+footer-component .landing__footer {
+  display: block;
+  color: #484848;
+}
+
+footer-component .landing__footer .footer__section {
+  -webkit-align-items: normal;
+  -webkit-box-align: normal;
+  -ms-flex-align: normal;
+  align-items: normal;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex: 1;
+  -ms-flex: 1;
+  flex: 1;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  margin-left: 32px;
+  margin-right: 32px;
+  padding-bottom: 44px;
+  padding-top: 44px;
+}
+
+footer-component .landing__footer .footer__section--bottom-border {
+  border-bottom: 2px solid;
+  border-color: #dcdcdc;
+}
+
+footer-component .footer__tagline {
+  -webkit-align-items: baseline;
+  -webkit-box-align: baseline;
+  -ms-flex-align: baseline;
+  align-items: baseline;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  padding-bottom: 32px;
+}
+
+footer-component .tagline--name {
+  margin: 0;
+  font-size: 18px;
+  line-height: 1.25;
+  font-weight: 700;
+}
+
+footer-component .tagline--caption {
+  margin-left: 0.5rem;
+  font-size: 14px;
+  font-style: italic;
+}
+
+footer-component .footer__links {
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+footer-component .footer__links--link {
+  display: block;
+  margin-bottom: 1rem;
+  margin-right: 0;
+  color: #484848;
+}
+
+footer-component a:hover,
+footer-component a:focus,
+footer-component a:active {
+  color: #2f60ce;
+  opacity: 1;
+  text-decoration-line: none;
+}
+
+footer-component .footer__links--link--last {
+  margin-bottom: 0;
+  margin-right: 0;
+}
+
+footer-component .footer__logo {
+  display: -webkit-inline-box;
+  display: -webkit-inline-flex;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+}
+
+footer-component .footer__logo--builtby {
+  color: rgba(0, 0, 0, 0.5);
+  font-size: 12px;
+  margin-bottom: 6px;
+}
+
+footer-component .footer__logo--logo {
+  height: 48px;
+  width: 183px;
+}
+
+footer-component .footer__socials {
+  -webkit-align-items: flex-start;
+  -webkit-box-align: flex-start;
+  -ms-flex-align: flex-start;
+  align-items: flex-start;
+  color: rgba(0, 0, 0, 0.5);
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  height: 72px;
+  -webkit-box-pack: justify;
+  -webkit-justify-content: space-between;
+  -ms-flex-pack: justify;
+  justify-content: space-between;
+  margin-top: 24px;
+  padding-top: 4px;
+}
+
+footer-component .footer__socials--links {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+footer-component .footer__socials--link {
+  margin-left: 8px;
+  margin-right: 8px;
+  font-size: 32px;
+  color: #000;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
+footer-component .footer__socials--link--first {
+  margin-left: 0;
+  margin-right: 8px;
+}
+
+footer-component .footer__socials--link--last {
+  margin-left: 8px;
+  margin-right: 0;
+}
+
+footer-component .footer__copyright {
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-flex-direction: column;
+  -ms-flex-direction: column;
+  flex-direction: column;
+  font-size: 10px;
+  margin-top: 16px;
+  color: rgba(0, 0, 0, 0.5);
+}
+
+@media screen and (min-width: 30em) {
+  footer-component .footer__links--link {
+    margin-bottom: 1rem;
+  }
+
+  footer-component .footer__links--link--last {
+    margin-bottom: 0;
+  }
+}
+
+@media screen and (min-width: 48em) {
+  footer-component .landing__footer .footer__section {
+    margin-left: 64px;
+    margin-right: 64px;
+  }
+
+  footer-component .footer__copyright {
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+  }
+}
+
+@media screen and (min-width: 62em) {
+  footer-component .landing__footer .footer__section {
+    margin-left: 80px;
+    margin-right: 80px;
+    padding-top: 40px;
+    padding-bottom: 40px;
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+  }
+
+  footer-component .footer__tagline {
+    padding-bottom: 0;
+  }
+
+  footer-component .footer__links {
+    -webkit-flex-direction: row;
+    -ms-flex-direction: row;
+    flex-direction: row;
+    -webkit-align-items: center;
+    -webkit-box-align: center;
+    -ms-flex-align: center;
+    align-items: center;
+  }
+
+  footer-component .footer__links--link {
+    margin-bottom: 0;
+    margin-right: 2rem;
+  }
+
+  footer-component .footer__links--link--last {
+    margin-bottom: 0;
+    margin-right: 0;
+  }
+
+  footer-component .footer__socials {
+    -webkit-align-items: flex-end;
+    -webkit-box-align: flex-end;
+    -ms-flex-align: flex-end;
+    align-items: flex-end;
+    margin-top: 0;
+  }
+}
diff --git a/src/public/modules/core/css/landing.css b/src/public/modules/core/css/landing.css
index a9f79cb519..29c5fcbf81 100644
--- a/src/public/modules/core/css/landing.css
+++ b/src/public/modules/core/css/landing.css
@@ -734,71 +734,3 @@
   text-align: center;
   color: #fff;
 }
-
-/* FOOTER */
-
-@media all and (min-width: 768px) {
-  #landing #landing-footer #footer-links {
-    display: block;
-  }
-
-  #landing #landing-footer #footer-links-m {
-    display: none;
-  }
-}
-
-@media not all and (min-width: 768px) {
-  #landing #landing-footer #footer-links {
-    display: none;
-  }
-
-  #landing #landing-footer #footer-links-m {
-    display: block;
-  }
-}
-
-#landing #landing-footer {
-  background-color: #f0f0f0;
-  height: auto;
-  overflow: auto;
-  padding: 30px 5%;
-  color: #484848;
-  font-size: 16px;
-}
-
-#landing #landing-footer #footer-text span {
-  margin-left: 10px;
-  font-size: 14px;
-}
-
-#landing #landing-footer hr {
-  height: 0.5px;
-  border: solid 0.5px #dcdcdc;
-}
-
-#landing #landing-footer #footer-links a {
-  color: #484848;
-  outline: none;
-  margin-right: 35px;
-  text-decoration-line: none;
-}
-
-#landing #landing-footer #footer-links-m a {
-  color: #484848;
-  outline: none;
-  text-decoration-line: none;
-}
-
-#landing #landing-footer #footer-links a:hover,
-#landing #landing-footer #footer-links-m a:hover {
-  color: #2f60ce;
-  text-decoration-line: none;
-}
-
-#landing #landing-footer #footer-links-m div {
-  margin-top: 15px;
-}
-
-#landing #landing-footer #footer-links span {
-  float: right;
-}
diff --git a/src/public/modules/core/img/ogp-logo-full-color.svg b/src/public/modules/core/img/ogp-logo-full-color.svg
new file mode 100644
index 0000000000..d991f91d90
--- /dev/null
+++ b/src/public/modules/core/img/ogp-logo-full-color.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="183" height="48" fill="none" viewBox="0 0 183 48">
+    <g clip-path="url(#clip0)">
+        <path fill="#000" fill-rule="evenodd" d="M79.116 6.795c0-1.878-1.413-3.327-3.244-3.327-1.825 0-3.244 1.449-3.244 3.327s1.42 3.327 3.244 3.327c1.831 0 3.244-1.449 3.244-3.327zm-8.382 0c0-2.918 2.217-5.121 5.138-5.121 2.92 0 5.138 2.203 5.138 5.121 0 2.918-2.218 5.12-5.138 5.12-2.921 0-5.138-2.202-5.138-5.12zM89.72 4.988c0-.916-.57-1.553-1.66-1.553h-1.673c-.084 0-.165.034-.224.095-.06.061-.093.144-.093.23v2.438c0 .179.143.324.317.324h1.672c1.09 0 1.66-.578 1.66-1.534zm1.83.02c0 1.794-1.254 3.152-3.205 3.152h-1.958c-.084 0-.165.034-.224.095-.06.06-.093.143-.093.23v2.976c0 .043-.008.085-.024.125-.016.039-.039.075-.068.105-.03.03-.064.054-.103.07-.038.017-.08.025-.12.025h-1.256c-.042 0-.083-.008-.121-.025-.039-.016-.074-.04-.103-.07-.03-.03-.053-.066-.069-.105-.016-.04-.024-.082-.024-.125V2.128c0-.179.142-.324.317-.324h3.846c1.951 0 3.205 1.436 3.205 3.204zm4.947-1.157v1.774c0 .18.141.325.317.325h2.819c.175 0 .317.145.317.325v1.053c0 .086-.034.17-.093.23-.06.061-.14.095-.224.095h-2.82c-.041 0-.082.008-.12.025-.039.016-.074.04-.103.07-.03.03-.053.066-.069.105-.016.04-.024.082-.024.124V9.74c0 .18.141.325.317.325h3.288c.175 0 .317.145.317.324v1.073c0 .086-.034.169-.093.23-.059.06-.14.095-.224.095h-5.177c-.042 0-.083-.008-.121-.025-.039-.016-.073-.04-.103-.07-.03-.03-.052-.066-.068-.106-.016-.04-.024-.081-.024-.124V2.128c0-.179.141-.324.316-.324h5.177c.174 0 .316.145.316.324v1.073c0 .086-.033.169-.093.23-.059.06-.139.095-.223.095h-3.289c-.084 0-.165.034-.224.095-.06.061-.093.144-.093.23h.001zm16.521-1.723v9.333c0 .086-.033.169-.093.23-.059.06-.14.095-.224.095h-1.317c-.048 0-.095-.011-.138-.032-.043-.021-.081-.053-.11-.09l-4.89-6.3c-.187-.24-.564-.106-.564.202v5.895c0 .086-.034.169-.093.23-.059.06-.14.095-.224.095h-1.229c-.084 0-.165-.034-.224-.095s-.093-.144-.093-.23V2.128c0-.179.142-.324.317-.324h1.305c.096 0 .187.045.247.122l4.891 6.277c.187.24.564.104.564-.202V2.128c0-.18.141-.325.316-.325h1.242c.175 0 .317.146.317.325zM81.01 23.987c0 2.93-2.211 5.133-5.138 5.133-2.921 0-5.138-2.203-5.138-5.12 0-2.919 2.217-5.121 5.138-5.121 1.68 0 3.129.732 4.05 1.903.03.037.05.08.062.127.011.046.013.095.004.142-.009.047-.028.091-.055.13-.027.039-.062.07-.103.094l-1.086.615c-.062.037-.135.05-.206.038-.07-.012-.135-.048-.183-.103-.59-.705-1.473-1.153-2.49-1.153-1.818 0-3.237 1.423-3.237 3.373 0 1.827 1.261 3.282 3.27 3.282 1.428 0 2.49-.734 2.955-1.897.084-.21-.075-.443-.297-.443h-1.778c-.042 0-.083-.008-.122-.024-.038-.017-.073-.04-.102-.07-.03-.031-.053-.067-.069-.106-.016-.04-.024-.082-.024-.124v-.95c0-.179.142-.324.317-.324h3.904c.168 0 .305.133.317.304.007.094.01.192.01.294zM91.779 24c0-1.879-1.414-3.327-3.244-3.327-1.825 0-3.244 1.448-3.244 3.327 0 1.878 1.42 3.326 3.244 3.326 1.83 0 3.244-1.448 3.244-3.326zm-8.382 0c0-2.919 2.217-5.122 5.138-5.122 2.92 0 5.138 2.204 5.138 5.122 0 2.918-2.218 5.12-5.138 5.12-2.921 0-5.138-2.203-5.138-5.12zm21.085-4.552l-3.448 9.333c-.022.061-.063.114-.115.152-.053.037-.116.058-.18.058h-1.515c-.064 0-.127-.02-.18-.058-.052-.037-.093-.09-.115-.152l-3.442-9.333c-.018-.049-.024-.102-.018-.154.006-.052.025-.102.054-.145.029-.044.068-.079.113-.103.046-.025.096-.037.147-.037h1.315c.133 0 .253.086.298.215l2.288 6.578c.1.288.496.288.596 0l2.293-6.578c.022-.063.063-.118.116-.156.053-.039.117-.06.182-.06h1.315c.221 0 .375.228.296.44zm4.894 1.607v1.775c0 .18.141.325.316.325h2.82c.174 0 .317.145.317.324v1.054c-.001.086-.034.168-.093.23-.06.06-.14.094-.224.094h-2.82c-.084 0-.164.035-.224.096-.059.06-.092.143-.092.23v1.76c0 .18.141.325.316.325h3.289c.175 0 .316.146.316.325v1.073c0 .042-.008.085-.024.124-.016.04-.039.075-.069.105-.029.03-.064.055-.102.07-.039.017-.08.026-.121.026h-5.178c-.041 0-.082-.009-.121-.025-.038-.017-.073-.04-.102-.07-.029-.03-.053-.067-.069-.106-.015-.04-.023-.082-.023-.124v-9.332c0-.18.141-.325.315-.325h5.178c.175 0 .316.145.316.325v1.072c0 .043-.008.085-.024.125-.016.039-.039.075-.069.105-.029.03-.064.054-.102.07-.039.017-.08.025-.121.025h-3.289c-.084 0-.164.034-.224.095-.059.06-.092.143-.092.23zm9.21 1.84c0 .18.141.325.316.325h1.471c.906 0 1.394-.475 1.394-1.274 0-.786-.488-1.3-1.395-1.3h-1.47c-.084 0-.164.034-.224.095-.059.061-.092.144-.092.23v1.924zm1.396 1.877h-1.08c-.084 0-.165.035-.224.096-.06.06-.093.143-.093.23v3.568c0 .042-.008.085-.024.124-.016.04-.039.075-.068.105-.03.03-.065.055-.103.07-.038.017-.08.026-.121.026h-1.255c-.042 0-.083-.009-.121-.025-.039-.017-.074-.04-.103-.07-.029-.03-.053-.067-.069-.106-.015-.04-.024-.082-.024-.124v-9.332c0-.18.142-.325.317-.325h3.484c2.002 0 3.098 1.325 3.098 2.956 0 1.092-.546 1.968-1.388 2.438-.037.02-.07.049-.096.082-.026.034-.046.073-.057.115-.011.042-.014.085-.009.128.006.043.02.085.042.122l2.107 3.65c.028.05.043.106.043.163.001.057-.014.114-.041.163-.028.05-.068.091-.116.12-.048.029-.103.044-.159.044h-1.31c-.057 0-.112-.015-.161-.045s-.089-.072-.116-.123l-2.076-3.88c-.027-.052-.067-.094-.116-.124s-.104-.046-.161-.046zm16.538-5.438v9.332c-.001.086-.034.169-.093.23-.059.06-.14.095-.224.095h-1.317c-.048 0-.095-.011-.138-.032-.043-.022-.081-.052-.11-.09l-4.89-6.3c-.188-.24-.564-.105-.564.202v5.895c0 .086-.034.169-.093.23-.06.06-.14.095-.224.095h-1.23c-.084 0-.164-.035-.223-.096-.059-.06-.093-.143-.093-.229v-9.332c0-.18.142-.325.316-.325h1.306c.096 0 .187.045.247.122l4.891 6.276c.186.24.564.105.564-.202v-5.871c0-.18.14-.325.316-.325h1.242c.175 0 .317.145.317.325zm14.474 0v9.332c0 .086-.033.169-.092.23-.06.06-.14.095-.224.095h-1.255c-.084 0-.165-.035-.224-.095-.059-.061-.093-.144-.093-.23v-5.413c0-.356-.478-.452-.61-.123l-2.255 5.659c-.024.06-.064.11-.117.146-.052.036-.113.055-.176.056h-.556c-.063 0-.125-.02-.177-.056-.052-.036-.093-.087-.117-.147l-2.244-5.661c-.13-.33-.609-.234-.609.122v5.417c0 .086-.033.169-.093.23-.059.06-.14.095-.224.095h-1.254c-.084 0-.165-.035-.224-.095-.059-.061-.093-.144-.093-.23v-9.332c0-.18.142-.325.317-.325h2.032c.127 0 .243.079.292.2l2.377 5.906c.024.06.064.11.116.146.052.036.113.055.176.055.063 0 .124-.018.176-.054.052-.036.093-.087.117-.146l2.4-5.908c.024-.059.065-.11.117-.145.052-.035.113-.054.175-.054h2.026c.174 0 .316.145.316.325zm5.732 1.721v1.775c0 .18.142.325.317.325h2.82c.175 0 .316.145.316.324v1.054c0 .086-.033.168-.092.23-.06.06-.14.094-.224.094h-2.82c-.084 0-.164.035-.224.096-.059.06-.093.143-.093.23v1.76c0 .18.142.325.317.325h3.289c.174 0 .316.146.316.325v1.073c0 .042-.008.084-.024.124-.016.04-.039.075-.069.105-.029.03-.064.054-.102.07-.039.017-.08.026-.121.026h-5.177c-.042 0-.083-.009-.122-.025-.038-.017-.073-.04-.102-.07-.03-.03-.053-.067-.069-.106-.016-.04-.024-.082-.024-.124v-9.332c0-.18.143-.325.317-.325h5.177c.174 0 .316.145.316.325v1.072c0 .043-.008.085-.024.124-.016.04-.039.076-.069.106-.029.03-.064.054-.102.07-.039.016-.08.025-.121.025h-3.289c-.084 0-.164.034-.224.095-.059.06-.092.143-.093.23zm16.522-1.721v9.332c0 .043-.009.085-.025.125-.016.039-.039.075-.068.105-.03.03-.065.054-.103.07-.039.016-.08.025-.122.025h-1.317c-.047 0-.094-.011-.137-.032-.043-.022-.081-.053-.11-.09l-4.891-6.3c-.186-.24-.564-.105-.564.202v5.895c0 .086-.033.169-.092.23-.06.06-.14.095-.224.095h-1.231c-.083 0-.164-.035-.223-.096-.059-.06-.092-.143-.092-.229v-9.332c0-.18.141-.325.316-.325h1.305c.096 0 .187.045.247.122l4.891 6.276c.187.24.564.105.564-.202v-5.871c0-.18.141-.325.317-.325h1.241c.175 0 .317.145.317.325" clip-rule="evenodd"/>
+        <mask id="dmolt6mi3a" width="8" height="10" x="176" y="19" maskUnits="userSpaceOnUse">
+            <path fill="#fff" d="M176.173 19.01h6.892v9.982h-6.892V19.01z"/>
+        </mask>
+        <g mask="url(#dmolt6mi3a)">
+            <path fill="#000" fill-rule="evenodd" d="M182.749 20.732h-1.87c-.041 0-.083.008-.121.025-.038.016-.073.04-.103.07-.029.03-.052.066-.068.106-.016.04-.024.081-.024.124v7.61c0 .086-.034.169-.093.23-.059.06-.14.095-.224.095h-1.248c-.084 0-.165-.035-.224-.095-.059-.061-.093-.144-.093-.23v-7.61c0-.043-.008-.085-.024-.124-.016-.04-.039-.076-.068-.106-.03-.03-.065-.054-.103-.07-.038-.017-.08-.025-.121-.025h-1.876c-.083 0-.164-.034-.223-.095-.06-.06-.093-.143-.093-.229v-1.073c0-.18.141-.325.316-.325h6.26c.175 0 .317.145.317.325v1.072c0 .087-.034.17-.093.23-.06.06-.14.095-.224.095z" clip-rule="evenodd"/>
+        </g>
+        <path fill="#000" fill-rule="evenodd" d="M76.942 39.398c0-.916-.57-1.553-1.66-1.553H73.61c-.084 0-.165.034-.224.095-.06.061-.093.144-.093.23v2.438c0 .179.142.324.317.324h1.672c1.09 0 1.66-.578 1.66-1.534zm1.832.02c0 1.794-1.255 3.152-3.207 3.152H73.61c-.084 0-.165.034-.224.095-.06.06-.093.144-.093.23v2.977c0 .042-.008.084-.024.124-.016.04-.039.075-.068.105-.03.03-.065.054-.103.07-.038.017-.08.025-.121.025h-1.255c-.042 0-.083-.008-.121-.024-.039-.017-.074-.04-.103-.07-.03-.03-.053-.067-.069-.106-.016-.04-.024-.082-.024-.124v-9.334c0-.178.141-.324.317-.324h3.845c1.952 0 3.207 1.437 3.207 3.205zm4.946.683c0 .179.141.325.316.325h1.47c.906 0 1.394-.476 1.394-1.275 0-.786-.488-1.3-1.394-1.3h-1.47c-.041 0-.082.01-.12.025-.04.017-.074.04-.103.07-.03.03-.053.067-.07.106-.015.04-.023.082-.023.124v1.925zm1.396 1.877h-1.08c-.084 0-.164.035-.223.095-.06.061-.093.144-.093.23v3.568c0 .043-.008.085-.024.125-.016.04-.04.075-.069.105-.03.03-.064.054-.103.07-.038.017-.08.025-.121.025h-1.255c-.042 0-.083-.008-.121-.025-.039-.016-.074-.04-.103-.07-.03-.03-.053-.066-.069-.105-.015-.04-.023-.082-.023-.125v-9.333c0-.178.14-.323.316-.323h3.485c2.001 0 3.098 1.325 3.098 2.956 0 1.091-.547 1.968-1.389 2.437-.037.02-.07.049-.096.083-.026.033-.045.072-.057.114-.01.042-.014.086-.008.129.005.043.02.084.04.121l2.107 3.651c.029.05.044.105.044.163 0 .057-.013.113-.041.163-.028.05-.068.09-.116.12-.048.028-.103.044-.159.044h-1.31c-.056 0-.112-.016-.161-.045-.049-.03-.089-.072-.116-.123l-2.076-3.881c-.027-.051-.067-.094-.116-.123-.049-.03-.104-.046-.161-.046zm14.79-.773c0-1.878-1.414-3.327-3.244-3.327-1.825 0-3.244 1.449-3.244 3.327s1.42 3.328 3.244 3.328c1.83 0 3.243-1.45 3.243-3.328zm-8.382 0c0-2.918 2.217-5.12 5.138-5.12 2.92 0 5.138 2.202 5.138 5.12 0 2.919-2.218 5.121-5.138 5.121-2.921 0-5.138-2.203-5.138-5.12zm16.699 3.269c2.065 0 3.065-1.157 3.065-3.269s-1-3.268-3.065-3.268h-1.053c-.084 0-.165.034-.224.095-.059.06-.093.143-.093.23v5.887c0 .18.142.325.317.325h1.053zm-3.251-7.935c0-.18.142-.325.317-.325h3.015c3.232 0 4.941 1.968 4.941 4.991 0 3.022-1.709 4.991-4.941 4.991h-3.015c-.042 0-.083-.008-.122-.025-.038-.016-.073-.04-.102-.07-.03-.03-.053-.066-.069-.105-.016-.04-.024-.082-.024-.125v-9.333zm11.308 6.2v-6.2c0-.18.141-.325.316-.325h1.255c.175 0 .317.145.317.325v5.9c0 1.593.893 2.172 2.065 2.172 1.178 0 2.071-.58 2.071-2.171v-5.901c0-.18.142-.325.317-.325h1.262c.174 0 .316.145.316.325v6.2c0 2.385-1.711 3.587-3.966 3.587-2.242 0-3.954-1.202-3.954-3.587h.001zm10.895-1.534c0-2.918 2.21-5.12 5.138-5.12 1.315 0 2.568.5 3.47 1.317.034.03.061.067.08.108.019.042.029.087.03.132.001.046-.008.091-.025.133-.017.043-.043.08-.075.112l-.87.836c-.057.056-.133.087-.211.088-.079 0-.156-.029-.214-.083-.574-.536-1.357-.85-2.185-.85-1.832 0-3.244 1.443-3.244 3.327 0 1.885 1.412 3.328 3.243 3.328.829 0 1.612-.315 2.186-.85.058-.055.135-.085.214-.084.079.001.154.033.212.088l.869.837c.032.031.058.07.075.111.017.042.026.088.025.133-.001.046-.011.091-.03.132-.019.042-.046.079-.08.109-.902.816-2.155 1.317-3.471 1.317-2.927 0-5.137-2.203-5.137-5.12zm17.458-3.269h-1.869c-.042 0-.083.009-.121.025-.039.016-.073.04-.103.07-.029.03-.053.066-.068.106-.016.04-.024.082-.024.124v7.61c0 .087-.034.169-.093.23-.059.06-.14.095-.224.095h-1.249c-.041 0-.082-.009-.121-.025-.038-.016-.073-.04-.102-.07-.03-.03-.053-.066-.069-.105-.016-.04-.024-.082-.024-.124v-7.61c0-.043-.008-.086-.024-.125-.016-.04-.039-.075-.069-.105-.029-.03-.064-.055-.102-.07-.039-.017-.08-.026-.121-.026h-1.877c-.083 0-.164-.034-.223-.095-.059-.06-.093-.143-.093-.23V36.54c0-.18.142-.325.316-.325h6.26c.175 0 .317.145.317.325v1.073c0 .086-.033.169-.093.23-.059.06-.14.094-.224.094zm2.605 6.568l.685-.878c.028-.035.062-.064.1-.085.039-.02.082-.033.125-.036.044-.003.088.004.129.02.041.015.078.039.11.07.653.648 1.555 1.087 2.347 1.087.76 0 1.311-.403 1.311-1.111 0-.89-.868-1.222-1.977-1.722-1.273-.572-2.616-1.222-2.616-2.984 0-1.767 1.343-2.781 3.002-2.781 1.099 0 2.132.42 2.981 1.117.13.106.149.302.05.44l-.613.854c-.025.035-.057.064-.094.087-.036.022-.077.036-.119.042-.042.006-.085.003-.126-.009-.04-.012-.079-.032-.112-.059-.654-.556-1.392-.828-2.011-.828-.614 0-1.102.32-1.102.943 0 .812.836 1.13 1.958 1.624 1.28.579 2.667 1.294 2.667 3.152 0 1.91-1.47 2.872-3.206 2.872-1.252 0-2.536-.515-3.448-1.367-.062-.055-.1-.132-.107-.216-.008-.083.016-.166.066-.232z" clip-rule="evenodd"/>
+        <mask id="opu89vi8bb" width="17" height="48" x="0" y="0" maskUnits="userSpaceOnUse">
+            <path fill="#fff" d="M0 .314h16.722v47.374H0V.314z"/>
+        </mask>
+        <g mask="url(#opu89vi8bb)">
+            <path fill="#276EF1" fill-rule="evenodd" d="M16.562 42.912c.152-.27.199-.59.13-.893-.07-.303-.25-.568-.504-.74C10.7 37.592 7.073 31.233 7.073 24c0-7.231 3.627-13.59 9.115-17.278.253-.172.433-.437.503-.74.07-.304.023-.623-.13-.892L14.22.927c-.082-.145-.191-.27-.322-.37-.13-.1-.28-.172-.438-.21-.159-.04-.323-.045-.484-.017-.16.029-.313.09-.45.18C4.993 5.474 0 14.137 0 24c0 9.864 4.993 18.527 12.525 23.49.136.09.29.151.45.18.16.028.325.023.484-.016.158-.04.307-.11.438-.21.13-.1.24-.226.322-.37l2.343-4.162z" clip-rule="evenodd"/>
+        </g>
+        <path fill="#276EF1" fill-rule="evenodd" d="M40.191.927L37.85 5.089c-.152.27-.198.589-.129.892.07.303.25.568.503.74 5.487 3.688 9.114 10.047 9.114 17.28 0 7.231-3.627 13.59-9.114 17.28-.254.17-.433.435-.503.739-.07.303-.023.622.13.891l2.341 4.162c.082.145.192.27.323.37.13.1.28.172.438.21.158.04.323.045.483.017.16-.028.314-.09.45-.18C49.419 42.526 54.41 33.863 54.41 24c0-9.864-4.993-18.526-12.524-23.49-.137-.09-.29-.152-.45-.18-.161-.028-.326-.022-.484.017-.158.038-.307.11-.438.21-.13.1-.24.226-.322.37" clip-rule="evenodd"/>
+    </g>
+    <defs>
+        <clipPath id="clip0">
+            <path fill="#fff" d="M0 0H183V48H0z"/>
+        </clipPath>
+    </defs>
+</svg>
diff --git a/src/public/modules/core/views/landing.client.view.html b/src/public/modules/core/views/landing.client.view.html
index 7b490b41b1..01d2025e79 100644
--- a/src/public/modules/core/views/landing.client.view.html
+++ b/src/public/modules/core/views/landing.client.view.html
@@ -750,72 +750,5 @@
       </div>
     </div>
   </div>
-
-  <!--  -->
-  <!-- FOOTER -->
-  <!--  -->
-  <div id="landing-footer">
-    <div id="footer-text">
-      <b translate="FOOTER.APP_NAME"></b>
-      <span><i translate="FOOTER.APP_TEXT"></i></span>
-    </div>
-    <div id="footer-links">
-      <hr />
-      <a
-        translate-attr="{ href: 'FOOTER.USER_GUIDE.HREF' }"
-        translate="FOOTER.USER_GUIDE.TEXT"
-        target="_blank"
-      ></a>
-      <a ui-sref="privacy" target="_blank" translate="FOOTER.PRIVACY.TEXT"></a>
-      <a ui-sref="terms" target="_blank" translate="FOOTER.TOS.TEXT"></a>
-      <a
-        translate-attr="{ href: 'FOOTER.REPORT_VULNS.HREF' }"
-        translate="FOOTER.REPORT_VULNS.TEXT"
-        target="_blank"
-      ></a>
-      <span>
-        <a
-          translate-attr="{ href: 'FOOTER.COPYRIGHT.HREF' }"
-          translate="FOOTER.COPYRIGHT.TEXT"
-          translate-value-year="{{vm.currentYear}}"
-          target="_blank"
-        ></a>
-      </span>
-    </div>
-    <div id="footer-links-m">
-      <div>
-        <a
-          translate-attr="{ href: 'FOOTER.USER_GUIDE.HREF' }"
-          translate="FOOTER.USER_GUIDE.TEXT"
-          target="_blank"
-        ></a>
-      </div>
-      <div>
-        <a
-          ui-sref="privacy"
-          target="_blank"
-          translate="FOOTER.PRIVACY.TEXT"
-        ></a>
-      </div>
-      <div>
-        <a ui-sref="terms" target="_blank" translate="FOOTER.TOS.TEXT"></a>
-      </div>
-      <div>
-        <a
-          translate-attr="{ href: 'FOOTER.REPORT_VULNS.HREF' }"
-          translate="FOOTER.REPORT_VULNS.TEXT"
-          target="_blank"
-        ></a>
-      </div>
-      <hr />
-      <div>
-        <a
-          translate-attr="{ href: 'FOOTER.COPYRIGHT.HREF' }"
-          translate="FOOTER.COPYRIGHT.TEXT"
-          translate-values="{ currentYear: vm.currentYear }"
-          target="_blank"
-        ></a>
-      </div>
-    </div>
-  </div>
+  <footer-component></footer-component>
 </div>
diff --git a/src/public/translations/en-SG/landing.json b/src/public/translations/en-SG/landing.json
index e2b5d81207..81131389e0 100644
--- a/src/public/translations/en-SG/landing.json
+++ b/src/public/translations/en-SG/landing.json
@@ -110,7 +110,7 @@
     }
   },
   "FOOTER": {
-    "APP_NAME": "FormSG",
+    "APP_NAME": "Form",
     "APP_TEXT": "Build government forms in minutes",
     "USER_GUIDE": {
       "TEXT": "@:USER_GUIDE.TEXT",
@@ -127,8 +127,16 @@
       "HREF": "https://go.gov.sg/report-vulnerability"
     },
     "COPYRIGHT": {
-      "TEXT": "&copy; {{year}} Open Government Products, GovTech",
+      "TEXT": {
+        "LINE_1": "&copy;{{year}} Open Government Products,&nbsp;",
+        "LINE_2": "Government Technology Agency of Singapore"
+      },
       "HREF": "https://open.gov.sg"
+    },
+    "SOCIALS": {
+      "LINKEDIN": "https://linkedin.com/company/open-government-products",
+      "FACEBOOK": "https://www.facebook.com/opengovsg/",
+      "OGP": "https://open.gov.sg"
     }
   }
 }

From c8d346350949050c2eb87d5564d9e3ba623a5956 Mon Sep 17 00:00:00 2001
From: shuli-ogp <shuli@open.gov.sg>
Date: Tue, 10 Nov 2020 10:17:09 +0800
Subject: [PATCH 24/26] chore: bump version to 4.45.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a5d44ba09..a86503cb38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,39 @@ 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.45.0](https://github.com/opengovsg/FormSG/compare/v4.44.0...v4.45.0)
+
+- feat: update landing page footer [`#584`](https://github.com/opengovsg/FormSG/pull/584)
+- chore: set datepicker default view to minimum date [`#574`](https://github.com/opengovsg/FormSG/pull/574)
+- fix(deps): bump @sentry/integrations from 5.25.0 to 5.27.3 [`#600`](https://github.com/opengovsg/FormSG/pull/600)
+- chore(deps-dev): bump @babel/preset-env from 7.11.5 to 7.12.1 [`#599`](https://github.com/opengovsg/FormSG/pull/599)
+- chore(deps-dev): bump axios-mock-adapter from 1.18.2 to 1.19.0 [`#598`](https://github.com/opengovsg/FormSG/pull/598)
+- refactor: migrate GET /adminform endpoint to Typescript [`#575`](https://github.com/opengovsg/FormSG/pull/575)
+- refactor: validate MyInfo env vars using Convict [`#559`](https://github.com/opengovsg/FormSG/pull/559)
+- feat: display a Toast when reCAPTCHA fails while users are filling up a form [`#582`](https://github.com/opengovsg/FormSG/pull/582)
+- feat: move public spcp login form messaging [`#589`](https://github.com/opengovsg/FormSG/pull/589)
+- fix: overflow when printing responses [`#585`](https://github.com/opengovsg/FormSG/pull/585)
+- feat: use auth middleware to protect routes [`#568`](https://github.com/opengovsg/FormSG/pull/568)
+- refactor: hash uinFin in domain layer [`#596`](https://github.com/opengovsg/FormSG/pull/596)
+- chore(deps-dev): bump @types/node from 14.11.2 to 14.14.6 [`#588`](https://github.com/opengovsg/FormSG/pull/588)
+- chore(deps-dev): bump ngrok from 3.2.7 to 3.3.0 [`#578`](https://github.com/opengovsg/FormSG/pull/578)
+- fix(deps): bump angular-cookies from 1.8.1 to 1.8.2 [`#590`](https://github.com/opengovsg/FormSG/pull/590)
+- feat: upgrade myinfo-gov-client [`#593`](https://github.com/opengovsg/FormSG/pull/593)
+- chore(deps-dev): bump jasmine from 3.6.2 to 3.6.3 [`#587`](https://github.com/opengovsg/FormSG/pull/587)
+- feat: deprecate MYINFO_APP_KEY [`#557`](https://github.com/opengovsg/FormSG/pull/557)
+- feat: remove exclamation when user updates contact [`#586`](https://github.com/opengovsg/FormSG/pull/586)
+- chore(deps-dev): bump eslint-plugin-import from 2.22.0 to 2.22.1 [`#580`](https://github.com/opengovsg/FormSG/pull/580)
+- chore: merge release 4.44.0 into develop [`#581`](https://github.com/opengovsg/FormSG/pull/581)
+- chore(deps-dev): bump jest from 26.5.3 to 26.6.2 [`#570`](https://github.com/opengovsg/FormSG/pull/570)
+- refactor: convert MyInfo hash update to static domain method [`#562`](https://github.com/opengovsg/FormSG/pull/562)
+- chore: shift webhook field to bottom of settings page, update copy [`#553`](https://github.com/opengovsg/FormSG/pull/553)
+
 #### [v4.44.0](https://github.com/opengovsg/FormSG/compare/v4.43.2...v4.44.0)
 
+> 3 November 2020
+
+- build: release 4.44.0 [`#576`](https://github.com/opengovsg/FormSG/pull/576)
+- style: fix ie11 incorrectly resizing modal due to overflow [`#577`](https://github.com/opengovsg/FormSG/pull/577)
 - fix(deps): upgrade Chromium and puppeteer-core [`#572`](https://github.com/opengovsg/FormSG/pull/572)
 - fix(deps): bump fp-ts from 2.8.3 to 2.8.5 [`#567`](https://github.com/opengovsg/FormSG/pull/567)
 - chore(deps-dev): bump @babel/core from 7.11.6 to 7.12.3 [`#536`](https://github.com/opengovsg/FormSG/pull/536)
@@ -18,6 +49,32 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump @types/jest from 26.0.14 to 26.0.15 [`#534`](https://github.com/opengovsg/FormSG/pull/534)
 - chore(deps-dev): bump eslint-config-prettier from 6.12.0 to 6.15.0 [`#526`](https://github.com/opengovsg/FormSG/pull/526)
 - build: merge release 4.43.2 into develop [`#552`](https://github.com/opengovsg/FormSG/pull/552)
+- build: release 4.43.2 [`#551`](https://github.com/opengovsg/FormSG/pull/551)
+- build: Release 4.43.0 [`#529`](https://github.com/opengovsg/FormSG/pull/529)
+- build: Release 4.42.0 [`#518`](https://github.com/opengovsg/FormSG/pull/518)
+- build: Release 4.41.0 [`#493`](https://github.com/opengovsg/FormSG/pull/493)
+- build: release v4.40.0 [`#460`](https://github.com/opengovsg/FormSG/pull/460)
+- build: release v4.39.0 [`#434`](https://github.com/opengovsg/FormSG/pull/434)
+- build: release v4.38.1 [`#423`](https://github.com/opengovsg/FormSG/pull/423)
+- build: release v4.38.0 [`#414`](https://github.com/opengovsg/FormSG/pull/414)
+- build: Release v4.37.1 [`#388`](https://github.com/opengovsg/FormSG/pull/388)
+- build: Release v4.37.0 [`#381`](https://github.com/opengovsg/FormSG/pull/381)
+- fix: release 4.35.1 hotfix - Return generic error instead of Joi error [`#333`](https://github.com/opengovsg/FormSG/pull/333)
+- build: release 4.35.0 [`#320`](https://github.com/opengovsg/FormSG/pull/320)
+- build: Release 4.34.1 - log all critical bounces [`#310`](https://github.com/opengovsg/FormSG/pull/310)
+- feature: release 4.34.0 [`#297`](https://github.com/opengovsg/FormSG/pull/297)
+- feat: Release 4.33.0 [`#239`](https://github.com/opengovsg/FormSG/pull/239)
+- fix: Hotfix v4.32.1 -- split mail by semicolon in addition to comma when validating [`#222`](https://github.com/opengovsg/FormSG/pull/222)
+- feat: Release v4.32.0 [`#201`](https://github.com/opengovsg/FormSG/pull/201)
+- Release v4.31.0 - improve docs, log IP, fix tests [`#152`](https://github.com/opengovsg/FormSG/pull/152)
+- Release 4.30.4  - revert filtering by submission ID [`#137`](https://github.com/opengovsg/FormSG/pull/137)
+- build: Release 4.30.3 - Typescript migrations, filter storage mode responses by submission id [`#123`](https://github.com/opengovsg/FormSG/pull/123)
+- Release 4.30.2 - fix AWS endpoint and /emailnotifications log group [`#78`](https://github.com/opengovsg/FormSG/pull/78)
+- build: Release 4.30.1 - Fix field creation on old clients [`#74`](https://github.com/opengovsg/FormSG/pull/74)
+- Release 4.30.0 - acknowledgement for secret key backup, TypeScript migrations [`#67`](https://github.com/opengovsg/FormSG/pull/67)
+- chore: bump version to 4.44.0 [`03f24e4`](https://github.com/opengovsg/FormSG/commit/03f24e4124ad0aefd54f9360354ec2e4bd7be14e)
+- build: Release 4.43.1 - Allow edits to prefilled textfields, tighten checks for protected routes [`b55e5d5`](https://github.com/opengovsg/FormSG/commit/b55e5d5be4412a620feefc52bf360914c33a8bc7)
+- build: Merge pull request #348 from opengovsg/release-4.36.0 [`211efe7`](https://github.com/opengovsg/FormSG/commit/211efe7aac19d9b5b7b18af67f3707f47d138f96)
 
 #### [v4.43.2](https://github.com/opengovsg/FormSG/compare/v4.43.1...v4.43.2)
 
diff --git a/package-lock.json b/package-lock.json
index 99b8124f07..8ecbb6353f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "FormSG",
-  "version": "4.44.0",
+  "version": "4.45.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f11b13bda7..40da8bce47 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "4.44.0",
+  "version": "4.45.0",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"

From 5776c2d3d079e2876aacb17c41c398031a8ff939 Mon Sep 17 00:00:00 2001
From: Antariksh <antarikshmahajan@gmail.com>
Date: Mon, 16 Nov 2020 16:24:41 +0800
Subject: [PATCH 25/26] fix: update email list correctly when deleting emails

---
 .../forms/admin/directives/settings-form.client.directive.js    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/public/modules/forms/admin/directives/settings-form.client.directive.js b/src/public/modules/forms/admin/directives/settings-form.client.directive.js
index c408811662..f489bbb25b 100644
--- a/src/public/modules/forms/admin/directives/settings-form.client.directive.js
+++ b/src/public/modules/forms/admin/directives/settings-form.client.directive.js
@@ -74,7 +74,7 @@ function settingsFormDirective(
           const emailsFieldIncorrectlyAdded =
             updatedSettings.emails &&
             !Array.isArray(tempForm.emails) &&
-            myform.emails[0] === tempForm.emails
+            myform.emails.join(',') === tempForm.emails
           if (emailsFieldIncorrectlyAdded) delete updatedSettings.emails
 
           return updatedSettings

From d2ec536e5154c9459b97d6977724928dc68e2a19 Mon Sep 17 00:00:00 2001
From: Antariksh <antarikshmahajan@gmail.com>
Date: Mon, 16 Nov 2020 16:40:43 +0800
Subject: [PATCH 26/26] chore: bump version to 4.45.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a86503cb38..40daa4792e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,14 @@ 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.45.1](https://github.com/opengovsg/FormSG/compare/v4.45.0...v4.45.1)
+
+- fix: update email list correctly when deleting emails [`5776c2d`](https://github.com/opengovsg/FormSG/commit/5776c2d3d079e2876aacb17c41c398031a8ff939)
+
 #### [v4.45.0](https://github.com/opengovsg/FormSG/compare/v4.44.0...v4.45.0)
 
+> 10 November 2020
+
 - feat: update landing page footer [`#584`](https://github.com/opengovsg/FormSG/pull/584)
 - chore: set datepicker default view to minimum date [`#574`](https://github.com/opengovsg/FormSG/pull/574)
 - fix(deps): bump @sentry/integrations from 5.25.0 to 5.27.3 [`#600`](https://github.com/opengovsg/FormSG/pull/600)
@@ -30,6 +36,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - chore(deps-dev): bump jest from 26.5.3 to 26.6.2 [`#570`](https://github.com/opengovsg/FormSG/pull/570)
 - refactor: convert MyInfo hash update to static domain method [`#562`](https://github.com/opengovsg/FormSG/pull/562)
 - chore: shift webhook field to bottom of settings page, update copy [`#553`](https://github.com/opengovsg/FormSG/pull/553)
+- chore: bump version to 4.45.0 [`c8d3463`](https://github.com/opengovsg/FormSG/commit/c8d346350949050c2eb87d5564d9e3ba623a5956)
 
 #### [v4.44.0](https://github.com/opengovsg/FormSG/compare/v4.43.2...v4.44.0)
 
diff --git a/package-lock.json b/package-lock.json
index 8ecbb6353f..c2a89edf8c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "FormSG",
-  "version": "4.45.0",
+  "version": "4.45.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 40da8bce47..fd2961aeea 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "FormSG",
   "description": "Form Manager for Government",
-  "version": "4.45.0",
+  "version": "4.45.1",
   "homepage": "https://form.gov.sg",
   "authors": [
     "FormSG <formsg@data.gov.sg>"