Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 00:54:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for connected account

Browse Source
This commit is contained in:
David Bomba 2021-03-16 22:44:10 +11:00
parent 816ea281ff
commit aef2270f05
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Http/Controllers/ConnectedAccountController.php
View File

@ -89,23 +89,8 @@ class ConnectedAccountController extends BaseController
$user = $google->getTokenResponse(request()->input('id_token')); $user = $google->getTokenResponse(request()->input('id_token'));
if (is_array($user)) {
$query = [
'oauth_user_id' => $google->harvestSubField($user),
'oauth_provider_id'=> 'google',
];
/* Cannot allow duplicates! */
if ($existing_user = MultiDB::hasUser($query)) {
return response()
->json(['message' => 'User already exists in system.'], 401)
->header('X-App-Version', config('ninja.app_version'))
->header('X-Api-Version', config('ninja.minimum_client_version'));
}
}
if ($user) { if ($user) {
$client = new Google_Client(); $client = new Google_Client();
$client->setClientId(config('ninja.auth.google.client_id')); $client->setClientId(config('ninja.auth.google.client_id'));
$client->setClientSecret(config('ninja.auth.google.client_secret')); $client->setClientSecret(config('ninja.auth.google.client_secret'));
@ -118,7 +103,6 @@ class ConnectedAccountController extends BaseController
$refresh_token = $token['refresh_token']; $refresh_token = $token['refresh_token'];
} }
$connected_account = [ $connected_account = [
'password' => '', 'password' => '',
'email' => $google->harvestEmail($user), 'email' => $google->harvestEmail($user),