GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DB] Remove unique constraint from GSActor.nickname and fix register and related functionality

Browse Source
This commit is contained in:
Hugo Sales
2021-04-11 11:03:32 +00:00
parent 68de1b09b1
commit faa362e2e2
6 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Controller/Security.php
View File

@@ -14,7 +14,9 @@ use App\Entity\Note;
use App\Security\Authenticator;
use App\Security\EmailVerifier;
use app\Util\Common;
use App\Util\Exception\NicknameTakenException;
use App\Util\Nickname;
use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
use Symfony\Component\Form\Extension\Core\Type\EmailType;
use Symfony\Component\Form\Extension\Core\Type\PasswordType;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
@@ -89,18 +91,22 @@ class Security extends Controller
$valid_nickname = Nickname::normalize($data['nickname'], check_already_used: true);
$actor = GSActor::create(['nickname' => $data['nickname']]);
DB::persist($actor);
DB::flush();
$id = $actor->getId();
$user = LocalUser::create([
'id' => $id,
'nickname' => $data['nickname'],
'outgoing_email' => $data['email'],
'incoming_email' => $data['email'],
'password' => LocalUser::hashPassword($data['password']),
]);
DB::persist($user);
try {
$actor = GSActor::create(['nickname' => $data['nickname']]);
DB::persist($actor);
DB::flush();
$id = $actor->getId();
$user = LocalUser::create([
'id' => $id,
'nickname' => $data['nickname'],
'outgoing_email' => $data['email'],
'incoming_email' => $data['email'],
'password' => LocalUser::hashPassword($data['password']),
]);
DB::persist($user);
} catch (UniqueConstraintViolationException $e) {
throw new NicknameTakenException;
}
// generate a signed url and email it to the user
if (Common::config('site', 'use_email')) {