better typing in auth/index.ts

Signed-off-by: Philip Molares <philip.molares@udo.edu>
Signed-off-by: David Mehren <dmehren1@gmail.com>
This commit is contained in:
Philip Molares 2020-04-13 11:43:15 +02:00 committed by David Mehren
parent 3b7bab47be
commit 5c49f42067
No known key found for this signature in database
GPG key ID: 6017AF117F9756CB

View file

@ -1,4 +1,4 @@
import { Router } from 'express' import { Request, Response, Router } from 'express'
import passport from 'passport' import passport from 'passport'
import { config } from '../../config' import { config } from '../../config'
import { logger } from '../../logger' import { logger } from '../../logger'
@ -31,7 +31,8 @@ passport.deserializeUser(function (id: string, done) {
}).then(function (user) { }).then(function (user) {
// Don't die on non-existent user // Don't die on non-existent user
if (user == null) { if (user == null) {
return done(null, false, { message: 'Invalid UserID' }) // The extra object with message doesn't exits in @types/passport
return done(null, false) // , { message: 'Invalid UserID' })
} }
logger.info('deserializeUser: ' + user.id) logger.info('deserializeUser: ' + user.id)
@ -55,9 +56,9 @@ if (config.isEmailEnable) AuthRouter.use(email)
if (config.isOpenIDEnable) AuthRouter.use(openid) if (config.isOpenIDEnable) AuthRouter.use(openid)
// logout // logout
AuthRouter.get('/logout', function (req, res) { AuthRouter.get('/logout', function (req: Request, res: Response) {
if (config.debug && req.isAuthenticated()) { if (config.debug && req.isAuthenticated()) {
logger.debug('user logout: ' + req.user.id) logger.debug('user logout: ' + req.user?.id)
} }
req.logout() req.logout()
res.redirect(config.serverURL + '/') res.redirect(config.serverURL + '/')