From 9e9f949f9ab7a3013de16beb2c8934c49f416d80 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@sipwise.com>
Date: Tue, 25 May 2021 16:07:31 +0200
Subject: [PATCH] Revert "TT#102056 fix registration entry removal"

This reverts commit db2ea573aa04279efd91837578299edac4c9b73c.

Reason for revert: failing.

Change-Id: If23107246a69aabf332d489aebc20e8685bd5c3d
---
 .../Panel/Controller/API/SubscriberRegistrationsItem.pm     | 3 +--
 lib/NGCP/Panel/Controller/Subscriber.pm                     | 6 +++---
 lib/NGCP/Panel/Utils/Kamailio.pm                            | 6 ++++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
index b013263e4b..a13cc37f56 100644
--- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
+++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrationsItem.pm
@@ -201,9 +201,8 @@ sub delete_item {
 
     my $sub = $self->subscriber_from_item($c, $item);
     return unless($sub);
-    my $aor = $item->username . '@' . $item->domain;
     NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
-        $aor, $item->contact);
+        $sub, $item->contact);
     NGCP::Panel::Utils::Kamailio::flush($c) unless $self->suppress_flush($c);
     return 1;
 }
diff --git a/lib/NGCP/Panel/Controller/Subscriber.pm b/lib/NGCP/Panel/Controller/Subscriber.pm
index 735490969d..5234e95a5c 100644
--- a/lib/NGCP/Panel/Controller/Subscriber.pm
+++ b/lib/NGCP/Panel/Controller/Subscriber.pm
@@ -4331,9 +4331,9 @@ sub delete_registered :Chained('registered') :PathPart('delete') :Args(0) {
     my $ret;
 
     try {
-        my $reg = $c->stash->{registered} // die "No registration data";
-        my $aor = $reg->username . '@' . $reg->domain;
-        NGCP::Panel::Utils::Kamailio::delete_location_contact($c, $aor, $reg->contact);
+        NGCP::Panel::Utils::Kamailio::delete_location_contact($c,
+            $c->stash->{subscriber}->provisioning_voip_subscriber,
+            $c->stash->{registered}->contact);
     } catch($e) {
         NGCP::Panel::Utils::Message::error(
             c     => $c,
diff --git a/lib/NGCP/Panel/Utils/Kamailio.pm b/lib/NGCP/Panel/Utils/Kamailio.pm
index d0039d4baa..18582ad712 100644
--- a/lib/NGCP/Panel/Utils/Kamailio.pm
+++ b/lib/NGCP/Panel/Utils/Kamailio.pm
@@ -6,8 +6,9 @@ use NGCP::Panel::Utils::DateTime;
 use Data::Dumper;
 
 sub delete_location_contact {
-    my ($c, $aor, $contact) = @_;
+    my ($c, $prov_subscriber, $contact) = @_;
 
+    my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain;
     my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
 <?xml version="1.0" ?>
 <methodCall>
@@ -23,8 +24,9 @@ EOF
 }
 
 sub delete_location {
-    my ($c, $aor) = @_;
+    my ($c, $prov_subscriber) = @_;
 
+    my $aor = $prov_subscriber->username . '@' . $prov_subscriber->domain->domain;
     my $ret = NGCP::Panel::Utils::XMLDispatcher::dispatch($c, "proxy-ng", 1, 1, <<EOF );
 <?xml version="1.0" ?>
 <methodCall>