From 87f63d07fc335f342b10ec3c9d7b2971c2d6a47e Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 13 Apr 2022 16:52:37 +1000 Subject: [PATCH] Fixes for users --- app/Traits/GenerateMigrationResources.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Traits/GenerateMigrationResources.php b/app/Traits/GenerateMigrationResources.php index c2ea77dcaf6a..8f848077fe1c 100644 --- a/app/Traits/GenerateMigrationResources.php +++ b/app/Traits/GenerateMigrationResources.php @@ -531,12 +531,12 @@ trait GenerateMigrationResources 'first_name' => $user->first_name ?: '', 'last_name' => $user->last_name ?: '', 'phone' => $user->phone ?: '', - 'email' => $user->username, + 'email' => str_contains($user->username, "@") ? $user->username : $user->email, 'confirmation_code' => $user->confirmation_code, 'failed_logins' => $user->failed_logins, 'referral_code' => $user->referral_code, - 'oauth_user_id' => $user->oauth_user_id, - 'oauth_provider_id' => $user->oauth_provider_id, + // 'oauth_user_id' => $user->oauth_user_id, + // 'oauth_provider_id' => $user->oauth_provider_id, 'google_2fa_secret' => '', 'accepted_terms_version' => $user->accepted_terms_version, 'password' => $user->password,