added new helpers

This commit is contained in:
Denis Duliçi 2023-11-01 23:42:27 +03:00
parent e083a10d3d
commit 9af0464dad
6 changed files with 42 additions and 10 deletions

View File

@ -91,7 +91,7 @@ abstract class Widget
public function view($name, $data = [])
{
if (request()->isApi()) {
if (request_is_api()) {
return $data;
}

View File

@ -96,7 +96,7 @@ class Handler extends ExceptionHandler
*/
public function render($request, Throwable $exception)
{
if ($request->isApi()) {
if (request_is_api($request)) {
return $this->handleApiExceptions($request, $exception);
}

View File

@ -18,7 +18,7 @@ trait Companies
$request = $this->request ?: request();
if ($this->isCompanyApiRequest($request)) {
if (request_is_api($request)) {
return $this->getCompanyIdFromApi($request);
}
@ -54,9 +54,4 @@ trait Companies
{
return (int) $request->header('X-Company');
}
public function isCompanyApiRequest($request)
{
return $request->is(config('api.prefix') . '/*');
}
}

View File

@ -429,7 +429,7 @@ trait Permissions
return;
}
$table = request()->isApi() ? request()->segment(2) : '';
$table = request_is_api() ? request()->segment(2) : '';
// Find the proper controller for common API endpoints
if (in_array($table, ['contacts', 'documents'])) {

View File

@ -25,7 +25,7 @@ trait Trackers
$app_type = 'queue';
} elseif (Str::contains($hostname, '-cron-')) {
$app_type = 'cron';
} elseif (request()->isApi()) {
} elseif (request_is_api()) {
$app_type = 'api';
} elseif (app()->runningInConsole()) {
$app_type = 'console';

View File

@ -8,6 +8,7 @@ use App\Traits\Modules;
use App\Traits\SearchString;
use App\Utilities\Date;
use App\Utilities\Widgets;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
if (! function_exists('user')) {
@ -313,3 +314,39 @@ if (! function_exists('is_cloud')) {
return $cloud->isCloud();
}
}
if (! function_exists('request_is_api')) {
function request_is_api(Request|null $request = null): bool
{
$r = $request ?: request();
return $r->is(config('api.prefix') . '/*');
}
}
if (! function_exists('request_is_auth')) {
function request_is_auth(Request|null $request = null): bool
{
$r = $request ?: request();
return $r->is('auth/*');
}
}
if (! function_exists('request_is_signed')) {
function request_is_signed(Request|null $request = null, int $company_id): bool
{
$r = $request ?: request();
return $r->is($company_id . '/signed/*');
}
}
if (! function_exists('request_is_portal')) {
function request_is_portal(Request|null $request = null, int $company_id): bool
{
$r = $request ?: request();
return $r->is($company_id . '/portal') || $r->is($company_id . '/portal/*');
}
}