yetangitu/Peertube
1
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-10-06 03:50:26 +02:00
Code Issues Releases Wiki Activity

OAuth/User models refractoring -> use mongoose api

Browse source
This commit is contained in:
Chocobozzz 2016-07-01 16:03:53 +02:00
parent a3ee6fa22d
commit 69b0a27cbb
14 changed files with 217 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/controllers/api/v1/pods.js
View file

@ -7,7 +7,7 @@ const mongoose = require('mongoose')
const logger = require('../../../helpers/logger')
const friends = require('../../../lib/friends')
const middlewares = require('../../../middlewares')
const oAuth2 = middlewares.oauth2
const oAuth = middlewares.oauth
const reqValidator = middlewares.reqValidators.pods
const signatureValidator = middlewares.reqValidators.remote.signature
@ -17,8 +17,8 @@ const Video = mongoose.model('Video')
router.get('/', listPodsUrl)
router.post('/', reqValidator.podsAdd, addPods)
router.get('/makefriends', oAuth2.authenticate, reqValidator.makeFriends, makeFriends)
router.get('/quitfriends', oAuth2.authenticate, quitFriends)
router.get('/makefriends', oAuth.authenticate, reqValidator.makeFriends, makeFriends)
router.get('/quitfriends', oAuth.authenticate, quitFriends)
// Post because this is a secured request
router.post('/remove', signatureValidator, removePods)

9
server/controllers/api/v1/users.js
View file

@ -1,15 +1,16 @@
'use strict'
const config = require('config')
const mongoose = require('mongoose')
const express = require('express')
const oAuth2 = require('../../../middlewares').oauth2
const oAuth = require('../../../middlewares').oauth
const Users = require('../../../models/users')
const Client = mongoose.model('OAuthClient')
const router = express.Router()
router.get('/client', getAngularClient)
router.post('/token', oAuth2.token, success)
router.post('/token', oAuth.token, success)
// ---------------------------------------------------------------------------
@ -27,7 +28,7 @@ function getAngularClient (req, res, next) {
if (req.get('host') !== headerHostShouldBe) return res.type('json').status(403).end()
Users.getFirstClient(function (err, client) {
Client.loadFirstClient(function (err, client) {
if (err) return next(err)
if (!client) return next(new Error('No client available.'))

6
server/controllers/api/v1/videos.js
View file

@ -9,7 +9,7 @@ const multer = require('multer')
const logger = require('../../../helpers/logger')
const friends = require('../../../lib/friends')
const middlewares = require('../../../middlewares')
const oAuth2 = middlewares.oauth2
const oAuth = middlewares.oauth
const pagination = middlewares.pagination
const reqValidator = middlewares.reqValidators
const reqValidatorPagination = reqValidator.pagination
@ -51,7 +51,7 @@ router.get('/',
listVideos
)
router.post('/',
oAuth2.authenticate,
oAuth.authenticate,
reqFiles,
reqValidatorVideos.videosAdd,
addVideo
@ -61,7 +61,7 @@ router.get('/:id',
getVideo
)
router.delete('/:id',
oAuth2.authenticate,
oAuth.authenticate,
reqValidatorVideos.videosRemove,
removeVideo
)