X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=2ea7481e8152b09ce9fc11ff75bd178951ed9e89;hb=81e504b34e71e91633442c8021e05f9cd52a49c6;hp=8609e72d8ea1611b86347719f2e8b53544810e61;hpb=72c7248b6fdcdb2175e726ff51b42e7555f2bd84;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 8609e72d8..2ea7481e8 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,46 +1,73 @@
-import { database as db } from '../initializers'
-import { UserInstance } from '../models'
-import { addVideoAuthorToFriends } from './friends'
+import * as Sequelize from 'sequelize'
+import { ActivityPubActorType } from '../../shared/models/activitypub'
+import { sequelizeTypescript, SERVER_ACTOR_NAME } from '../initializers'
+import { AccountModel } from '../models/account/account'
+import { UserModel } from '../models/account/user'
+import { buildActorInstance, getAccountActivityPubUrl, setAsyncActorKeys } from './activitypub'
 import { createVideoChannel } from './video-channel'
 
-function createUserAuthorAndChannel (user: UserInstance, validateUser = true) {
-  return db.sequelize.transaction(t => {
+async function createUserAccountAndChannel (userToCreate: UserModel, validateUser = true) {
+  const { user, account, videoChannel } = await sequelizeTypescript.transaction(async t => {
     const userOptions = {
       transaction: t,
       validate: validateUser
     }
 
-    return user.save(userOptions)
-      .then(user => {
-        const author = db.Author.build({
-          name: user.username,
-          podId: null, // It is our pod
-          userId: user.id
-        })
-
-        return author.save({ transaction: t })
-          .then(author => ({ author, user }))
-      })
-      .then(({ author, user }) => {
-        const remoteVideoAuthor = author.toAddRemoteJSON()
-
-        // Now we'll add the video channel's meta data to our friends
-        return addVideoAuthorToFriends(remoteVideoAuthor, t)
-          .then(() => ({ author, user }))
-      })
-      .then(({ author, user }) => {
-        const videoChannelInfo = {
-          name: `Default ${user.username} channel`
-        }
-
-        return createVideoChannel(videoChannelInfo, author, t)
-          .then(videoChannel => ({ author, user, videoChannel }))
-      })
+    const userCreated = await userToCreate.save(userOptions)
+    const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
+
+    const videoChannelName = `Default ${userCreated.username} channel`
+    const videoChannelInfo = {
+      name: videoChannelName
+    }
+    const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
+
+    return { user: userCreated, account: accountCreated, videoChannel }
+  })
+
+  account.Actor = await setAsyncActorKeys(account.Actor)
+  videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
+
+  return { user, account, videoChannel }
+}
+
+async function createLocalAccountWithoutKeys (
+  name: string,
+  userId: number,
+  applicationId: number,
+  t: Sequelize.Transaction,
+  type: ActivityPubActorType= 'Person'
+) {
+  const url = getAccountActivityPubUrl(name)
+
+  const actorInstance = buildActorInstance(type, url, name)
+  const actorInstanceCreated = await actorInstance.save({ transaction: t })
+
+  const accountInstance = new AccountModel({
+    name,
+    userId,
+    applicationId,
+    actorId: actorInstanceCreated.id
   })
+
+  const accountInstanceCreated = await accountInstance.save({ transaction: t })
+  accountInstanceCreated.Actor = actorInstanceCreated
+
+  return accountInstanceCreated
+}
+
+async function createApplicationActor (applicationId: number) {
+  const accountCreated = await createLocalAccountWithoutKeys(SERVER_ACTOR_NAME, null, applicationId, undefined, 'Application')
+
+  accountCreated.Actor = await setAsyncActorKeys(accountCreated.Actor)
+
+  return accountCreated
 }
 
 // ---------------------------------------------------------------------------
 
 export {
-  createUserAuthorAndChannel
+  createApplicationActor,
+  createUserAccountAndChannel,
+  createLocalAccountWithoutKeys
 }