mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 01:58:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-412 Restrict the default messages statistics graph to the space...

Browse source
This commit is contained in:
Timothée Jaussoin 2025-11-25 11:39:15 +00:00
parent f035b720cd
commit f3e06bb125
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flexiapi/app/Http/Controllers/Admin/StatisticsController.php
View file

@ -106,9 +106,13 @@ class StatisticsController extends Controller
$fromQuery = StatisticsCall::query();
$toQuery = StatisticsCall::query();
if ($request->get('domain')) {
$fromQuery->where('to_domain', $request->get('domain'));
$toQuery->where('from_domain', $request->get('domain'));
$domain = $request->user()->superAdmin
? $request->get('domain')
: $request->user()->domain;
if ($domain) {
$fromQuery->where('to_domain', $domain);
$toQuery->where('from_domain', $domain);
}
if ($request->get('to')) {

6
flexiapi/app/Http/Middleware/SpaceCheck.php
View file

@ -12,14 +12,14 @@ class SpaceCheck
public function handle(Request $request, Closure $next): Response
{
if (empty(config('app.root_host'))) {
return abort(503, 'APP_ROOT_HOST is not configured');
abort(503, 'APP_ROOT_HOST is not configured');
}
$space = space(reload: true);
if ($space != null) {
if (!str_ends_with($space->host, config('app.root_host'))) {
return abort(503, 'The APP_ROOT_HOST configured does not match with the current root domain');
abort(503, 'The APP_ROOT_HOST configured does not match with the current root domain');
}
Config::set('app.url', '://' . $space->host);
@ -51,6 +51,6 @@ class SpaceCheck
return $next($request);
}
return abort(404, 'Host not configured');
abort(404, 'Host not configured');
}
}

4
flexiapi/app/Libraries/StatisticsGraphFactory.php
View file

@ -57,9 +57,9 @@ class StatisticsGraphFactory
$fromQuery = StatisticsMessage::query();
$toQuery = StatisticsMessage::query();
if (!Auth::user()?->admin) {
if (!Auth::user()?->superAdmin) {
$fromQuery->where('from_domain', space()->domain);
$toQuery->toDomain($this->domain);
$toQuery->toDomain(space()->domain);
} elseif ($this->domain) {
$fromQuery->where('from_domain', $this->domain);
$toQuery->toDomain($this->domain);