diff --git a/csurf/csurf.d.ts b/csurf/csurf.d.ts
new file mode 100644
index 000000000..3a95435d7
--- /dev/null
+++ b/csurf/csurf.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for csurf
+// Project: http://expressjs.com
+// Definitions by: Hiroki Horiuchi
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///
+
+declare module Express {
+ export interface Request {
+ csrfToken(): string;
+ }
+}
+
+declare module "csurf" {
+ import express = require('express');
+
+ function csurf(options?: {
+ value?: (req: express.Request) => string;
+ cookie?: csurf.CookieOptions;
+ }): express.RequestHandler;
+
+ module csurf {
+ export interface CookieOptions extends express.CookieOptions {
+ key: string;
+ }
+ }
+
+ export = csurf;
+}
+
diff --git a/passport/passport.d.ts b/passport/passport.d.ts
index fc3dd786f..6d03093eb 100644
--- a/passport/passport.d.ts
+++ b/passport/passport.d.ts
@@ -8,6 +8,18 @@
declare module Express {
export interface Request {
session?: any;
+
+ // These declarations are merged into express's Request type
+ login(user: any, done: (err: any) => void): void;
+ login(user: any, options: Object, done: (err: any) => void): void;
+ logIn(user: any, done: (err: any) => void): void;
+ logIn(user: any, options: Object, done: (err: any) => void): void;
+
+ logout(): void;
+ logOut(): void;
+
+ isAuthenticated(): boolean;
+ isUnauthenticated(): boolean;
}
}
@@ -68,20 +80,3 @@ declare module 'passport' {
}
}
-declare module Express {
- export interface Request {
-
- // These declarations are merged into express's Request type
- login(user: any, done: (err: any) => void): void;
- login(user: any, options: Object, done: (err: any) => void): void;
- logIn(user: any, done: (err: any) => void): void;
- logIn(user: any, options: Object, done: (err: any) => void): void;
-
- logout(): void;
- logOut(): void;
-
- isAuthenticated(): boolean;
- isUnauthenticated(): boolean;
- }
-}
-