From debd85394d790db4633470ce2dad6181424950ca Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Tue, 23 Aug 2022 09:49:25 +0200 Subject: [PATCH] TT#188950 ignore domain for subscriber authentication when ignore_auth_realm is "yes", it should no longer be required to provide the domain part for subscriber logins. Change-Id: I346f94278c9b0d9a598858c24d797b03217123d4 (cherry picked from commit 65b5c62e480055868d15f0a735b35ef416a5a762) --- lib/NGCP/Panel/Controller/Root.pm | 2 +- lib/NGCP/Panel/Utils/Auth.pm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/NGCP/Panel/Controller/Root.pm b/lib/NGCP/Panel/Controller/Root.pm index 46ffcc6ffb..4d2c07bae8 100644 --- a/lib/NGCP/Panel/Controller/Root.pm +++ b/lib/NGCP/Panel/Controller/Root.pm @@ -659,7 +659,7 @@ sub login_jwt :Chained('/') :PathPart('login_jwt') :Args(0) :Method('POST') { my $authrs = $c->model('DB')->resultset('provisioning_voip_subscribers')->search({ webusername => $u, 'voip_subscriber.status' => 'active', - 'domain.domain' => $d, + ($c->config->{features}->{multidomain} ? ('domain.domain' => $d) : ()), 'contract.status' => 'active', }, { join => ['domain', 'contract', 'voip_subscriber'], diff --git a/lib/NGCP/Panel/Utils/Auth.pm b/lib/NGCP/Panel/Utils/Auth.pm index ba243258fd..87a153279c 100644 --- a/lib/NGCP/Panel/Utils/Auth.pm +++ b/lib/NGCP/Panel/Utils/Auth.pm @@ -134,11 +134,11 @@ sub perform_subscriber_auth { if ($pass && $pass =~ /[^[:ascii:]]/) { return $res; } - + my $authrs = $c->model('DB')->resultset('provisioning_voip_subscribers')->search({ webusername => $user, 'voip_subscriber.status' => 'active', - 'domain.domain' => $domain, + ($c->config->{features}->{multidomain} ? ('domain.domain' => $domain) : ()), 'contract.status' => 'active', }, { join => ['domain', 'contract', 'voip_subscriber'],