Merge branch 'release' into 'master'

PB-43748 Merge release into master (v5.3.1)

See merge request passbolt/passbolt-ce-api!408

Author: gmougenel

CHANGELOG.md

@@ -2,6 +2,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [5.3.1] - 2025-07-09
+### Fixed
+- PB-43748 Users are unable to save a new standalone custom field resource
+
 ## [5.3.0] - 2025-07-09
 ### Added
 - PB-43066 As a developer I can setup my development environment using ddev

RELEASE_NOTES.md

@@ -1,40 +1,9 @@
-Release song: https://www.youtube.com/watch?v=ubWL8VAPoYw
+Release song: https://www.youtube.com/watch?v=h7V36waLN0M
 
-Passbolt 5.3 adds custom fields, one of the five most‑requested features from the community.
-Built on top of encrypted‑metadata introduced earlier this year, custom fields let users attach
-additional key‑value pairs to a resource or as a standalone one.
-Typical use‑cases include centralising CI/CD job variables and storing environment‑specific
-configuration values that need more structure than a general note.
+This hot-fix resolves a regression introduced in v5.3.0 that blocked the creation of standalone Custom Fields content types. A validation error in the API prevented these resources from being saved. With v5.3.1, the validation logic has been corrected, so users can now create and test Custom Fields content types as intended.
 
-As part of our continuous performance work, this release concentrates on folder browsing.
-Loading folders and their resources is now faster and reduces the load on API and client,
-improving day-to-day usability for organizations having thousands of credentials under management.
-
-Several bugs reported by the community have also been fixed. As always, thank you to everyone who
-took the time to file issues, test patches and suggest improvements.
-For a complete list of changes, consult the changelog.
-
-## [5.3.0] - 2025-07-09
-### Added
-- PB-43066 As a developer I can setup my development environment using ddev
-- PB-43188 Adds Custom Fields Standalone resource type migration
-- PB-43383 Improves the performance of most paginated endpoints
-- PB-43659 Improve error handling when metadata key could not be saved due to unexpected reason
+Thank you to everyone in the community who spotted the issue so quickly and helped us verify the fix!
 
+## [5.3.1] - 2025-07-09
 ### Fixed
-- PB-43382 As an administrator I should not get a connection error when running the healthcheck when the database is empty
-- PB-43007 Fixes emails not sent after v5 upgrade if SMTP credentials are stored in environment variables (GITHUB #545)
-- PB-43122 As an administrator retrieving users metadata key, I should not trigger a validation type issue on the missing metadata_keys_id in certain conditions
-- PB-43137 Fixes a potential settings conflict in user key policy where key of type rsa should not have a preferred curve
-- PB-42784 As an administrator I should not get a health check error when all email notifications are enabled
-- PB-43259 Fixes a record not found error on table `organization_settings` in healthcheck after v5 upgrade (GITHUB #548)
-- PB-42072 As a user sharing permissions, I should not get a 500 response if the payload is wrongly formatted
-- PB-42071 Fixes 500 errors on malformed UTF-8 character-based URLs when using the JsonTraceFormatter class
-- PB-43659 Improves the error catching on creation of organization metadata key
-
-### Maintenance
-- PB-42177 Upgrades CakePHP version to 5.2.5
-- PB-43010 Replaces the use of static fixtures with fixture factories in multiple test cases
-- PB-41724 Map _cake_core_ cache config with _cake_translations_ in the bootstrap.php file
-- PB-42380 Adds the missing v5 resource types on data insertion in the passbolt-test-data vendor
-- PB-43658 Use FQN to load all vendor plugin
+- PB-43748 Users are unable to save a new standalone custom field resource

config/version.php

@@ -1,8 +1,8 @@
 <?php
 return [
     'passbolt' => [
-        'version' => '5.3.0',
-        'name' => 'Riders on the Storm',
+        'version' => '5.3.1',
+        'name' => 'Beautiful People',
     ],
     'php' => [
         'minVersion' => '8.2',

plugins/PassboltCe/Metadata/tests/TestCase/Controller/Resources/ResourcesAddControllerTest.php

@@ -23,6 +23,7 @@
 use App\Test\Factory\UserFactory;
 use App\Test\Lib\AppIntegrationTestCaseV5;
 use App\Test\Lib\Model\EmailQueueTrait;
+use App\Utility\UuidFactory;
 use Cake\Core\Configure;
 use Cake\Event\EventList;
 use Cake\Event\EventManager;
@@ -32,6 +33,7 @@
 use Passbolt\Metadata\Test\Factory\MetadataKeysSettingsFactory;
 use Passbolt\Metadata\Test\Factory\MetadataTypesSettingsFactory;
 use Passbolt\Metadata\Test\Utility\GpgMetadataKeysTestTrait;
+use Passbolt\ResourceTypes\Model\Entity\ResourceType;
 use Passbolt\ResourceTypes\ResourceTypesPlugin;
 use Passbolt\ResourceTypes\Test\Factory\ResourceTypeFactory;
 
@@ -49,13 +51,35 @@ public function setUp(): void
         EventManager::instance()->setEventList(new EventList());
     }
 
-    public function testResourcesAddController_Success_SharedKeyType(): void
+    public function v5ResourceTypesSlugProvider()
+    {
+        $resourceTypeSlugs = [];
+        foreach (ResourceType::V5_RESOURCE_TYPE_SLUGS as $v5ResourceTypeSlug) {
+            // simple password string isn't possible in v5
+            if ($v5ResourceTypeSlug === ResourceType::SLUG_V5_PASSWORD_STRING) {
+                continue;
+            }
+
+            $resourceTypeSlugs[] = [$v5ResourceTypeSlug];
+        }
+
+        return $resourceTypeSlugs;
+    }
+
+    /**
+     * @dataProvider v5ResourceTypesSlugProvider
+     * @return void
+     */
+    public function testResourcesAddController_Success_SharedKeyType(string $resourceTypeSlug): void
     {
         MetadataTypesSettingsFactory::make()->v5()->persist();
         $user = UserFactory::make()->user()->persist();
         $metadataKey = MetadataKeyFactory::make()->withCreatorAndModifier($user)->withServerPrivateKey()->persist();
         $v4ResourceTypeId = ResourceTypeFactory::make()->passwordString()->persist()->get('id');
-        $resourceTypeId = ResourceTypeFactory::make()->v5Default()->persist()->get('id');
+        $resourceTypeId = ResourceTypeFactory::make([
+            'id' => UuidFactory::uuid('resource-types.id.' . $resourceTypeSlug),
+            'slug' => $resourceTypeSlug,
+        ])->persist()->get('id');
         $metadataKeyId = $metadataKey->get('id');
         $dummyResourceData = $this->getDummyResourcesPostData([
             'resource_type_id' => $v4ResourceTypeId, // v4 here is intentional, needed for mapping

plugins/PassboltCe/Metadata/tests/TestCase/Service/Resources/MetadataResourcesAddServiceTest.php

@@ -210,7 +210,7 @@ public function testMetadataResourceAddService_Error_ValidationResourceTypeNotV5
             $this->service->add($uac, new MetadataResourceDto($payload));
         } catch (ValidationException $exception) {
             $this->assertSame(
-                'The resource type should be one of the following: v5-password-string, v5-default, v5-totp-standalone, v5-default-with-totp, v5-custom-fields-standalone.',
+                'The resource type should be one of the following: v5-password-string, v5-default, v5-totp-standalone, v5-default-with-totp, v5-custom-fields.',
                 $exception->getErrors()['resource_type_id']['inList']
             );
         }

plugins/PassboltCe/ResourceTypes/src/Model/Entity/ResourceType.php

@@ -53,7 +53,7 @@ class ResourceType extends Entity
     public const SLUG_V5_DEFAULT = 'v5-default';
     public const SLUG_V5_TOTP_STANDALONE = 'v5-totp-standalone';
     public const SLUG_V5_DEFAULT_WITH_TOTP = 'v5-default-with-totp';
-    public const SLUG_V5_CUSTOM_FIELD_STANDALONE = 'v5-custom-fields-standalone';
+    public const SLUG_V5_CUSTOM_FIELD_STANDALONE = 'v5-custom-fields';
     public const V5_RESOURCE_TYPE_SLUGS = [
         self::SLUG_V5_PASSWORD_STRING,
         self::SLUG_V5_DEFAULT,
@@ -124,6 +124,7 @@ public static function getV5ResourceTypes(): array
             UuidFactory::uuid5('resource-types.id.' . ResourceType::SLUG_V5_DEFAULT),
             UuidFactory::uuid5('resource-types.id.' . ResourceType::SLUG_V5_TOTP_STANDALONE),
             UuidFactory::uuid5('resource-types.id.' . ResourceType::SLUG_V5_DEFAULT_WITH_TOTP),
+            UuidFactory::uuid5('resource-types.id.' . ResourceType::SLUG_V5_CUSTOM_FIELD_STANDALONE),
         ];
     }
 }

plugins/PassboltCe/ResourceTypes/tests/Factory/ResourceTypeFactory.php

@@ -132,6 +132,14 @@ public function v5DefaultWithTotp(): self
         ]);
     }
 
+    public function v5CustomFieldsStandalone(): self
+    {
+        return $this->patchData([
+            'id' => UuidFactory::uuid('resource-types.id.' . ResourceType::SLUG_V5_CUSTOM_FIELD_STANDALONE),
+            'slug' => ResourceType::SLUG_V5_CUSTOM_FIELD_STANDALONE,
+        ]);
+    }
+
     public function deleted(?Date $deleted = null): self
     {
         if (is_null($deleted)) {