From 6da23a50a84bd0e5f5df1f5ef370a445a7e436c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Mon, 4 Mar 2024 14:37:56 +0000
Subject: [PATCH] Fix FLEXIAPI-145 Put back the code as an alias for the
 confirmation_key in the...

---
 .../Http/Controllers/Api/Account/AccountController.php | 10 ++++++++++
 flexiapi/tests/Feature/AccountProvisioningTest.php     |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/flexiapi/app/Http/Controllers/Api/Account/AccountController.php b/flexiapi/app/Http/Controllers/Api/Account/AccountController.php
index d2e666c..a27a305 100644
--- a/flexiapi/app/Http/Controllers/Api/Account/AccountController.php
+++ b/flexiapi/app/Http/Controllers/Api/Account/AccountController.php
@@ -261,6 +261,11 @@ class AccountController extends Controller
      */
     public function activateEmail(Request $request, string $sip)
     {
+        // For retro-compatibility
+        if ($request->has('code')) {
+            $request->merge(['confirmation_key' => $request->get('code')]);
+        }
+
         $request->validate([
             'confirmation_key' => 'required|size:' . WebAuthenticateController::$emailCodeSize
         ]);
@@ -285,6 +290,11 @@ class AccountController extends Controller
      */
     public function activatePhone(Request $request, string $sip)
     {
+        // For retro-compatibility
+        if ($request->has('code')) {
+            $request->merge(['confirmation_key' => $request->get('code')]);
+        }
+
         $request->validate([
             'confirmation_key' => 'required|digits:4'
         ]);
diff --git a/flexiapi/tests/Feature/AccountProvisioningTest.php b/flexiapi/tests/Feature/AccountProvisioningTest.php
index 12cdc59..25ddc02 100644
--- a/flexiapi/tests/Feature/AccountProvisioningTest.php
+++ b/flexiapi/tests/Feature/AccountProvisioningTest.php
@@ -159,7 +159,7 @@ class AccountProvisioningTest extends TestCase
             ->assertStatus(200)
             ->assertHeader('Content-Type', 'application/xml')
             ->assertSee($password->account->username)
-            ->assertSee($password->account->display_name)
+            ->assertSee($password->account->display_name, false)
             ->assertSee('ha1')
             ->assertSee($password->account->passwords()->first()->password);