diff --git a/flexiapi/app/Account.php b/flexiapi/app/Account.php index 99dcf8c..7a5445d 100644 --- a/flexiapi/app/Account.php +++ b/flexiapi/app/Account.php @@ -473,8 +473,8 @@ IMPP:sip:' . $this->getIdentifierAttribute(); $vcard .= ' FN:'; - $vcard .= !empty($this->attributes['display_name']) - ? $this->attributes['display_name'] + $vcard .= !empty($this->display_name) + ? $this->display_name : $this->getIdentifierAttribute(); if ($this->dtmf_protocol) { diff --git a/flexiapi/app/Helpers/Utils.php b/flexiapi/app/Helpers/Utils.php index 4249a8d..713e585 100644 --- a/flexiapi/app/Helpers/Utils.php +++ b/flexiapi/app/Helpers/Utils.php @@ -120,7 +120,7 @@ function captchaConfigured(): bool function resolveUserContacts(Request $request) { - $selected = ['id', 'username', 'domain', 'activated', 'dtmf_protocol']; + $selected = ['id', 'username', 'domain', 'activated', 'dtmf_protocol', 'display_name']; return Account::whereIn('id', function ($query) use ($request) { $query->select('contact_id') diff --git a/flexiapi/database/factories/AccountFactory.php b/flexiapi/database/factories/AccountFactory.php index 3695e5f..37af37b 100644 --- a/flexiapi/database/factories/AccountFactory.php +++ b/flexiapi/database/factories/AccountFactory.php @@ -35,7 +35,7 @@ class AccountFactory extends Factory { return [ 'username' => $this->faker->username, - 'display_name' => $this->faker->username, + 'display_name' => $this->faker->name, 'domain' => config('app.sip_domain'), 'email' => $this->faker->email, 'user_agent' => $this->faker->userAgent, diff --git a/flexiapi/tests/Feature/AccountProvisioningTest.php b/flexiapi/tests/Feature/AccountProvisioningTest.php index 859b60a..12cdc59 100644 --- a/flexiapi/tests/Feature/AccountProvisioningTest.php +++ b/flexiapi/tests/Feature/AccountProvisioningTest.php @@ -99,6 +99,8 @@ class AccountProvisioningTest extends TestCase public function testAuthenticatedReProvisioning() { $password = Password::factory()->create(); + $password->account->display_name = "Anna O'Reily"; + $password->account->save(); $password->account->generateApiKey(); $provisioningToken = $password->account->provisioning_token; @@ -123,7 +125,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'); }