Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-02 18:34:34 -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

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

@ -798,15 +798,20 @@ class NinjaMailerJob implements ShouldQueue
return false; return false;
} }
$token = json_decode($guzzle->post($url, [ try {
'form_params' => [ $token = json_decode($guzzle->post($url, [
'client_id' => config('ninja.o365.client_id'), 'form_params' => [
'client_secret' => config('ninja.o365.client_secret'), 'client_id' => config('ninja.o365.client_id'),
'scope' => 'email Mail.Send offline_access profile User.Read openid', 'client_secret' => config('ninja.o365.client_secret'),
'grant_type' => 'refresh_token', 'scope' => 'email Mail.Send offline_access profile User.Read openid',
'refresh_token' => $user->oauth_user_refresh_token 'grant_type' => '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;

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

@ -935,15 +935,20 @@ 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';
$token = json_decode($guzzle->post($url, [ try {
'form_params' => [ $token = json_decode($guzzle->post($url, [
'client_id' => config('ninja.o365.client_id'), 'form_params' => [
'client_secret' => config('ninja.o365.client_secret'), 'client_id' => config('ninja.o365.client_id'),
'scope' => 'email Mail.Send offline_access profile User.Read openid', 'client_secret' => config('ninja.o365.client_secret'),
'grant_type' => 'refresh_token', 'scope' => 'email Mail.Send offline_access profile User.Read openid',
'refresh_token' => $user->oauth_user_refresh_token 'grant_type' => '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;