From 24d7c931f74db06f514bf5ffc4387a79ad203d54 Mon Sep 17 00:00:00 2001
From: Marco Capetta <mcapetta@sipwise.com>
Date: Thu, 15 Jun 2023 14:53:16 +0200
Subject: [PATCH] MT#56865 Fix cid/key usage in grandstream provisioning

Change-Id: I257436e9de30e61bdd5bcce3b6862588c943b45c
(cherry picked from commit e432dfa352aaf108a39e8dd40560144a2f3e67bc)
---
 lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm b/lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm
index ec4304283c..18b0fe5dbd 100644
--- a/lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm
+++ b/lib/NGCP/Panel/Utils/DeviceBootstrap/Grandstream.pm
@@ -29,8 +29,7 @@ sub rpc_server_params{
 
 sub register_content {
     my $self = shift;
-    #TODO: remove actual cid here
-    my $cid = $self->params->{redirect_params}->{cid} // '';
+    my $cid = $self->params->{credentials}->{user};
     $self->{register_content} = 
         '{"cid":"'.$cid
         .'","method":"redirectDefault","params":{"macs":["'
@@ -43,8 +42,9 @@ sub register_content {
 
 sub unregister_content {   
     my $self = shift;
+    my $cid = $self->params->{credentials}->{user};
     $self->{unregister_content} =
-        '{"cid":"'.$self->params->{redirect_params}->{cid}
+        '{"cid":"'.$cid
         .'","method":"unDeviceProvision","params":{"macs":["'
         .$self->content_params->{mac}.'"]}}';
 
@@ -101,7 +101,7 @@ sub get_server_time {
 sub get_request_sign{
     my $self = shift;
     my ($request,$time) = @_;
-    my $key = $self->params->{redirect_params}->{key} // '';
+    my $key = $self->params->{credentials}->{password};
     $time //= $self->get_server_time();
     my $str2sign = $request.$time;
     my ($sign,$sign_error);