From fb2ca5dbe9d2071bedc9859eb4ae01841b4d93ee Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Wed, 4 Dec 2019 12:26:57 +1100
Subject: [PATCH] Fixes for OAuth (#3118)

---
 app/Http/Controllers/Auth/LoginController.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index f2dadb6bba77..a3f7e0091b2f 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -249,7 +249,7 @@ class LoginController extends BaseController
         if(request()->has('code'))
             return $this->handleProviderCallback($provider);
         else
-            return Socialite::driver($provider)->scopes('gmail.send')->redirect();
+            return Socialite::driver($provider)->scopes('https://www.googleapis.com/auth/gmail.send')->redirect();
     }
 
 
@@ -261,7 +261,7 @@ class LoginController extends BaseController
         if(request()->has('code'))
             return $this->handleProviderCallbackAndCreate($provider);
         else
-            return Socialite::driver($provider)->scopes('gmail.send')->redirectUrl($redirect_url)->redirect();
+            return Socialite::driver($provider)->scopes('https://www.googleapis.com/auth/gmail.send')->redirectUrl($redirect_url)->redirect();
 
         
     }
@@ -270,7 +270,10 @@ class LoginController extends BaseController
     
     public function handleProviderCallbackAndCreate(string $provider)
     {
+        $redirect_url = config('services.' . $provider . '.redirect') . '/create';
+
         $socialite_user = Socialite::driver($provider)
+                                    ->redirectUrl($redirect_url)
                                     ->stateless()
                                     ->user();
 
@@ -320,7 +323,11 @@ class LoginController extends BaseController
      */
     public function handleProviderCallback(string $provider) 
     {
+
+        $redirect_url = config('services.' . $provider . '.redirect');
+
         $socialite_user = Socialite::driver($provider)
+                                    ->redirectUrl($redirect_url)
                                     ->stateless()
                                     ->user();