From 683e8164fc5acf834728efab95cf75b2440b16c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Thu, 2 Sep 2021 14:57:59 +0200
Subject: [PATCH] Complete and fix the generated provisioning XML Use
 require_once to load the hooks and prevent double inclusion

---
 .../Controllers/Account/ProvisioningController.php     | 10 +++++++---
 flexisip-account-manager.spec                          |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/flexiapi/app/Http/Controllers/Account/ProvisioningController.php b/flexiapi/app/Http/Controllers/Account/ProvisioningController.php
index ffa5052..057b2d9 100644
--- a/flexiapi/app/Http/Controllers/Account/ProvisioningController.php
+++ b/flexiapi/app/Http/Controllers/Account/ProvisioningController.php
@@ -65,7 +65,7 @@ class ProvisioningController extends Controller
         $provisioningHooks = config_path('provisioning_hooks.php');
 
         if (file_exists($provisioningHooks)) {
-            require($provisioningHooks);
+            require_once($provisioningHooks);
         }
 
         $dom = new \DOMDocument('1.0', 'UTF-8');
@@ -119,7 +119,7 @@ class ProvisioningController extends Controller
             $section = $dom->createElement('section');
             $section->setAttribute('name', 'proxy_' . $proxyConfigIndex);
 
-            $entry = $dom->createElement('entry', $account->identifier);
+            $entry = $dom->createElement('entry', '<sip:'.$account->identifier.'>');
             $entry->setAttribute('name', 'reg_identity');
             $section->appendChild($entry);
 
@@ -144,10 +144,14 @@ class ProvisioningController extends Controller
                 $section = $dom->createElement('section');
                 $section->setAttribute('name', 'auth_info_' . $authInfoIndex);
 
-                $entry = $dom->createElement('entry', $account->identifier);
+                $entry = $dom->createElement('entry', $account->username);
                 $entry->setAttribute('name', 'username');
                 $section->appendChild($entry);
 
+                $entry = $dom->createElement('entry', $account->domain);
+                $entry->setAttribute('name', 'domain');
+                $section->appendChild($entry);
+
                 $entry = $dom->createElement('entry', $password->password);
                 $entry->setAttribute('name', 'ha1');
                 $section->appendChild($entry);
diff --git a/flexisip-account-manager.spec b/flexisip-account-manager.spec
index 71c772d..84f11e0 100644
--- a/flexisip-account-manager.spec
+++ b/flexisip-account-manager.spec
@@ -8,7 +8,7 @@
 #%define _datadir           %{_datarootdir}
 #%define _docdir            %{_datadir}/doc
 
-%define build_number 98
+%define build_number 99
 %define var_dir /var/opt/belledonne-communications
 %define opt_dir /opt/belledonne-communications/share/flexisip-account-manager