1 files changed, 24 insertions, 28 deletions

diff --git a/server/lib/user.ts b/server/lib/user.ts
index 8609e72d8..a92f4777b 100644
--- a/server/lib/user.ts
+++ b/server/lib/user.ts
@@ -3,40 +3,36 @@ import { UserInstance } from '../models'
 import { addVideoAuthorToFriends } from './friends'
 import { createVideoChannel } from './video-channel'
 
-function createUserAuthorAndChannel (user: UserInstance, validateUser = true) {
-  return db.sequelize.transaction(t => {
+async function createUserAuthorAndChannel (user: UserInstance, validateUser = true) {
+  const res = await db.sequelize.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 user.save(userOptions)
+    const authorInstance = db.Author.build({
+      name: userCreated.username,
+      podId: null, // It is our pod
+      userId: userCreated.id
+    })
+
+    const authorCreated = await authorInstance.save({ transaction: t })
+
+    const remoteVideoAuthor = authorCreated.toAddRemoteJSON()
+
+    // Now we'll add the video channel's meta data to our friends
+    const author = await addVideoAuthorToFriends(remoteVideoAuthor, t)
+
+    const videoChannelInfo = {
+      name: `Default ${userCreated.username} channel`
+    }
+    const videoChannel = await createVideoChannel(videoChannelInfo, authorCreated, t)
+
+    return { author, videoChannel }
   })
+
+  return res
 }
 
 // ---------------------------------------------------------------------------