X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Flib%2Fuser.ts;h=db29469eb39942df22702aa1af275751f79537c0;hb=601527d7953a83d6ad08dbb2ed8ac02851beaf1e;hp=2d7b36b4faae0e6dc380267ff78664db991df5c0;hpb=47e0652b4a98916d4a1d012fbec61afd73a30565;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 2d7b36b4f..db29469eb 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -1,66 +1,85 @@
 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 * as uuidv4 from 'uuid/v4'
+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 { logger } from '../helpers/logger'
+import { VideoChannelModel } from '../models/video/video-channel'
+import { FilteredModelAttributes } from 'sequelize-typescript/lib/models/Model'
+import { ActorModel } from '../models/activitypub/actor'
 
-async function createUserAccountAndChannel (user: UserInstance, validateUser = true) {
-  const { account, videoChannel } = 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 createLocalAccountWithoutKeys(user.username, user.id, null, t)
+    const userCreated = await userToCreate.save(userOptions)
+    const accountCreated = await createLocalAccountWithoutKeys(userToCreate.username, userToCreate.id, null, t)
+    userCreated.Account = accountCreated
 
-    const videoChannelName = `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: videoChannelName
+      name: channelName,
+      displayName: videoChannelDisplayName
     }
     const videoChannel = await createVideoChannel(videoChannelInfo, accountCreated, t)
 
-    return { account: accountCreated, videoChannel }
+    return { user: userCreated, account: accountCreated, videoChannel }
   })
 
-  // 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))
+  account.Actor = await setAsyncActorKeys(account.Actor)
+  videoChannel.Actor = await setAsyncActorKeys(videoChannel.Actor)
 
-  return { account, videoChannel }
+  return { user, account, videoChannel } as { user: UserModel, account: AccountModel, videoChannel: VideoChannelModel }
 }
 
-async function createLocalAccountWithoutKeys (name: string, userId: number, applicationId: number, t: Sequelize.Transaction) {
-  const url = getActivityPubUrl('account', name)
+async function createLocalAccountWithoutKeys (
+  name: string,
+  userId: number | null,
+  applicationId: number | null,
+  t: Sequelize.Transaction | undefined,
+  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: null,
-    privateKey: null,
-    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
+  } as FilteredModelAttributes<AccountModel>)
+
+  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 accountInstance.save({ transaction: t })
+  return accountCreated
 }
 
 // ---------------------------------------------------------------------------
 
 export {
+  createApplicationActor,
   createUserAccountAndChannel,
   createLocalAccountWithoutKeys
 }