Merge remote-tracking branch 'upstream/master'

passport-local/passport-local.d.ts

@@ -13,6 +13,7 @@ declare module 'passport-local' {
     interface IStrategyOptions {
         usernameField?: string;
         passwordField?: string;
+        passReqToCallback?: boolean;
     }
 
     interface IStrategyOptionsWithRequest {
@@ -30,6 +31,7 @@ declare module 'passport-local' {
     }
 
     interface VerifyFunction {
+        (req: express.Request, username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
         (username: string, password: string, done: (error: any, user?: any, options?: IVerifyOptions) => void): void;
     }