From 571389d43b8fc8aaf27e77c06f19b320b08dbbc9 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Fri, 10 Nov 2017 17:27:49 +0100
Subject: Make it compile at least

---
 server/initializers/installer.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

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

diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts
index c8f6b3bc2..c617b16c9 100644
--- a/server/initializers/installer.ts
+++ b/server/initializers/installer.ts
@@ -1,20 +1,21 @@
 import * as passwordGenerator from 'password-generator'
-import * as Bluebird from 'bluebird'
+import { UserRole } from '../../shared'
+import { logger, mkdirpPromise, rimrafPromise } from '../helpers'
+import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
+import { createUserAccountAndChannel } from '../lib'
+import { clientsExist, usersExist } from './checker'
+import { CACHE, CONFIG, LAST_MIGRATION_VERSION } from './constants'
 
 import { database as db } from './database'
-import { CONFIG, LAST_MIGRATION_VERSION, CACHE } from './constants'
-import { clientsExist, usersExist } from './checker'
-import { logger, createCertsIfNotExist, mkdirpPromise, rimrafPromise } from '../helpers'
-import { createUserAccountAndChannel } from '../lib'
-import { UserRole } from '../../shared'
+import { createLocalAccount } from '../lib/user'
 
 async function installApplication () {
   await db.sequelize.sync()
   await removeCacheDirectories()
   await createDirectoriesIfNotExist()
-  await createCertsIfNotExist()
   await createOAuthClientIfNotExist()
   await createOAuthAdminIfNotExist()
+  await createApplicationIfNotExist()
 }
 
 // ---------------------------------------------------------------------------
@@ -28,7 +29,7 @@ export {
 function removeCacheDirectories () {
   const cacheDirectories = CACHE.DIRECTORIES
 
-  const tasks: Bluebird<any>[] = []
+  const tasks: Promise<any>[] = []
 
   // Cache directories
   for (const key of Object.keys(cacheDirectories)) {
@@ -120,7 +121,12 @@ async function createOAuthAdminIfNotExist () {
   await createUserAccountAndChannel(user, validatePassword)
   logger.info('Username: ' + username)
   logger.info('User password: ' + password)
+}
 
+async function createApplicationIfNotExist () {
   logger.info('Creating Application table.')
-  await db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION })
+  const applicationInstance = await db.Application.create({ migrationVersion: LAST_MIGRATION_VERSION })
+
+  logger.info('Creating application account.')
+  return createLocalAccount('peertube', null, applicationInstance.id, undefined)
 }
-- 
cgit v1.2.3