From e02643f32e4c97ca307f8fc5b69be79c40d70a3b Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Mon, 22 May 2017 20:58:25 +0200
Subject: Type models

---
 server/middlewares/admin.ts             |  2 +-
 server/middlewares/oauth.ts             |  8 ++++----
 server/middlewares/pagination.ts        |  4 ++--
 server/middlewares/pods.ts              |  6 ++----
 server/middlewares/secure.ts            | 10 ++++++----
 server/middlewares/validators/pods.ts   |  2 +-
 server/middlewares/validators/users.ts  |  2 +-
 server/middlewares/validators/videos.ts |  2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'server/middlewares')

diff --git a/server/middlewares/admin.ts b/server/middlewares/admin.ts
index ebafa36a4..28b6a9a12 100644
--- a/server/middlewares/admin.ts
+++ b/server/middlewares/admin.ts
@@ -1,4 +1,4 @@
-const logger = require('../helpers/logger')
+import { logger } from '../helpers'
 
 function ensureIsAdmin (req, res, next) {
   const user = res.locals.oauth.token.user
diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 31ae1e000..07bbded57 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,11 +1,11 @@
 import OAuthServer = require('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')
 })
 
diff --git a/server/middlewares/pagination.ts b/server/middlewares/pagination.ts
index 8fe9f9082..cadd76980 100644
--- a/server/middlewares/pagination.ts
+++ b/server/middlewares/pagination.ts
@@ -1,10 +1,10 @@
-const constants = require('../initializers/constants')
+import { PAGINATION_COUNT_DEFAULT } from '../initializers'
 
 function setPagination (req, res, next) {
   if (!req.query.start) req.query.start = 0
   else req.query.start = parseInt(req.query.start, 10)
 
-  if (!req.query.count) req.query.count = constants.PAGINATION_COUNT_DEFAULT
+  if (!req.query.count) req.query.count = PAGINATION_COUNT_DEFAULT
   else req.query.count = parseInt(req.query.count, 10)
 
   return next()
diff --git a/server/middlewares/pods.ts b/server/middlewares/pods.ts
index e405f265e..c255be899 100644
--- a/server/middlewares/pods.ts
+++ b/server/middlewares/pods.ts
@@ -1,6 +1,4 @@
-'use strict'
-
-const constants = require('../initializers/constants')
+import { REMOTE_SCHEME } from '../initializers'
 
 function setBodyHostsPort (req, res, next) {
   if (!req.body.hosts) return next()
@@ -48,7 +46,7 @@ function getHostWithPort (host) {
 
   // The port was not specified
   if (splitted.length === 1) {
-    if (constants.REMOTE_SCHEME.HTTP === 'https') return host + ':443'
+    if (REMOTE_SCHEME.HTTP === 'https') return host + ':443'
 
     return host + ':80'
   }
diff --git a/server/middlewares/secure.ts b/server/middlewares/secure.ts
index ee8545028..bd7cfa918 100644
--- a/server/middlewares/secure.ts
+++ b/server/middlewares/secure.ts
@@ -1,6 +1,8 @@
-const db = require('../initializers/database')
-const logger = require('../helpers/logger')
-const peertubeCrypto = require('../helpers/peertube-crypto')
+import { database as db } from '../initializers'
+import {
+  logger,
+  checkSignature as peertubeCryptoCheckSignature
+} from '../helpers'
 
 function checkSignature (req, res, next) {
   const host = req.body.signature.host
@@ -26,7 +28,7 @@ function checkSignature (req, res, next) {
       signatureShouldBe = host
     }
 
-    const signatureOk = peertubeCrypto.checkSignature(pod.publicKey, signatureShouldBe, req.body.signature.signature)
+    const signatureOk = peertubeCryptoCheckSignature(pod.publicKey, signatureShouldBe, req.body.signature.signature)
 
     if (signatureOk === true) {
       res.locals.secure = {
diff --git a/server/middlewares/validators/pods.ts b/server/middlewares/validators/pods.ts
index fbfd268d0..c55a88b85 100644
--- a/server/middlewares/validators/pods.ts
+++ b/server/middlewares/validators/pods.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { checkErrors } from './utils'
 import { logger } from '../../helpers'
 import { CONFIG } from '../../initializers'
diff --git a/server/middlewares/validators/users.ts b/server/middlewares/validators/users.ts
index a9149fe1b..e0d1d917a 100644
--- a/server/middlewares/validators/users.ts
+++ b/server/middlewares/validators/users.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { checkErrors } from './utils'
 import { logger } from '../../helpers'
 
diff --git a/server/middlewares/validators/videos.ts b/server/middlewares/validators/videos.ts
index 5a49cf73c..47825975c 100644
--- a/server/middlewares/validators/videos.ts
+++ b/server/middlewares/validators/videos.ts
@@ -1,4 +1,4 @@
-const db = require('../../initializers/database')
+import { database as db } from '../../initializers/database'
 import { checkErrors } from './utils'
 import { CONSTRAINTS_FIELDS, SEARCHABLE_COLUMNS } from '../../initializers'
 import { logger, isVideoDurationValid } from '../../helpers'
-- 
cgit v1.2.3