From ec59f52b33582f0ced36e1592daafed7cea2b641 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomek=20=C5=81aziuk?= <tlaziuk@gmail.com>
Date: Fri, 8 Dec 2017 18:44:44 +0100
Subject: [PATCH] improve tests

---
 types/passport/passport-tests.ts | 169 ++++++++++++++++---------------
 1 file changed, 87 insertions(+), 82 deletions(-)

diff --git a/types/passport/passport-tests.ts b/types/passport/passport-tests.ts
index 13192f2eba..b6c033b907 100644
--- a/types/passport/passport-tests.ts
+++ b/types/passport/passport-tests.ts
@@ -3,132 +3,137 @@ import * as express from 'express';
 import 'express-session';
 
 class TestStrategy implements passport.Strategy {
-  name = 'test';
-  constructor() { }
-  authenticate(req: express.Request) { }
+    name = 'test';
+    constructor() { }
+    authenticate(this: passport.StrategyCreated<this>, req: express.Request) {
+        const user: TestUser = {
+            id: 0,
+        };
+        this.success(user);
+    }
 }
 
 const newFramework: passport.Framework = {
-  initialize() {
-    return () => { };
-  },
-  authenticate(passport, name, options) {
-    return () => {
-      return `authenticate(): ${name} ${options}`;
-    };
-  },
-  authorize(passport, name, options) {
-    return () => {
-      return `authorize(): ${name} ${options}`;
-    };
-  }
+    initialize() {
+        return () => { };
+    },
+    authenticate(passport, name, options) {
+        return () => {
+            return `authenticate(): ${name} ${options}`;
+        };
+    },
+    authorize(passport, name, options) {
+        return () => {
+            return `authorize(): ${name} ${options}`;
+        };
+    }
 };
 passport.use(new TestStrategy());
 passport.framework(newFramework);
 
 interface TestUser {
-  id: number;
+    id: number;
 }
 passport.serializeUser((user: TestUser, done: (err: any, id?: number) => void) => {
-  done(null, user.id);
+    done(null, user.id);
 });
 passport.serializeUser<TestUser, number>((user, done) => {
-  if (user.id > 0) {
-    done(null, user.id);
-  } else {
-    done(new Error('user ID is invalid'));
-  }
+    if (user.id > 0) {
+        done(null, user.id);
+    } else {
+        done(new Error('user ID is invalid'));
+    }
 });
 passport.deserializeUser((id, done) => {
-  done(null, {id});
+    done(null, { id });
 });
 passport.deserializeUser<TestUser, number>((id, done) => {
-  const fetchUser = (id: number): Promise<TestUser> => {
-    return Promise.reject(new Error(`user not found: ${id}`));
-  };
+    const fetchUser = (id: number): Promise<TestUser> => {
+        return Promise.reject(new Error(`user not found: ${id}`));
+    };
 
-  fetchUser(id)
-    .then((user) => done(null, user))
-    .catch(done);
+    fetchUser(id)
+        .then((user) => done(null, user))
+        .catch(done);
 });
 
 passport.use(new TestStrategy())
-  .unuse('test')
-  .use(new TestStrategy())
-  .framework(newFramework);
+    .unuse('test')
+    .use(new TestStrategy())
+    .framework(newFramework);
 
 const app = express();
 app.configure(() => {
-  app.use(passport.initialize());
-  app.use(passport.session());
+    app.use(passport.initialize());
+    app.use(passport.session());
 });
 
 app.post('/login',
-  passport.authenticate('local', { failureRedirect: '/login', failureFlash: true }),
-  (req, res) => {
-    res.redirect('/');
-  });
+    passport.authenticate('local', { failureRedirect: '/login', failureFlash: true }),
+    (req, res) => {
+        res.redirect('/');
+    });
 
 app.post('/login', (req, res, next) => {
-  passport.authenticate('local', (err: any, user: { username: string; }, info: { message: string; }) => {
-    if (err) { return next(err); }
-    if (!user) {
-      if (req.session) {
-        req.session['error'] = info.message;
-      }
-      return res.redirect('/login');
-    }
-    req.logIn(user, (err) => {
-      if (err) { return next(err); }
-      return res.redirect('/users/' + user.username);
-    });
-  })(req, res, next);
+    passport.authenticate('local', (err: any, user: { username: string; }, info: { message: string; }) => {
+        if (err) { return next(err); }
+        if (!user) {
+            if (req.session) {
+                req.session['error'] = info.message;
+            }
+            return res.redirect('/login');
+        }
+        req.logIn(user, (err) => {
+            if (err) { return next(err); }
+            return res.redirect('/users/' + user.username);
+        });
+    })(req, res, next);
 });
 
 app.get('/logout', (req, res) => {
-  req.logout();
-  res.redirect('/');
+    req.logout();
+    res.redirect('/');
 });
 
 app.post('/auth/token', passport.authenticate(['basic', 'oauth2-client-password'], { session: false }));
 
 function authSetting(): void {
-  const authOption = {
-    successRedirect: '/',
-    failureRedirect: '/login',
-  };
-  const successCallback = (req: express.Request, res: express.Response) => {
-    res.redirect('/');
-  };
+    const authOption = {
+        successRedirect: '/',
+        failureRedirect: '/login',
+    };
+    const successCallback = (req: express.Request, res: express.Response) => {
+        res.redirect('/');
+    };
 
-  app.get('/auth/facebook',
-      passport.authenticate('facebook'));
-  app.get('/auth/facebook/callback',
-      passport.authenticate('facebook', authOption), successCallback);
+    app.get('/auth/facebook',
+        passport.authenticate('facebook'));
+    app.get('/auth/facebook/callback',
+        passport.authenticate('facebook', authOption), successCallback);
 
-  app.get('/auth/twitter',
-      passport.authenticate('twitter'));
-  app.get('/auth/twitter/callback',
-      passport.authenticate('twitter', authOption));
+    app.get('/auth/twitter',
+        passport.authenticate('twitter'));
+    app.get('/auth/twitter/callback',
+        passport.authenticate('twitter', authOption));
 
-  app.get('/auth/google',
-    passport.authenticate('google', {
-      scope:
-      ['https://www.googleapis.com/auth/userinfo.profile']
-    }));
-  app.get('/auth/google/callback',
-      passport.authenticate('google', authOption), successCallback);
+    app.get('/auth/google',
+        passport.authenticate('google', {
+            scope:
+                ['https://www.googleapis.com/auth/userinfo.profile']
+        }));
+    app.get('/auth/google/callback',
+        passport.authenticate('google', authOption), successCallback);
 }
 
 function ensureAuthenticated(req: express.Request, res: express.Response, next: (err?: any) => void) {
-  if (req.isAuthenticated()) { return next(); }
-  if (req.isUnauthenticated()) {
-    res.redirect('/login');
-  }
+    if (req.isAuthenticated()) { return next(); }
+    if (req.isUnauthenticated()) {
+        res.redirect('/login');
+    }
 }
 
-const passportInstance: passport.Authenticator = new passport.Authenticator();
+const passportInstance = new passport.Passport();
 passportInstance.use(new TestStrategy());
 
-const authenticator: passport.Authenticator = new passport.Authenticator();
+const authenticator = new passport.Authenticator();
 authenticator.use(new TestStrategy());