From 4b0df406a4ed0d28e6d2824a7e6cd0cc689af731 Mon Sep 17 00:00:00 2001
From: Peter Blazejewicz <peter.blazejewicz@gmail.com>
Date: Fri, 5 Jul 2019 23:29:10 +0200
Subject: [PATCH] Simplify augmented module for express-flash

There is existing @types definition for express-flash. Let's use it and
just augment a method required by the existing code to please compiler.

Thanks!
---
 package-lock.json            | 19 +++++++++++++++++++
 package.json                 |  1 +
 src/types/express-flash.d.ts | 10 +++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4c0d28e..83a022e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -522,6 +522,15 @@
         }
       }
     },
+    "@types/connect-flash": {
+      "version": "0.0.34",
+      "resolved": "https://registry.npmjs.org/@types/connect-flash/-/connect-flash-0.0.34.tgz",
+      "integrity": "sha512-QC93TwnTZ0sk//bfT81o7U4GOedbOZAcgvqi0v1vJqCESC8tqIVnhzB1CHiAUBUWFjoxG5JQF0TYaNa6DMb6Ig==",
+      "dev": true,
+      "requires": {
+        "@types/express": "*"
+      }
+    },
     "@types/connect-mongo": {
       "version": "0.0.42",
       "resolved": "https://registry.npmjs.org/@types/connect-mongo/-/connect-mongo-0.0.42.tgz",
@@ -575,6 +584,16 @@
         "@types/serve-static": "*"
       }
     },
+    "@types/express-flash": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/@types/express-flash/-/express-flash-0.0.0.tgz",
+      "integrity": "sha512-zs1xXRIZOjghUBriJPSnhPmfDpqf/EQxT21ggi/9XZ9/RHYrUi+5vK2jnQrP2pD1abbuZvm7owLICiNCLBQzEQ==",
+      "dev": true,
+      "requires": {
+        "@types/connect-flash": "*",
+        "@types/express": "*"
+      }
+    },
     "@types/express-serve-static-core": {
       "version": "4.16.4",
       "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.16.4.tgz",
diff --git a/package.json b/package.json
index 97694ee..7fc2340 100644
--- a/package.json
+++ b/package.json
@@ -62,6 +62,7 @@
     "@types/dotenv": "^6.1.1",
     "@types/errorhandler": "^0.0.32",
     "@types/express": "^4.17.0",
+    "@types/express-flash": "0.0.0",
     "@types/express-session": "^1.15.13",
     "@types/jest": "^24.0.15",
     "@types/jquery": "^3.3.29",
diff --git a/src/types/express-flash.d.ts b/src/types/express-flash.d.ts
index 284d78e..284d641 100644
--- a/src/types/express-flash.d.ts
+++ b/src/types/express-flash.d.ts
@@ -1,9 +1,13 @@
-
 /// <reference types="express" />
 
-// Add RequestValidation Interface on to Express's Request Interface.
+/**
+ * This type definition augments existing definition
+ * from @types/express-flash
+ */
 declare namespace Express {
-    interface Request extends Flash {}
+    export interface Request {
+        flash(event: string, message: any): any;
+    }
 }
 
 interface Flash {