From 1f20622f2b087eaf8738d60fae00a44b9c558ca3 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 7 Jun 2019 16:59:53 +0200 Subject: Improve registration * Add ability to set the user display name * Use display name to guess the username/channel name * Add explanations about what is the purpose of a username/channel name * Add a loader at the "done" step --- server/initializers/installer.ts | 2 +- server/initializers/migrations/0100-activitypub.ts | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'server/initializers') diff --git a/server/initializers/installer.ts b/server/initializers/installer.ts index e14554ede..cb58454cb 100644 --- a/server/initializers/installer.ts +++ b/server/initializers/installer.ts @@ -146,7 +146,7 @@ async function createOAuthAdminIfNotExist () { } const user = new UserModel(userData) - await createUserAccountAndChannelAndPlaylist(user, undefined, validatePassword) + await createUserAccountAndChannelAndPlaylist({ userToCreate: user, channelNames: undefined, validateUser: validatePassword }) logger.info('Username: ' + username) logger.info('User password: ' + password) } diff --git a/server/initializers/migrations/0100-activitypub.ts b/server/initializers/migrations/0100-activitypub.ts index 2880a97d9..96d44a7ce 100644 --- a/server/initializers/migrations/0100-activitypub.ts +++ b/server/initializers/migrations/0100-activitypub.ts @@ -65,7 +65,12 @@ async function up (utils: { // Create application account { const applicationInstance = await ApplicationModel.findOne() - const accountCreated = await createLocalAccountWithoutKeys(SERVER_ACTOR_NAME, null, applicationInstance.id, undefined) + const accountCreated = await createLocalAccountWithoutKeys({ + name: SERVER_ACTOR_NAME, + userId: null, + applicationId: applicationInstance.id, + t: undefined + }) const { publicKey, privateKey } = await createPrivateAndPublicKeys() accountCreated.Actor.publicKey = publicKey @@ -83,7 +88,7 @@ async function up (utils: { // Recreate accounts for each user const users = await db.User.findAll() for (const user of users) { - const account = await createLocalAccountWithoutKeys(user.username, user.id, null, undefined) + const account = await createLocalAccountWithoutKeys({ name: user.username, userId: user.id, applicationId: null, t: undefined }) const { publicKey, privateKey } = await createPrivateAndPublicKeys() account.Actor.publicKey = publicKey -- cgit v1.2.3