From 9bd2662976a75d3b03364cdbe6419e57c80f99a6 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 4 Aug 2016 22:32:36 +0200
Subject: Implement user API (create, update, remove, list)

---
 server/initializers/installer.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'server/initializers/installer.js')

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index 32830d4da..c12187871 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -9,6 +9,7 @@ const path = require('path')
 const series = require('async/series')
 
 const checker = require('./checker')
+const constants = require('./constants')
 const logger = require('../helpers/logger')
 const peertubeCrypto = require('../helpers/peertube-crypto')
 
@@ -34,7 +35,7 @@ function installApplication (callback) {
     },
 
     function createOAuthUser (callbackAsync) {
-      createOAuthUserIfNotExist(callbackAsync)
+      createOAuthAdminIfNotExist(callbackAsync)
     }
   ], callback)
 }
@@ -80,7 +81,7 @@ function createOAuthClientIfNotExist (callback) {
   })
 }
 
-function createOAuthUserIfNotExist (callback) {
+function createOAuthAdminIfNotExist (callback) {
   checker.usersExist(function (err, exist) {
     if (err) return callback(err)
 
@@ -90,6 +91,7 @@ function createOAuthUserIfNotExist (callback) {
     logger.info('Creating the administrator.')
 
     const username = 'root'
+    const role = constants.USER_ROLES.ADMIN
     let password = ''
 
     // Do not generate a random password for tests
@@ -105,7 +107,8 @@ function createOAuthUserIfNotExist (callback) {
 
     const user = new User({
       username: username,
-      password: password
+      password: password,
+      role: role
     })
 
     user.save(function (err, createdUser) {
-- 
cgit v1.2.3


From 26d7d31ba3b1d26ea9a51e8626e4a4537867db94 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 25 Aug 2016 17:57:37 +0200
Subject: Server: encrypt password in database

---
 server/initializers/installer.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'server/initializers/installer.js')

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index c12187871..974402094 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -114,8 +114,8 @@ function createOAuthAdminIfNotExist (callback) {
     user.save(function (err, createdUser) {
       if (err) return callback(err)
 
-      logger.info('Username: ' + createdUser.username)
-      logger.info('User password: ' + createdUser.password)
+      logger.info('Username: ' + username)
+      logger.info('User password: ' + password)
 
       return callback(null)
     })
-- 
cgit v1.2.3


From f6a0754fdacf9b890292f1efc62a9035bceb454a Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Mon, 26 Sep 2016 23:10:32 +0200
Subject: Server: fix migration at installation

---
 server/initializers/installer.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'server/initializers/installer.js')

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index 974402094..8c3148e79 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -13,6 +13,7 @@ const constants = require('./constants')
 const logger = require('../helpers/logger')
 const peertubeCrypto = require('../helpers/peertube-crypto')
 
+const Application = mongoose.model('Application')
 const Client = mongoose.model('OAuthClient')
 const User = mongoose.model('User')
 
@@ -117,7 +118,9 @@ function createOAuthAdminIfNotExist (callback) {
       logger.info('Username: ' + username)
       logger.info('User password: ' + password)
 
-      return callback(null)
+      logger.info('Creating Application collection.')
+      const application = new Application({ mongoSchemaVersion: constants.LAST_MONGO_SCHEMA_VERSION })
+      application.save(callback)
     })
   })
 }
-- 
cgit v1.2.3


From c4403b29ad4db097af528a7f04eea07e0ed320d0 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 2 Oct 2016 12:19:02 +0200
Subject: Server: remove useless hash affectations

---
 server/initializers/installer.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'server/initializers/installer.js')

diff --git a/server/initializers/installer.js b/server/initializers/installer.js
index 8c3148e79..1df300ba8 100644
--- a/server/initializers/installer.js
+++ b/server/initializers/installer.js
@@ -18,7 +18,7 @@ const Client = mongoose.model('OAuthClient')
 const User = mongoose.model('User')
 
 const installer = {
-  installApplication: installApplication
+  installApplication
 }
 
 function installApplication (callback) {
@@ -107,9 +107,9 @@ function createOAuthAdminIfNotExist (callback) {
     }
 
     const user = new User({
-      username: username,
-      password: password,
-      role: role
+      username,
+      password,
+      role
     })
 
     user.save(function (err, createdUser) {
-- 
cgit v1.2.3