Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5741 from turbo124/v5-develop

Browse Source 
Fixes for Exception Handler
This commit is contained in:
David Bomba 2021-05-19 08:09:03 +10:00 committed by GitHub
commit 8b397cc15c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Exceptions/Handler.php
View File

@ -14,6 +14,7 @@ namespace App\Exceptions;
use App\Exceptions\FilePermissionsFailure; use App\Exceptions\FilePermissionsFailure;
use App\Exceptions\InternalPDFFailure; use App\Exceptions\InternalPDFFailure;
use App\Exceptions\PhantomPDFFailure; use App\Exceptions\PhantomPDFFailure;
use App\Utils\Ninja;
use Exception; use Exception;
use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Auth\AuthenticationException; use Illuminate\Auth\AuthenticationException;
@ -75,7 +76,26 @@ class Handler extends ExceptionHandler
return; return;
} }
if (app()->bound('sentry') && $this->shouldReport($exception)) { if(Ninja::isHosted()){
app('sentry')->configureScope(function (Scope $scope): void {
if(auth()->guard('contact') && auth()->guard('contact')->user())
$key = auth()->guard('contact')->user()->company->account->key;
elseif (auth()->guard('user') && auth()->guard('user')->user())
$key = auth()->user()->account->key;
else
$key = 'Anonymous';
$scope->setUser([
'id' => 'Hosted_User',
'email' => 'hosted@invoiceninja.com',
'name' => $key,
]);
});
}
elseif (app()->bound('sentry') && $this->shouldReport($exception)) {
app('sentry')->configureScope(function (Scope $scope): void { app('sentry')->configureScope(function (Scope $scope): void {
if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) { if (auth()->guard('contact') && auth()->guard('contact')->user() && auth()->guard('contact')->user()->company->account->report_errors) {
$scope->setUser([ $scope->setUser([

4
app/Listeners/User/UpdateUserLastLogin.php
View File

@ -67,8 +67,10 @@ class UpdateUserLastLogin implements ShouldQueue
$user->save(); $user->save();
} }
$arr = json_encode(['ip' => $ip]);
SystemLogger::dispatch( SystemLogger::dispatch(
$ip, $arr,
SystemLog::CATEGORY_SECURITY, SystemLog::CATEGORY_SECURITY,
SystemLog::EVENT_USER, SystemLog::EVENT_USER,
SystemLog::TYPE_LOGIN_SUCCESS, SystemLog::TYPE_LOGIN_SUCCESS,