Skip to content

Commit 793e95c

Browse files
committed
patch fix to remove type errors for routes/passport
1 parent e1f59df commit 793e95c

File tree

1 file changed

+26
-18
lines changed

1 file changed

+26
-18
lines changed

server/routes/passport.routes.ts

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,35 @@ import passport from 'passport';
33

44
const router = Router();
55

6-
const authenticateOAuth = (service: string) => (req: Request, res: Response, next: NextFunction) => {
7-
passport.authenticate(service, { failureRedirect: '/login' }, (err: any, user: Express.User) => {
8-
if (err) {
9-
// use query string param to show error;
10-
res.redirect(`/account?error=${service}`);
11-
return;
12-
}
13-
14-
if (!user) {
15-
res.redirect(`/account?error=${service}NoUser`);
16-
return;
17-
}
6+
const authenticateOAuth = (service: string) => (
7+
req: Request,
8+
res: Response,
9+
next: NextFunction
10+
) => {
11+
passport.authenticate(
12+
service,
13+
{ failureRedirect: '/login' },
14+
(err: any, user: any) => {
15+
if (err) {
16+
// use query string param to show error;
17+
res.redirect(`/account?error=${service}`);
18+
return;
19+
}
1820

19-
req.logIn(user, (loginErr) => {
20-
if (loginErr) {
21-
next(loginErr);
21+
if (!user) {
22+
res.redirect(`/account?error=${service}NoUser`);
2223
return;
2324
}
24-
res.redirect('/');
25-
});
26-
})(req, res, next);
25+
26+
req.logIn(user, (loginErr) => {
27+
if (loginErr) {
28+
next(loginErr);
29+
return;
30+
}
31+
res.redirect('/');
32+
});
33+
}
34+
)(req, res, next);
2735
};
2836

2937
router.get('/auth/github', passport.authenticate('github'));

0 commit comments

Comments
 (0)