import * as Sequelize from 'sequelize'
-import { getActivityPubUrl } from '../helpers/activitypub'
import { createPrivateAndPublicKeys } from '../helpers/peertube-crypto'
import { database as db } from '../initializers'
import { CONFIG } from '../initializers/constants'
import { UserInstance } from '../models'
import { createVideoChannel } from './video-channel'
+import { logger } from '../helpers/logger'
+import { getAccountActivityPubUrl } from './activitypub/url'
async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
- const res = await db.sequelize.transaction(async t => {
+ const { account, videoChannel } = await db.sequelize.transaction(async t => {
const userOptions = {
transaction: t,
validate: validateUser
}
const userCreated = await user.save(userOptions)
- const accountCreated = await createLocalAccount(user.username, user.id, null, t)
+ const accountCreated = await createLocalAccountWithoutKeys(user.username, user.id, null, t)
const videoChannelName = `Default ${userCreated.username} channel`
const videoChannelInfo = {
return { account: accountCreated, videoChannel }
})
- return res
+ // Set account keys, this could be long so process after the account creation and do not block the client
+ const { publicKey, privateKey } = await createPrivateAndPublicKeys()
+ account.set('publicKey', publicKey)
+ account.set('privateKey', privateKey)
+ account.save().catch(err => logger.error('Cannot set public/private keys of local account %d.', account.id, err))
+
+ return { account, videoChannel }
}
-async function createLocalAccount (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
- const { publicKey, privateKey } = await createPrivateAndPublicKeys()
- const url = getActivityPubUrl('account', name)
+async function createLocalAccountWithoutKeys (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
+ const url = getAccountActivityPubUrl(name)
const accountInstance = db.Account.build({
name,
url,
- publicKey,
- privateKey,
+ publicKey: null,
+ privateKey: null,
followersCount: 0,
followingCount: 0,
inboxUrl: url + '/inbox',
export {
createUserAccountAndChannel,
- createLocalAccount
+ createLocalAccountWithoutKeys
}