Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 16:44:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Response handling with microsoft

Browse Source
This commit is contained in:
David Bomba 2022-06-22 20:55:14 +10:00
parent 5670abe224
commit 93ebf3a767
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,11 +332,6 @@ class LoginController extends BaseController
if (request()->input('provider') == 'google') { if (request()->input('provider') == 'google') {
return $this->handleGoogleOauth(); return $this->handleGoogleOauth();
} elseif (request()->input('provider') == 'microsoft') { } elseif (request()->input('provider') == 'microsoft') {
// if (request()->has('token')) {
// return $this->handleSocialiteLogin('microsoft', request()->get('token'));
// } else {
// $message = 'Bearer token missing for the microsoft login';
// }
return $this->handleMicrosoftOauth(); return $this->handleMicrosoftOauth();
} elseif (request()->input('provider') == 'apple') { } elseif (request()->input('provider') == 'apple') {
// if (request()->has('token')) { // if (request()->has('token')) {
@ -501,7 +496,7 @@ class LoginController extends BaseController
elseif(request()->has('access_token')) elseif(request()->has('access_token'))
$accessToken = request()->input('access_token'); $accessToken = request()->input('access_token');
else else
return response()->json(['message' => 'Invalid response from oauth server'], 400); return response()->json(['message' => 'Invalid response from oauth server, no access token in response.'], 400);
$graph = new \Microsoft\Graph\Graph(); $graph = new \Microsoft\Graph\Graph();
$graph->setAccessToken($accessToken); $graph->setAccessToken($accessToken);
@ -512,7 +507,6 @@ class LoginController extends BaseController
if($user){ if($user){
$account = request()->input('account');
$email = $user->getMail() ?: $user->getUserPrincipalName(); $email = $user->getMail() ?: $user->getUserPrincipalName();
$query = [ $query = [
@ -553,6 +547,8 @@ class LoginController extends BaseController
} }
return response()->json(['message' => 'Unable to authenticate this user'], 400);
} }
private function existingOauthUser($existing_user) private function existingOauthUser($existing_user)