Merge branch 'develop' into ref/ts-analytics-routes

# Conflicts:
#	src/config/feature-manager/util/FeatureManager.class.ts

package.json

@@ -68,7 +68,7 @@
     "@opengovsg/myinfo-gov-client": "^1.0.4",
     "@opengovsg/ng-file-upload": "^12.2.14",
     "@opengovsg/spcp-auth-client": "^1.3.5",
-    "@sentry/browser": "^5.22.3",
+    "@sentry/browser": "^5.24.2",
     "@sentry/integrations": "^5.24.2",
     "@stablelib/base64": "^1.0.0",
     "JSONStream": "^1.3.5",
@@ -133,14 +133,14 @@
     "moment-timezone": "0.5.31",
     "mongodb-uri": "^0.9.7",
     "mongoose": "^5.10.0",
-    "multiparty": ">=4.1.3",
+    "multiparty": ">=4.2.2",
     "neverthrow": "^2.7.1",
     "ng-infinite-scroll": "^1.3.0",
     "ng-table": "^3.0.1",
     "ngclipboard": "^2.0.0",
     "nocache": "^2.1.0",
     "node-cache": "^5.1.2",
-    "nodemailer": "^6.4.11",
+    "nodemailer": "^6.4.12",
     "nodemailer-direct-transport": "~3.3.2",
     "opossum": "^5.0.1",
     "promise-retry": "^2.0.1",
@@ -205,7 +205,7 @@
     "css-loader": "^2.1.1",
     "csv-parse": "^4.12.0",
     "env-cmd": "^10.1.0",
-    "eslint": "^7.9.0",
+    "eslint": "^7.10.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-plugin-angular": "^4.0.1",
     "eslint-plugin-html": "^6.0.2",

src/app/models/form.server.model.ts

@@ -92,7 +92,7 @@ export interface IFormModel extends Model<IFormSchema> {
   deactivateById(formId: string): Promise<IFormSchema | null>
 }
 
-type IEncryptedFormModel = Model<IEncryptedFormSchema>
+type IEncryptedFormModel = Model<IEncryptedFormSchema> & IFormModel
 
 const EncryptedFormSchema = new Schema<IEncryptedFormSchema>({
   publicKey: {
@@ -101,7 +101,7 @@ const EncryptedFormSchema = new Schema<IEncryptedFormSchema>({
   },
 })
 
-type IEmailFormModel = Model<IEmailFormSchema>
+type IEmailFormModel = Model<IEmailFormSchema> & IFormModel
 
 const EmailFormSchema = new Schema<IEmailFormSchema>({
   emails: {

src/app/modules/user/user.controller.ts

@@ -5,7 +5,7 @@ import { StatusCodes } from 'http-status-codes'
 
 import { createLoggerWithLabel } from '../../../config/logger'
 import { IPopulatedUser } from '../../../types'
-import SmsFactory from '../../factories/sms.factory'
+import { SmsFactory } from '../../services/sms/sms.factory'
 import { ApplicationError } from '../core/core.errors'
 
 import {