X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=51050de9b2a927a7fcb3f238d7f5f3f95680b71a;hb=08c1efbe32244c321de28b0f2a6aaa3f99f46b58;hp=9884e566f9f5ea0a69bd0db44dd0eb8f5322f125;hpb=608624252466acf9f1d9ee1c1170bd4fe4d18d18;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 9884e566f..51050de9b 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,60 +1,74 @@
 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 { 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'
+import { VideoChannelModel } from '../models/video/video-channel'
 
-async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
-  const res = await db.sequelize.transaction(async t => {
+async function createUserAccountAndChannel (userToCreate: UserModel, validateUser = true) {
+  const { user, account, videoChannel } = await sequelizeTypescript.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 userCreated = await userToCreate.save(userOptions)
+    const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
 
-    const videoChannelName = `Default ${userCreated.username} channel`
+    const videoChannelDisplayName = `Default ${userCreated.username} channel`
     const videoChannelInfo = {
-      name: videoChannelName
+      displayName: videoChannelDisplayName
     }
     const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
 
-    return { account: accountCreated, videoChannel }
+    return { user: userCreated, account: accountCreated, videoChannel }
   })
 
-  return res
+  account.Actor = await setAsyncActorKeys(account.Actor)
+  videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
+
+  return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
 }
 
-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,
+  type: ActivityPubActorType= 'Person'
+) {
+  const url = getAccountActivityPubUrl(name)
+
+  const actorInstance = buildActorInstance(type, url, name)
+  const actorInstanceCreated = await actorInstance.save({ transaction: t })
 
-  const accountInstance = db.Account.build({
+  const accountInstance = new AccountModel({
     name,
-    url,
-    publicKey,
-    privateKey,
-    followersCount: 0,
-    followingCount: 0,
-    inboxUrl: url + '/inbox',
-    outboxUrl: url + '/outbox',
-    sharedInboxUrl: CONFIG.WEBSERVER.URL + '/inbox',
-    followersUrl: url + '/followers',
-    followingUrl: url + '/following',
     userId,
     applicationId,
-    serverId: null // It is our server
+    actorId: actorInstanceCreated.id
   })
 
-  return accountInstance.save({ transaction: t })
+  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 {
+  createApplicationActor,
   createUserAccountAndChannel,
-  createLocalAccount
+  createLocalAccountWithoutKeys
 }