projects
/
oweals
/
peertube.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary image check in video upload
[oweals/peertube.git]
/
server
/
middlewares
/
oauth.ts
diff --git
a/server/middlewares/oauth.ts
b/server/middlewares/oauth.ts
index 3faecdbcc69fbb818ef28189f22b04ffe32b6a9a..a6f28dd5b56a58050cc12d5f0b87aa2ad9e1e640 100644
(file)
--- a/
server/middlewares/oauth.ts
+++ b/
server/middlewares/oauth.ts
@@
-1,11
+1,11
@@
-import 'express-validator'
import * as express from 'express'
import * as OAuthServer from 'express-oauth-server'
import * as express from 'express'
import * as OAuthServer from 'express-oauth-server'
-
+import 'express-validator'
import { OAUTH_LIFETIME } from '../initializers'
import { OAUTH_LIFETIME } from '../initializers'
-import { logger } from '../helpers'
+import { logger } from '../helpers
/logger
'
const oAuthServer = new OAuthServer({
const oAuthServer = new OAuthServer({
+ useErrorHandler: true,
accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
model: require('../lib/oauth-model')
accessTokenLifetime: OAUTH_LIFETIME.ACCESS_TOKEN,
refreshTokenLifetime: OAUTH_LIFETIME.REFRESH_TOKEN,
model: require('../lib/oauth-model')
@@
-14,23
+14,45
@@
const oAuthServer = new OAuthServer({
function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
oAuthServer.authenticate()(req, res, err => {
if (err) {
function authenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
oAuthServer.authenticate()(req, res, err => {
if (err) {
- logger.error('Cannot authenticate.', err)
- return res.sendStatus(500)
+ logger.warn('Cannot authenticate.', { err })
+
+ return res.status(err.status)
+ .json({
+ error: 'Token is invalid.',
+ code: err.name
+ })
+ .end()
}
}
- if (res.statusCode === 401 || res.statusCode === 400 || res.statusCode === 503) return res.end()
-
return next()
})
}
return next()
})
}
+function optionalAuthenticate (req: express.Request, res: express.Response, next: express.NextFunction) {
+ if (req.header('authorization')) return authenticate(req, res, next)
+
+ return next()
+}
+
function token (req: express.Request, res: express.Response, next: express.NextFunction) {
function token (req: express.Request, res: express.Response, next: express.NextFunction) {
- return oAuthServer.token()(req, res, next)
+ return oAuthServer.token()(req, res, err => {
+ if (err) {
+ return res.status(err.status)
+ .json({
+ error: 'Authentication failed.',
+ code: err.name
+ })
+ .end()
+ }
+
+ return next()
+ })
}
// ---------------------------------------------------------------------------
export {
authenticate,
}
// ---------------------------------------------------------------------------
export {
authenticate,
+ optionalAuthenticate,
token
}
token
}