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

Updates for microsoft token harvest

Browse Source
This commit is contained in:
David Bomba 2024-05-27 07:26:20 +10:00
parent aff180deef
commit 3ce9ea62ec
2 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Jobs/Mail/NinjaMailerJob.php
View File

@ -798,6 +798,7 @@ class NinjaMailerJob implements ShouldQueue
return false; return false;
} }
try {
$token = json_decode($guzzle->post($url, [ $token = json_decode($guzzle->post($url, [
'form_params' => [ 'form_params' => [
'client_id' => config('ninja.o365.client_id'), 'client_id' => config('ninja.o365.client_id'),
@ -807,6 +808,10 @@ class NinjaMailerJob implements ShouldQueue
'refresh_token' => $user->oauth_user_refresh_token 'refresh_token' => $user->oauth_user_refresh_token
], ],
])->getBody()->getContents()); ])->getBody()->getContents());
}
catch(\Exception $e){
nlog("Problem getting new Microsoft token for User: {$user->email}");
}
if ($token) { if ($token) {
$user->oauth_user_refresh_token = property_exists($token, 'refresh_token') ? $token->refresh_token : $user->oauth_user_refresh_token; $user->oauth_user_refresh_token = property_exists($token, 'refresh_token') ? $token->refresh_token : $user->oauth_user_refresh_token;

5
app/Services/Email/Email.php
View File

@ -935,6 +935,7 @@ class Email implements ShouldQueue
$guzzle = new \GuzzleHttp\Client(); $guzzle = new \GuzzleHttp\Client();
$url = 'https://login.microsoftonline.com/common/oauth2/v2.0/token'; $url = 'https://login.microsoftonline.com/common/oauth2/v2.0/token';
try {
$token = json_decode($guzzle->post($url, [ $token = json_decode($guzzle->post($url, [
'form_params' => [ 'form_params' => [
'client_id' => config('ninja.o365.client_id'), 'client_id' => config('ninja.o365.client_id'),
@ -944,6 +945,10 @@ class Email implements ShouldQueue
'refresh_token' => $user->oauth_user_refresh_token 'refresh_token' => $user->oauth_user_refresh_token
], ],
])->getBody()->getContents()); ])->getBody()->getContents());
}
catch(\Exception $e){
nlog("Problem getting new Microsoft token for User: {$user->email}");
}
if ($token) { if ($token) {
$user->oauth_user_refresh_token = property_exists($token, 'refresh_token') ? $token->refresh_token : $user->oauth_user_refresh_token; $user->oauth_user_refresh_token = property_exists($token, 'refresh_token') ? $token->refresh_token : $user->oauth_user_refresh_token;