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

Appropriately refresh sending tokens

Browse Source
This commit is contained in:
David Bomba 2022-06-22 19:15:31 +10:00
parent 77cdae7907
commit 3141a33ced
4 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -772,6 +772,8 @@ class LoginController extends BaseController
$oauth_user_token = $socialite_user->accessTokenResponseBody['access_token']; $oauth_user_token = $socialite_user->accessTokenResponseBody['access_token'];
$oauth_expiry = now()->addSeconds($socialite_user->accessTokenResponseBody['expires_in']) ?: now()->addSeconds(300);
if($user = OAuth::handleAuth($socialite_user, $provider)) if($user = OAuth::handleAuth($socialite_user, $provider))
{ {
@ -785,7 +787,8 @@ class LoginController extends BaseController
'oauth_user_id' => $socialite_user->getId(), 'oauth_user_id' => $socialite_user->getId(),
'oauth_provider_id' => $provider, 'oauth_provider_id' => $provider,
'oauth_user_token' => $oauth_user_token, 'oauth_user_token' => $oauth_user_token,
'oauth_user_refresh_token' => $socialite_user->accessTokenResponseBody['refresh_token'] 'oauth_user_refresh_token' => $socialite_user->accessTokenResponseBody['refresh_token'],
'oauth_user_token_expiry' => $oauth_expiry,
]; ];
$user->update($update_user); $user->update($update_user);

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

@ -341,6 +341,9 @@ class NinjaMailerJob implements ShouldQueue
} }
private function refreshOfficeToken($user) private function refreshOfficeToken($user)
{
if($user->oauth_user_token_expiry->lt(now()))
{ {
$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';
@ -355,10 +358,22 @@ class NinjaMailerJob implements ShouldQueue
], ],
])->getBody()->getContents()); ])->getBody()->getContents());
if($token) if($token){
nlog($token);
$user->oauth_user_token = $token->access_token;
$user->oauth_user_token_expiry = now()->addSeconds($token->expires_in);
$user->save();
return $token->access_token; return $token->access_token;
}
return false; return false;
} }
return $user->oauth_user_refresh_token;
}
} }

1
app/Models/User.php
View File

@ -106,6 +106,7 @@ class User extends Authenticatable implements MustVerifyEmail
'updated_at' => 'timestamp', 'updated_at' => 'timestamp',
'created_at' => 'timestamp', 'created_at' => 'timestamp',
'deleted_at' => 'timestamp', 'deleted_at' => 'timestamp',
'oauth_user_token_expiry' => 'datetime',
]; ];