Cleanup tests imports

[oweals/peertube.git] / server / lib / user.ts

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 51050de9b2a927a7fcb3f238d7f5f3f95680b71a..29d6d087d1bbde1821815a863f738f0de793d8be 100644 (file)
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,4 +1,5 @@
 import * as Sequelize from 'sequelize'
+import * as uuidv4 from 'uuid/v4'
 import { ActivityPubActorType } from '../../shared/models/activitypub'
 import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../initializers'
 import { AccountModel } from '../models/account/account'
@@ -6,6 +7,8 @@ import { UserModel } from '../models/account/user'
 import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
 import { createVideoChannel } from './video-channel'
 import { VideoChannelModel } from '../models/video/video-channel'
+import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model'
+import { ActorModel } from '../models/activitypub/actor'
 
 async function createUserAccountAndChannel (userToCreate: UserModel, validateUser = true) {
   const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
@@ -15,10 +18,18 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse
     }
 
     const userCreated = await userToCreate.save(userOptions)
-    const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
+    const accountCreated = await createLocalAccountWithoutKeys(userCreated.username, userCreated.id, null, t)
+    userCreated.Account = accountCreated
 
-    const videoChannelDisplayName = `Default ${userCreated.username} channel`
+    let channelName = userCreated.username + '_channel'
+
+    // Conflict, generate uuid instead
+    const actor = await ActorModel.loadLocalByName(channelName)
+    if (actor) channelName = uuidv4()
+
+    const videoChannelDisplayName = `Main ${userCreated.username} channel`
     const videoChannelInfo = {
+      name: channelName,
       displayName: videoChannelDisplayName
     }
     const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
@@ -26,17 +37,22 @@ async function createUserAccountAndChannel (userToCreate: UserModel, validateUse
     return { user: userCreated, account: accountCreated, videoChannel }
   })
 
-  account.Actor = await setAsyncActorKeys(account.Actor)
-  videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
+  const [ accountKeys, channelKeys ] = await Promise.all([
+    setAsyncActorKeys(account.Actor),
+    setAsyncActorKeys(videoChannel.Actor)
+  ])
+
+  account.Actor = accountKeys
+  videoChannel.Actor = channelKeys
 
   return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
 }
 
 async function createLocalAccountWithoutKeys (
   name: string,
-  userId: number,
-  applicationId: number,
-  t: Sequelize.Transaction,
+  userId: number | null,
+  applicationId: number | null,
+  t: Sequelize.Transaction | undefined,
   type: ActivityPubActorType= 'Person'
 ) {
   const url = getAccountActivityPubUrl(name)
@@ -49,7 +65,7 @@ async function createLocalAccountWithoutKeys (
     userId,
     applicationId,
     actorId: actorInstanceCreated.id
-  })
+  } as FilteredModelAttributes<AccountModel>)
 
   const accountInstanceCreated = await accountInstance.save({ transaction: t })
   accountInstanceCreated.Actor = actorInstanceCreated