extern/2FAuth
1
0
Fork 0
mirror of https://github.com/Bubka/2FAuth.git synced 2025-08-09 05:54:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix user registration via SSO with existing email and name

Browse Source
This commit is contained in:
Bubka
2023-12-14 15:39:14 +01:00
parent dd536f38ba
commit c5d173f45c
3 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/Http/Controllers/Auth/SocialiteController.php
View File

@ -42,6 +42,10 @@ class SocialiteController extends Controller
return redirect('/error?err=sso_failed');
}
$uniqueName = $socialiteUser->getId() . '@' . $driver;
$socialiteEmail = $socialiteUser->getEmail() ?? $uniqueName;
$socialiteName = ($socialiteUser->getNickname() ?? $socialiteUser->getName()) . ' (' . $uniqueName . ')';
/** @var User|null $user */
$user = User::firstOrNew([
'oauth_id' => $socialiteUser->getId(),
@ -49,17 +53,20 @@ class SocialiteController extends Controller
]);
if (! $user->exists) {
if (User::count() === 0) {
if (User::where('email', $socialiteEmail)->exists()) {
return redirect('/error?err=sso_email_already_used');
}
else if (User::count() === 0) {
$user->is_admin = true;
}
else if (Settings::get('disableRegistration')) {
return redirect('/error?err=no_register');
return redirect('/error?err=sso_no_register');
}
$user->password = bcrypt(Str::random());
}
$user->email = $socialiteUser->getEmail() ?? $socialiteUser->getId() . '@' . $driver;
$user->name = $socialiteUser->getNickname() ?? $socialiteUser->getName() ?? $driver . ' #' . $socialiteUser->getId();
$user->email = $socialiteEmail;
$user->name = $socialiteName;
$user->last_seen_at = Carbon::now()->format('Y-m-d H:i:s');
$user->save();