X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Finstaller.js;h=fb63b81ac64c1e962446bc4adf283c60f4d6836e;hb=5d67f289df4a68e35ad7e0af3c601c7db0dc7586;hp=53b07903c3b46af6a1cc1f5170e35f82c9d1f026;hpb=cefc718dd6b6c0adafbb1e7de122217cffa25cd0;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index 53b07903c..fb63b81ac 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -1,22 +1,29 @@
 'use strict'
 
-const async = require('async')
 const config = require('config')
+const each = require('async/each')
 const mkdirp = require('mkdirp')
 const passwordGenerator = require('password-generator')
 const path = require('path')
+const series = require('async/series')
 
 const checker = require('./checker')
+const constants = require('./constants')
+const db = require('./database')
 const logger = require('../helpers/logger')
-const peertubeCrypto = require('../helpers/peertubeCrypto')
-const Users = require('../models/users')
+const peertubeCrypto = require('../helpers/peertube-crypto')
 
 const installer = {
-  installApplication: installApplication
+  installApplication
 }
 
 function installApplication (callback) {
-  async.series([
+  series([
+    function createDatabase (callbackAsync) {
+      db.sequelize.sync().asCallback(callbackAsync)
+      // db.sequelize.sync({ force: true }).asCallback(callbackAsync)
+    },
+
     function createDirectories (callbackAsync) {
       createDirectoriesIfNotExist(callbackAsync)
     },
@@ -30,7 +37,7 @@ function installApplication (callback) {
     },
 
     function createOAuthUser (callbackAsync) {
-      createOAuthUserIfNotExist(callbackAsync)
+      createOAuthAdminIfNotExist(callbackAsync)
     }
   ], callback)
 }
@@ -44,7 +51,7 @@ module.exports = installer
 function createDirectoriesIfNotExist (callback) {
   const storages = config.get('storage')
 
-  async.each(Object.keys(storages), function (key, callbackEach) {
+  each(Object.keys(storages), function (key, callbackEach) {
     const dir = storages[key]
     mkdirp(path.join(__dirname, '..', '..', dir), callbackEach)
   }, callback)
@@ -59,19 +66,26 @@ function createOAuthClientIfNotExist (callback) {
 
     logger.info('Creating a default OAuth Client.')
 
-    const secret = passwordGenerator(32, false)
-    Users.createClient(secret, [ 'password' ], function (err, id) {
+    const id = passwordGenerator(32, false, /[a-z0-9]/)
+    const secret = passwordGenerator(32, false, /[a-zA-Z0-9]/)
+    const client = db.OAuthClient.build({
+      clientId: id,
+      clientSecret: secret,
+      grants: [ 'password', 'refresh_token' ]
+    })
+
+    client.save().asCallback(function (err, createdClient) {
       if (err) return callback(err)
 
-      logger.info('Client id: ' + id)
-      logger.info('Client secret: ' + secret)
+      logger.info('Client id: ' + createdClient.clientId)
+      logger.info('Client secret: ' + createdClient.clientSecret)
 
       return callback(null)
     })
   })
 }
 
-function createOAuthUserIfNotExist (callback) {
+function createOAuthAdminIfNotExist (callback) {
   checker.usersExist(function (err, exist) {
     if (err) return callback(err)
 
@@ -81,15 +95,38 @@ function createOAuthUserIfNotExist (callback) {
     logger.info('Creating the administrator.')
 
     const username = 'root'
-    const password = passwordGenerator(8, true)
+    const role = constants.USER_ROLES.ADMIN
+    const createOptions = {}
+    let password = ''
+
+    // Do not generate a random password for tests
+    if (process.env.NODE_ENV === 'test') {
+      password = 'test'
+
+      if (process.env.NODE_APP_INSTANCE) {
+        password += process.env.NODE_APP_INSTANCE
+      }
+
+      // Our password is weak so do not validate it
+      createOptions.validate = false
+    } else {
+      password = passwordGenerator(8, true)
+    }
+
+    const userData = {
+      username,
+      password,
+      role
+    }
 
-    Users.createUser(username, password, function (err) {
+    db.User.create(userData, createOptions).asCallback(function (err, createdUser) {
       if (err) return callback(err)
 
       logger.info('Username: ' + username)
       logger.info('User password: ' + password)
 
-      return callback(null)
+      logger.info('Creating Application table.')
+      db.Application.create({ migrationVersion: constants.LAST_MIGRATION_VERSION }).asCallback(callback)
     })
   })
 }