Misc cleanup

[github/Chocobozzz/PeerTube.git] / server / middlewares / oauth.ts

diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 31ae1e000984c2878f4980f36cb7fc01bcbe4904..3faecdbcc69fbb818ef28189f22b04ffe32b6a9a 100644 (file)
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,18 +1,20 @@
-import OAuthServer = require('express-oauth-server')
+import 'express-validator'
+import * as express from 'express'
+import * as OAuthServer from 'express-oauth-server'
 
-const constants = require('../initializers/constants')
-const logger = require('../helpers/logger')
+import { OAUTH_LIFETIME } from '../initializers'
+import { logger } from '../helpers'
 
 const oAuthServer = new OAuthServer({
-  accessTokenLifetime: constants.OAUTH_LIFETIME.ACCESS_TOKEN,
-  refreshTokenLifetime: constants.OAUTH_LIFETIME.REFRESH_TOKEN,
+  accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
+  refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
   model: require('../lib/oauth-model')
 })
 
-function authenticate (req, res, next) {
-  oAuthServer.authenticate()(req, res, function (err) {
+function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+  oAuthServer.authenticate()(req, res, err => {
     if (err) {
-      logger.error('Cannot authenticate.', { error: err })
+      logger.error('Cannot authenticate.', err)
       return res.sendStatus(500)
     }
 
@@ -22,7 +24,7 @@ function authenticate (req, res, next) {
   })
 }
 
-function token (req, res, next) {
+function token (req: express.Request, res: express.Response, next: express.NextFunction) {
   return oAuthServer.token()(req, res, next)
 }