Video blacklist refractoring

[github/Chocobozzz/PeerTube.git] / server / helpers / requests.ts

diff --git a/server/helpers/requests.ts b/server/helpers/requests.ts
index b31074373e2c9c449db2a20c475ff0846a6ee455..d67d460446e99a2aa22d6116f7928af90f5e05f8 100644 (file)
--- a/server/helpers/requests.ts
+++ b/server/helpers/requests.ts
@@ -8,6 +8,7 @@ import {
   CONFIG
 } from '../initializers'
 import { PodInstance } from '../models'
+import { PodSignature } from '../../shared'
 import { sign } from './peertube-crypto'
 
 type MakeRetryRequestParams = {
@@ -33,45 +34,52 @@ type MakeSecureRequestParams = {
   method: 'GET'|'POST'
   toPod: PodInstance
   path: string
-  sign: boolean
   data?: Object
 }
 function makeSecureRequest (params: MakeSecureRequestParams) {
   return new Promise<{ response: request.RequestResponse, body: any }>((res, rej) => {
-    const requestParams = {
+    const requestParams: {
+      url: string,
+      json: {
+        signature: PodSignature,
+        data: any
+      }
+    } = {
       url: REMOTE_SCHEME.HTTP + '://' + params.toPod.host + params.path,
-      json: {}
+      json: {
+        signature: null,
+        data: null
+      }
     }
 
     if (params.method !== 'POST') {
       return rej(new Error('Cannot make a secure request with a non POST method.'))
     }
 
-    // Add signature if it is specified in the params
-    if (params.sign === true) {
-      const host = CONFIG.WEBSERVER.HOST
+    const host = CONFIG.WEBSERVER.HOST
 
-      let dataToSign
-      if (params.data) {
-        dataToSign = params.data
-      } else {
-        // We do not have data to sign so we just take our host
-        // It is not ideal but the connection should be in HTTPS
-        dataToSign = host
-      }
+    let dataToSign
+    if (params.data) {
+      dataToSign = params.data
+    } else {
+      // We do not have data to sign so we just take our host
+      // It is not ideal but the connection should be in HTTPS
+      dataToSign = host
+    }
 
-      requestParams.json['signature'] = {
+    sign(dataToSign).then(signature => {
+      requestParams.json.signature = {
         host, // Which host we pretend to be
-        signature: sign(dataToSign)
+        signature
       }
-    }
 
-    // If there are data informations
-    if (params.data) {
-      requestParams.json['data'] = params.data
-    }
+      // If there are data informations
+      if (params.data) {
+        requestParams.json.data = params.data
+      }
 
-    request.post(requestParams, (err, response, body) => err ? rej(err) : res({ response, body }))
+      request.post(requestParams, (err, response, body) => err ? rej(err) : res({ response, body }))
+    })
   })
 }