X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Finitializers%2Finstaller.ts;h=0517e00840725ad33926d58b5db3aedff4949746;hb=01dd04cd5ab7b55d2a9af7d0ebf405bee9579b09;hp=676f88653359e700784bf15ae208b34799561819;hpb=eb34ec30e0b57286fc6f85160490d2e973a3b0b1;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index 676f88653..0517e0084 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -1,15 +1,14 @@ -import * as passwordGenerator from 'password-generator' -import { UserRole } from '../../shared' +import { ensureDir, remove } from 'fs-extra' +import passwordGenerator from 'password-generator' +import { UserRole } from '@shared/models' import { logger } from '../helpers/logger' -import { createApplicationActor, createUserAccountAndChannelAndPlaylist } from '../lib/user' -import { UserModel } from '../models/user/user' +import { buildUser, createApplicationActor, createUserAccountAndChannelAndPlaylist } from '../lib/user' import { ApplicationModel } from '../models/application/application' import { OAuthClientModel } from '../models/oauth/oauth-client' import { applicationExist, clientsExist, usersExist } from './checker-after-init' +import { CONFIG } from './config' import { FILES_CACHE, HLS_STREAMING_PLAYLIST_DIRECTORY, LAST_MIGRATION_VERSION, RESUMABLE_UPLOAD_DIRECTORY } from './constants' import { sequelizeTypescript } from './database' -import { ensureDir, remove } from 'fs-extra' -import { CONFIG } from './config' async function installApplication () { try { @@ -137,17 +136,15 @@ async function createOAuthAdminIfNotExist () { password = passwordGenerator(16, true) } - const userData = { + const user = buildUser({ username, email, password, role, - verified: true, - nsfwPolicy: CONFIG.INSTANCE.DEFAULT_NSFW_POLICY, + emailVerified: true, videoQuota: -1, videoQuotaDaily: -1 - } - const user = new UserModel(userData) + }) await createUserAccountAndChannelAndPlaylist({ userToCreate: user, channelNames: undefined, validateUser: validatePassword }) logger.info('Username: ' + username)