Add check for the author username length

[github/Chocobozzz/PeerTube.git] / server / initializers / installer.js

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index 750eb2c5927d3072adf1adf123e3aabaa182b829..53b07903c3b46af6a1cc1f5170e35f82c9d1f026 100644 (file)
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -3,6 +3,7 @@
 const async = require('async')
 const config = require('config')
 const mkdirp = require('mkdirp')
+const passwordGenerator = require('password-generator')
 const path = require('path')
 
 const checker = require('./checker')
@@ -15,21 +16,23 @@ const installer = {
 }
 
 function installApplication (callback) {
-  // Creates directories
-  createDirectoriesIfNotExist(function (err) {
-    if (err) return callback(err)
-
-    // ----------- Create the certificates if they don't already exist -----------
-    peertubeCrypto.createCertsIfNotExist(function (err) {
-      if (err) return callback(err)
-
-      createOAuthClientIfNotExist(function (err) {
-        if (err) return callback(err)
-
-        createOAuthUserIfNotExist(callback)
-      })
-    })
-  })
+  async.series([
+    function createDirectories (callbackAsync) {
+      createDirectoriesIfNotExist(callbackAsync)
+    },
+
+    function createCertificates (callbackAsync) {
+      peertubeCrypto.createCertsIfNotExist(callbackAsync)
+    },
+
+    function createOAuthClient (callbackAsync) {
+      createOAuthClientIfNotExist(callbackAsync)
+    },
+
+    function createOAuthUser (callbackAsync) {
+      createOAuthUserIfNotExist(callbackAsync)
+    }
+  ], callback)
 }
 
 // ---------------------------------------------------------------------------
@@ -56,13 +59,12 @@ function createOAuthClientIfNotExist (callback) {
 
     logger.info('Creating a default OAuth Client.')
 
-    // TODO: generate password
-    const password = 'megustalabanana'
-    Users.createClient(password, [ 'password' ], function (err, id) {
+    const secret = passwordGenerator(32, false)
+    Users.createClient(secret, [ 'password' ], function (err, id) {
       if (err) return callback(err)
 
       logger.info('Client id: ' + id)
-      logger.info('Client password: ' + password)
+      logger.info('Client secret: ' + secret)
 
       return callback(null)
     })
@@ -78,9 +80,8 @@ function createOAuthUserIfNotExist (callback) {
 
     logger.info('Creating the administrator.')
 
-    // TODO: generate password
-    const username = 'admin'
-    const password = 'nomegustalabanana'
+    const username = 'root'
+    const password = passwordGenerator(8, true)
 
     Users.createUser(username, password, function (err) {
       if (err) return callback(err)