Socialite callback test

src/App/Users/Actions/CreateNewUserAction.php

@@ -39,26 +39,26 @@ class CreateNewUserAction extends Controller
         $user = User::create([
             'password'       => ! $socialite_auth ? bcrypt($data['password']) : null,
             'oauth_provider' => $socialite_auth ? $data->oauth_provider : null,
-            'email'          => $data['email'],
+            'email'          => $data['email'] ?? $data->email,
         ]);
 
-        // Mark as verified if verification is disabled
-        if (! intval($settings['user_verification']) || $socialite_auth) {
-            $user->markEmailAsVerified();
-        }
-
         UserSettings::unguard();
 
         $user
             ->settings()
             ->create([
-                'name'             => $data['name'],
+                'name'             => $data['name'] ?? $data->name,
                 'storage_capacity' => $settings['storage_default'],
                 'avatar'           => $data->avatar ? $data->avatar : null,
             ]);
 
         UserSettings::reguard();
 
+        // Mark as verified if verification is disabled
+        if (! intval($settings['user_verification']) || $socialite_auth) {
+            $user->markEmailAsVerified();
+        }
+
         event(new Registered($user));
 
         // Log in if verification is disabled

src/App/Users/Controllers/Authentication/SocialiteAuthenticationController.php

@@ -21,13 +21,17 @@ class SocialiteAuthenticationController extends Controller
 
        return response()->json([
            'url' => $url
-       ], 200);
+       ]);
     }
 
     public function callback($provider)
     {
         // Get socialite user
-        $provider_user = Socialite::driver($provider)->stateless()->user();
+        if (app()->runningInConsole()) {
+            $provider_user = Socialite::driver($provider)->user();
+        } else {
+            $provider_user = Socialite::driver($provider)->stateless()->user();
+        }
 
         // Check if user exist already
         $user = User::whereEmail($provider_user->email)->first();

src/Support/helpers.php

@@ -3,6 +3,7 @@
 use Carbon\Carbon;
 use ByteUnits\Metric;
 use App\Users\Models\User;
+use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Domain\Sharing\Models\Share;
@@ -1012,7 +1013,8 @@ if(! function_exists('get_socialite_avatar')) {
      */
     function store_socialite_avatar($avatar)
     {
-        $image = file_get_contents($avatar);
+        // Get image from external source
+        $image = Http::get($avatar)->body();
 
         // Generate avatar name
         $avatar_name = Str::uuid() . '.jpg';