OAuth/User models refractoring -> use mongoose api

[github/Chocobozzz/PeerTube.git] / server / controllers / api / v1 / users.js

diff --git a/server/controllers/api/v1/users.js b/server/controllers/api/v1/users.js
index 1125b9faa90bbdc7b67f528d3ed6bd1b5aefc4a9..caa979567aad89efdc14af635bee29388c565ab3 100644 (file)
--- a/server/controllers/api/v1/users.js
+++ b/server/controllers/api/v1/users.js
@@ -1,17 +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 middleware = require('../../../middlewares')
-const cacheMiddleware = middleware.cache
-const Users = require('../../../models/users')
+const Client = mongoose.model('OAuthClient')
 
 const router = express.Router()
 
-router.get('/client', cacheMiddleware.cache(false), getAngularClient)
-router.post('/token', cacheMiddleware.cache(false), oAuth2.token, success)
+router.get('/client', getAngularClient)
+router.post('/token', oAuth.token, success)
 
 // ---------------------------------------------------------------------------
 
@@ -20,16 +19,16 @@ module.exports = router
 // ---------------------------------------------------------------------------
 
 function getAngularClient (req, res, next) {
-  const server_host = config.get('webserver.host')
-  const server_port = config.get('webserver.port')
-  let header_host_should_be = server_host
-  if (server_port !== 80 && server_port !== 443) {
-    header_host_should_be += ':' + server_port
+  const serverHost = config.get('webserver.host')
+  const serverPort = config.get('webserver.port')
+  let headerHostShouldBe = serverHost
+  if (serverPort !== 80 && serverPort !== 443) {
+    headerHostShouldBe += ':' + serverPort
   }
 
-  if (req.get('host') !== header_host_should_be) return res.type('json').status(403).end()
+  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.'))