1
0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-19 16:01:34 +02:00

Fixes for users

This commit is contained in:
David Bomba 2022-04-13 16:52:37 +10:00
parent cf69b439c0
commit 87f63d07fc

View File

@ -531,12 +531,12 @@ trait GenerateMigrationResources
'first_name' => $user->first_name ?: '', 'first_name' => $user->first_name ?: '',
'last_name' => $user->last_name ?: '', 'last_name' => $user->last_name ?: '',
'phone' => $user->phone ?: '', 'phone' => $user->phone ?: '',
'email' => $user->username, 'email' => str_contains($user->username, "@") ? $user->username : $user->email,
'confirmation_code' => $user->confirmation_code, 'confirmation_code' => $user->confirmation_code,
'failed_logins' => $user->failed_logins, 'failed_logins' => $user->failed_logins,
'referral_code' => $user->referral_code, 'referral_code' => $user->referral_code,
'oauth_user_id' => $user->oauth_user_id, // 'oauth_user_id' => $user->oauth_user_id,
'oauth_provider_id' => $user->oauth_provider_id, // 'oauth_provider_id' => $user->oauth_provider_id,
'google_2fa_secret' => '', 'google_2fa_secret' => '',
'accepted_terms_version' => $user->accepted_terms_version, 'accepted_terms_version' => $user->accepted_terms_version,
'password' => $user->password, 'password' => $user->password,