TT#63542 API/SubscriberRegistrations respect redis usrloc

* _item_by_aor search now includes redis usrloc
      state as well as ignore_auth_realm (multidomain)
      to build correct search queries in both redis
      and db locations

Change-Id: I5c08a299c88592c63f3778dd0cf384a56cde3316
(cherry picked from commit 4db31270b2)
changes/55/37055/1
Kirill Solomko 6 years ago committed by Rene Krenn
parent c633673e25
commit d271189eb1

@ -175,13 +175,18 @@ sub subscriber_from_id {
sub _item_by_aor {
my ($self, $c, $sub, $contact) = @_;
my $domain = $sub->provisioning_voip_subscriber->domain->domain;
return $self->item_rs($c)->search({
'me.contact' => $contact,
'me.username' => $sub->provisioning_voip_subscriber->username,
'-or' => [
'me.domain' => $sub->provisioning_voip_subscriber->domain->domain,
'me.domain' => undef,
],
$c->config->{redis}->{usrloc}
? ($c->config->{features}->{multidomain}
? ('me.domain' => $domain)
: ())
: ($c->config->{features}->{multidomain}
? ('me.domain' => $domain)
: ('me.domain' => undef))
})->first;
}

Loading…
Cancel
Save