diff --git a/CHANGELOG.md b/CHANGELOG.md index 15c3f3b..4d72c59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ v2.1 - Fix FLEXIAPI-371 Add documentation for the Wizard page - Fix FLEXIAPI-359 Add CardDav servers support in the spaces - Fix FLEXIAPI-374 Improve CardDav credentials form +- Fix FLEXIAPI-376 Rename domain to realm in CardDav credentials v2.0 ---- diff --git a/flexiapi/app/Account.php b/flexiapi/app/Account.php index e63c5c9..bdc637f 100644 --- a/flexiapi/app/Account.php +++ b/flexiapi/app/Account.php @@ -153,7 +153,7 @@ class Account extends Authenticatable public function carddavServers() { return $this->belongsToMany(SpaceCardDavServer::class, 'account_carddav_credentials', 'account_id', 'space_carddav_server_id') - ->withPivot('username', 'domain', 'algorithm', 'password'); + ->withPivot('username', 'realm', 'algorithm', 'password'); } public function getDictionaryAttribute() diff --git a/flexiapi/app/Http/Controllers/Account/ProvisioningController.php b/flexiapi/app/Http/Controllers/Account/ProvisioningController.php index b1cd4c3..07893c9 100644 --- a/flexiapi/app/Http/Controllers/Account/ProvisioningController.php +++ b/flexiapi/app/Http/Controllers/Account/ProvisioningController.php @@ -211,8 +211,8 @@ class ProvisioningController extends Controller $entry->setAttribute('name', 'username'); $section->appendChild($entry); - $entry = $dom->createElement('entry', $carddavServer->pivot->domain); - $entry->setAttribute('name', 'domain'); + $entry = $dom->createElement('entry', $carddavServer->pivot->realm); + $entry->setAttribute('name', 'realm'); $section->appendChild($entry); $entry = $dom->createElement('entry', $carddavServer->pivot->password); diff --git a/flexiapi/app/Http/Controllers/Admin/Account/CardDavCredentialsController.php b/flexiapi/app/Http/Controllers/Admin/Account/CardDavCredentialsController.php index a551c04..c580bc0 100644 --- a/flexiapi/app/Http/Controllers/Admin/Account/CardDavCredentialsController.php +++ b/flexiapi/app/Http/Controllers/Admin/Account/CardDavCredentialsController.php @@ -55,10 +55,10 @@ class CardDavCredentialsController extends Controller $accountCarddavCredentials->space_carddav_server_id = $request->get('carddav_id'); $accountCarddavCredentials->account_id = $account->id; $accountCarddavCredentials->username = $request->get('username'); - $accountCarddavCredentials->domain = $request->get('domain'); + $accountCarddavCredentials->realm = $request->get('realm'); $accountCarddavCredentials->password = bchash( $request->get('username'), - $request->get('domain'), + $request->get('realm'), $request->get('password'), $request->get('algorithm') ); diff --git a/flexiapi/app/Http/Controllers/Api/Admin/Account/CardDavCredentialsController.php b/flexiapi/app/Http/Controllers/Api/Admin/Account/CardDavCredentialsController.php index 3393672..2f76b60 100644 --- a/flexiapi/app/Http/Controllers/Api/Admin/Account/CardDavCredentialsController.php +++ b/flexiapi/app/Http/Controllers/Api/Admin/Account/CardDavCredentialsController.php @@ -46,10 +46,10 @@ class CardDavCredentialsController extends Controller $accountCarddavCredentials->space_carddav_server_id = $cardDavServer->id; $accountCarddavCredentials->account_id = $account->id; $accountCarddavCredentials->username = $request->get('username'); - $accountCarddavCredentials->domain = $request->get('domain'); + $accountCarddavCredentials->realm = $request->get('realm'); $accountCarddavCredentials->password = bchash( $request->get('username'), - $request->get('domain'), + $request->get('realm'), $request->get('password'), $request->get('algorithm') ); @@ -70,7 +70,7 @@ class CardDavCredentialsController extends Controller return [ 'carddav_id' => $cardDavServer->id, 'username' => $cardDavServer->pivot->username, - 'domain' => $cardDavServer->pivot->domain, + 'realm' => $cardDavServer->pivot->realm, 'algorithm' => $cardDavServer->pivot->algorithm, 'password' => $cardDavServer->pivot->password, ]; diff --git a/flexiapi/app/Http/Requests/Account/CardDavCredentials.php b/flexiapi/app/Http/Requests/Account/CardDavCredentials.php index 7161501..e9c6257 100644 --- a/flexiapi/app/Http/Requests/Account/CardDavCredentials.php +++ b/flexiapi/app/Http/Requests/Account/CardDavCredentials.php @@ -33,7 +33,7 @@ class CardDavCredentials extends FormRequest 'username' => 'required', 'password' => 'required', 'algorithm' => ['required', new PasswordAlgorithm], - 'domain' => ['required', new Domain], + 'realm' => 'required', ]; } } diff --git a/flexiapi/database/migrations/2025_08_20_083715_create_space_carddav_servers.php b/flexiapi/database/migrations/2025_08_20_083715_create_space_carddav_servers.php index f325f8f..eb7c030 100644 --- a/flexiapi/database/migrations/2025_08_20_083715_create_space_carddav_servers.php +++ b/flexiapi/database/migrations/2025_08_20_083715_create_space_carddav_servers.php @@ -34,7 +34,7 @@ return new class extends Migration Schema::create('account_carddav_credentials', function (Blueprint $table) { $table->string('username', 64); $table->string('password', 255); - $table->string('domain', 255); + $table->string('realm', 255); $table->string('algorithm', 10)->default('MD5'); $table->bigInteger('space_carddav_server_id')->unsigned(); diff --git a/flexiapi/resources/views/admin/account/carddav/create.blade.php b/flexiapi/resources/views/admin/account/carddav/create.blade.php index ae21171..ea1e433 100644 --- a/flexiapi/resources/views/admin/account/carddav/create.blade.php +++ b/flexiapi/resources/views/admin/account/carddav/create.blade.php @@ -28,9 +28,9 @@ @include('parts.errors', ['name' => 'username'])