Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-10 21:22:58 +01:00
Code Issues Releases Activity

Merge pull request #5873 from turbo124/v5-develop

Browse Source 
Gmail Oauth
This commit is contained in:
David Bomba 2021-06-01 15:25:01 +10:00 committed by GitHub
commit 97732d403f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/Http/Controllers/Auth/LoginController.php
View File

@ -490,7 +490,7 @@ class LoginController extends BaseController
if (request()->has('code')) { if (request()->has('code')) {
return $this->handleProviderCallback($provider); return $this->handleProviderCallback($provider);
} else { } else {
return Socialite::driver($provider)->scopes($scopes)->redirect(); return Socialite::driver($provider)->with(['redirect_uri' => "/auth/google"])->scopes($scopes)->redirect();
} }
} }
@ -500,39 +500,41 @@ class LoginController extends BaseController
->stateless() ->stateless()
->user(); ->user();
// if($user = OAuth::handleAuth($socialite_user, $provider)) if($user = OAuth::handleAuth($socialite_user, $provider))
// { {
// Auth::login($user, true); Auth::login($user, true);
// return redirect($this->redirectTo); return redirect($this->redirectTo);
// } }
// else if(MultiDB::checkUserEmailExists($socialite_user->getEmail())) else if(MultiDB::checkUserEmailExists($socialite_user->getEmail()))
// { {
// Session::flash('error', 'User exists in system, but not with this authentication method'); //todo add translations Session::flash('error', 'User exists in system, but not with this authentication method'); //todo add translations
// return view('auth.login'); return view('auth.login');
// } }
// else { else {
// //todo //todo
// $name = OAuth::splitName($socialite_user->getName()); $name = OAuth::splitName($socialite_user->getName());
// $new_account = [ $update_user = [
// 'first_name' => $name[0], 'first_name' => $name[0],
// 'last_name' => $name[1], 'last_name' => $name[1],
// 'password' => '', 'password' => '',
// 'email' => $socialite_user->getEmail(), 'email' => $socialite_user->getEmail(),
// 'oauth_user_id' => $socialite_user->getId(), 'oauth_user_id' => $socialite_user->getId(),
// 'oauth_provider_id' => $provider 'oauth_provider_id' => $providerm
// ]; 'oauth_user_token' => $socialite_user->refreshToken,
];
// $account = CreateAccount::dispatchNow($new_account);
// Auth::login($account->default_company->owner(), true); // $account = CreateAccount::dispatchNow($new_account);
// $cookie = cookie('db', $account->default_company->db); // Auth::login($account->default_company->owner(), true);
// return redirect($this->redirectTo)->withCookie($cookie); // $cookie = cookie('db', $account->default_company->db);
// }
return redirect('/#/');
}
} }
} }