From 91c229dbdb653dbf0da91992f525905893cbeb91 Mon Sep 17 00:00:00 2001
From: Oleg Vaskevich <oleg@osv.im>
Date: Thu, 22 Aug 2019 08:16:25 -0700
Subject: [PATCH] Fix up Request.authInfo/user declarations in Passport
 (#37381)

* Fix up Request.authInfo/user declarations in Passport

* Add myself

* Use no-empty-interface locally
---
 types/passport/index.d.ts        | 18 ++++++++++++------
 types/passport/passport-tests.ts |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 17aa846946..b33e2bc141 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -6,20 +6,26 @@
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 //                 Daniel Perez Alvarez <https://github.com/danielpa9708>
 //                 Kevin Stiehl <https://github.com/kstiehl>
+//                 Oleg Vaskevich <https://github.com/vaskevich>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare global {
     namespace Express {
+        // tslint:disable-next-line:no-empty-interface
+        interface AuthInfo {}
+        // tslint:disable-next-line:no-empty-interface
+        interface User {}
+
         interface Request {
-            authInfo?: any;
-            user?: any;
+            authInfo?: AuthInfo;
+            user?: User;
 
             // These declarations are merged into express's Request type
-            login(user: any, done: (err: any) => void): void;
-            login(user: any, options: any, done: (err: any) => void): void;
-            logIn(user: any, done: (err: any) => void): void;
-            logIn(user: any, options: any, done: (err: any) => void): void;
+            login(user: User, done: (err: any) => void): void;
+            login(user: User, options: any, done: (err: any) => void): void;
+            logIn(user: User, done: (err: any) => void): void;
+            logIn(user: User, options: any, done: (err: any) => void): void;
 
             logout(): void;
             logOut(): void;
diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 6f087c3bdf..12278ba5d2 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -150,6 +150,7 @@ declare global {
     namespace Express {
         interface User {
             username: string;
+            id?: string;
         }
     }
 }