From ee1fbc5e9cab1afa9aa0a20be657c22629a1e43f Mon Sep 17 00:00:00 2001
From: unHealthy <zhutian.chen@outlook.com>
Date: Sun, 2 Oct 2016 16:33:02 +0800
Subject: [PATCH] better structure

---
 passport/passport.d.ts | 82 ++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 48 deletions(-)

diff --git a/passport/passport.d.ts b/passport/passport.d.ts
index 088156b2d3..5231b1fdac 100644
--- a/passport/passport.d.ts
+++ b/passport/passport.d.ts
@@ -27,30 +27,11 @@ declare namespace Express {
 declare module 'passport' {
     import express = require('express');
 
-    function use(strategy: Strategy): Passport;
-    function use(name: string, strategy: Strategy): Passport;
-    function unuse(name: string): Passport;
-    function framework(fw: Framework): Passport;
-    function initialize(options?: { userProperty: string; }): express.Handler;
-    function session(options?: { pauseStream: boolean; }): express.Handler;
-
-    function authenticate(strategy: string, callback?: Function): express.Handler;
-    function authenticate(strategy: string, options: Object, callback?: Function): express.Handler;
-    function authenticate(strategies: string[], callback?: Function): express.Handler;
-    function authenticate(strategies: string[], options: Object, callback?: Function): express.Handler;
-    function authorize(strategy: string, callback?: Function): express.Handler;
-    function authorize(strategy: string, options: Object, callback?: Function): express.Handler;
-    function authorize(strategies: string[], callback?: Function): express.Handler;
-    function authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
-    function serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
-    function deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
-    function transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
-
     interface Passport {
-        use(strategy: Strategy): Passport;
-        use(name: string, strategy: Strategy): Passport;
+        use(strategy: passport.Strategy): Passport;
+        use(name: string, strategy: passport.Strategy): Passport;
         unuse(name: string): Passport;
-        framework(fw: Framework): Passport;
+        framework(fw: passport.Framework): Passport;
         initialize(options?: { userProperty: string; }): express.Handler;
         session(options?: { pauseStream: boolean; }): express.Handler;
 
@@ -66,33 +47,38 @@ declare module 'passport' {
         deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
         transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
     }
+    const passport: Passport;
+    export = passport;
 
-    interface Strategy {
-        name?: string;
-        authenticate(req: express.Request, options?: Object): void;
+    namespace passport {
+        interface Strategy {
+            name?: string;
+            authenticate(req: express.Request, options?: Object): void;
+        }
+
+        interface Profile {
+            provider: string;
+            id: string;
+            displayName: string;
+            name?: {
+                familyName: string;
+                givenName: string;
+                middleName?: string;
+            };
+            emails?: {
+                value: string;
+                type?: string;
+            }[];
+            photos?: {
+                value: string;
+            }[];
+        }
+
+        interface Framework {
+            initialize(passport: Passport, options?: Object): Function;
+            authenticate(passport: Passport, name: string, options?: Object, callback?: Function): Function;
+            authorize?(passport: Passport, name: string, options?: Object, callback?: Function): Function;
+        }
     }
 
-    interface Profile {
-        provider: string;
-        id: string;
-        displayName: string;
-        name?: {
-            familyName: string;
-            givenName: string;
-            middleName?: string;
-        };
-        emails?: {
-            value: string;
-            type?: string;
-        }[];
-        photos?: {
-            value: string;
-        }[];
-    }
-
-    interface Framework {
-        initialize(passport: Passport, options?: Object): Function;
-        authenticate(passport: Passport, name: string, options?: Object, callback?: Function): Function;
-        authorize?(passport: Passport, name: string, options?: Object, callback?: Function): Function;
-    }
 }