mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-10 08:44:49 +00:00
Merge pull request #1446 from pixelfed/frontend-ui-refactor
Update AuthLogin listener
This commit is contained in:
commit
bdb809ac2c
1 changed files with 23 additions and 20 deletions
|
@ -42,25 +42,26 @@ class AuthLogin
|
||||||
{
|
{
|
||||||
if (empty($user->profile)) {
|
if (empty($user->profile)) {
|
||||||
DB::transaction(function() use($user) {
|
DB::transaction(function() use($user) {
|
||||||
$profile = new Profile();
|
$profile = Profile::firstOrCreate(['user_id' => $user->id]);
|
||||||
$profile->user_id = $user->id;
|
if($profile->wasRecentlyCreated == true) {
|
||||||
$profile->username = $user->username;
|
$profile->username = $user->username;
|
||||||
$profile->name = $user->name;
|
$profile->name = $user->name;
|
||||||
$pkiConfig = [
|
$pkiConfig = [
|
||||||
'digest_alg' => 'sha512',
|
'digest_alg' => 'sha512',
|
||||||
'private_key_bits' => 2048,
|
'private_key_bits' => 2048,
|
||||||
'private_key_type' => OPENSSL_KEYTYPE_RSA,
|
'private_key_type' => OPENSSL_KEYTYPE_RSA,
|
||||||
];
|
];
|
||||||
$pki = openssl_pkey_new($pkiConfig);
|
$pki = openssl_pkey_new($pkiConfig);
|
||||||
openssl_pkey_export($pki, $pki_private);
|
openssl_pkey_export($pki, $pki_private);
|
||||||
$pki_public = openssl_pkey_get_details($pki);
|
$pki_public = openssl_pkey_get_details($pki);
|
||||||
$pki_public = $pki_public['key'];
|
$pki_public = $pki_public['key'];
|
||||||
|
|
||||||
$profile->private_key = $pki_private;
|
$profile->private_key = $pki_private;
|
||||||
$profile->public_key = $pki_public;
|
$profile->public_key = $pki_public;
|
||||||
$profile->save();
|
$profile->save();
|
||||||
|
|
||||||
CreateAvatar::dispatch($profile);
|
CreateAvatar::dispatch($profile);
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -114,7 +115,7 @@ class AuthLogin
|
||||||
return UserDevice::firstOrCreate([
|
return UserDevice::firstOrCreate([
|
||||||
'user_id' => $user->id,
|
'user_id' => $user->id,
|
||||||
'ip' => request()->ip(),
|
'ip' => request()->ip(),
|
||||||
'user_agent' => request()->userAgent(),
|
'user_agent' => str_limit(request()->userAgent(), 180),
|
||||||
]);
|
]);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -124,8 +125,10 @@ class AuthLogin
|
||||||
if($user->profile_id == null) {
|
if($user->profile_id == null) {
|
||||||
DB::transaction(function() use($user) {
|
DB::transaction(function() use($user) {
|
||||||
$profile = $user->profile;
|
$profile = $user->profile;
|
||||||
$user->profile_id = $profile->id;
|
if($profile) {
|
||||||
$user->save();
|
$user->profile_id = $profile->id;
|
||||||
|
$user->save();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue