From b590995b4e2a040674e722445f257b03c6c1460c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Jaussoin?=
 <timothee.jaussoin@belledonne-communications.com>
Date: Mon, 9 Jun 2025 12:33:05 +0000
Subject: [PATCH] Fix/318 319 321 322

---
 flexiapi/app/Account.php                                     | 5 +++++
 flexiapi/app/Http/Controllers/Account/RecoveryController.php | 4 ++--
 flexiapi/resources/views/admin/account/index.blade.php       | 2 +-
 flexiapi/resources/views/mails/parts/provisioning.blade.php  | 4 ++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/flexiapi/app/Account.php b/flexiapi/app/Account.php
index 80e3d8b..062a934 100644
--- a/flexiapi/app/Account.php
+++ b/flexiapi/app/Account.php
@@ -339,6 +339,11 @@ class Account extends Authenticatable
         return null;
     }
 
+    public function getProvisioningLinphoneUriAttribute(): string
+    {
+        return str_replace('https://', 'linphone-config:', route('provisioning.provision', ['provisioning_token' => $this->provisioning_token]));
+    }
+
     public static function dtmfProtocolsRule()
     {
         return implode(',', array_keys(self::$dtmfProtocols));
diff --git a/flexiapi/app/Http/Controllers/Account/RecoveryController.php b/flexiapi/app/Http/Controllers/Account/RecoveryController.php
index 6c749ea..6f9ca7e 100644
--- a/flexiapi/app/Http/Controllers/Account/RecoveryController.php
+++ b/flexiapi/app/Http/Controllers/Account/RecoveryController.php
@@ -59,8 +59,8 @@ class RecoveryController extends Controller
         $rules = [
             'email' => 'required_without:phone|email|exists:accounts,email',
             'phone' => 'required_without:email|starts_with:+',
-            'h-captcha-response'  => captchaConfigured() ? 'required_if:email|HCaptcha' : '',
-            'account_recovery_token' => 'required_if:phone',
+            'h-captcha-response'  => captchaConfigured() ? 'required_with:email|HCaptcha' : '',
+            'account_recovery_token' => 'required_with:phone',
         ];
 
         $account = null;
diff --git a/flexiapi/resources/views/admin/account/index.blade.php b/flexiapi/resources/views/admin/account/index.blade.php
index e300bd3..015d3fa 100644
--- a/flexiapi/resources/views/admin/account/index.blade.php
+++ b/flexiapi/resources/views/admin/account/index.blade.php
@@ -16,7 +16,7 @@
             {{ __('Types') }}
         </a>
         @endif
-        <a class="btn" href="{{ route('admin.account.create') }}">
+        <a class="btn" @if ($space && $space->isFull())disabled @endif href="{{ route('admin.account.create') }}">
             <i class="ph">user-plus</i>
             {{ __('New user') }}
         </a>
diff --git a/flexiapi/resources/views/mails/parts/provisioning.blade.php b/flexiapi/resources/views/mails/parts/provisioning.blade.php
index 52fdbd4..0bf4d8e 100644
--- a/flexiapi/resources/views/mails/parts/provisioning.blade.php
+++ b/flexiapi/resources/views/mails/parts/provisioning.blade.php
@@ -1,9 +1,9 @@
 To connect your account to the application, click on the following button:
 
-<x-mail::button :url="route('provisioning.provision', ['provisioning_token' => $account->provisioning_token, 'reset_password' => true])" color="primary">
+<x-mail::button :url="$account->provisioning_linphone_uri" color="primary">
     Connect my account
 </x-mail::button>
 
 You can also configure your device by scanning the QR code with the mobile app, or by pasting the link below into the desktop application.
 
-![QRCode]({{ route('provisioning.qrcode', ['provisioning_token' => $account->provisioning_token, 'reset_password' => true]) }})
+![QRCode]({{ route('provisioning.qrcode', ['provisioning_token' => $account->provisioning_token]) }})