Merge branch 'feature/PB-39559_v4_12_13-Prepare-API-code' into 'release'

Feature/pb 39559 v4 12 13 prepare api code

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

Author: ishanvyas22

CHANGELOG.md

@@ -2,6 +2,26 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [4.12.0-rc.1] - 2025-03-06
+### Added
+- PB-39395 As an administrator I can contain permissions when upgrading folders to v5 format
+- PB-39394 As an administrator I can contain permissions when upgrading resources to v5 format
+- PB-38850 As an administrator I cannot rotate entities while two metadata keys are active
+- PB-37699 As an administrator I can upgrade folders to v5 format
+- PB-37363 As an administrator I can rotate metadata keys encrypting folders metadata
+- PB-36582 As an administrator I cannot reuse a previously deleted metadata key
+
+### Fixed
+- PB-39512 Fix during metadata upgrade process, the resource_type_id field is now updated in the database
+- PB-39399 Adds missing fields to metadata private keys in index response
+- PB-39393 Fix limit value is null in pagination header response for rotate & upgrade endpoints
+- PB-38770 Fix email subject for delete resource email when resource is v
+- PB-38791 Fix 500 error on the duo MFA setup & verify page when duo service is unavailable
+- PB-38771 Fix unable to expire the metadata key due to expired datetime format
+
+### Maintenance
+- PB-39629 Set next minimum PHP version to 8.2 as passbolt v5 will not support lower PHP versions
+
 ## [4.12.0-test.1] - 2025-03-05
 ### Added
 - PB-39395 As an administrator I can contain permissions when upgrading folders to v5 format

RELEASE_NOTES.md

@@ -1,6 +1,13 @@
-Release song: TBD
+Release song: https://www.youtube.com/watch?v=pBZs_Py-1_0
 
-## [4.12.0-test.1] - 2025-03-05
+Passbolt v4.12.0 introduces 2 new administration pages to manage the migration of metadata and the allowed content, laying groundwork for the upcoming v5 release and its new resource format. This beta feature eases admins, developers and integrators to explore and adapt their systems ahead of the transition.
+
+This release also resolves an ergonomical issue where the multi-selection keyboard shortcuts are now adapted to the OS standard shortcuts.
+A few fixes come with this release as well. Exporting resources now sets all the data properly and creation and edition of a resource sets all the metadata fields as expected, allowing integration to fully validate the metadata.
+
+Thank you to the community for your feedback and support.
+
+## [4.12.0-rc.1] - 2025-03-06
 ### Added
 - PB-39395 As an administrator I can contain permissions when upgrading folders to v5 format
 - PB-39394 As an administrator I can contain permissions when upgrading resources to v5 format
@@ -16,3 +23,6 @@ Release song: TBD
 - PB-38770 Fix email subject for delete resource email when resource is v
 - PB-38791 Fix 500 error on the duo MFA setup & verify page when duo service is unavailable
 - PB-38771 Fix unable to expire the metadata key due to expired datetime format
+
+### Maintenance
+- PB-39629 Set next minimum PHP version to 8.2 as passbolt v5 will not support lower PHP versions

config/version.php

@@ -1,11 +1,11 @@
 <?php
 return [
     'passbolt' => [
-        'version' => '4.12.0-test.1',
-        'name' => 'TBD',
+        'version' => '4.12.0-rc.1',
+        'name' => 'Rusty Cage',
     ],
     'php' => [
         'minVersion' => '7.4',
-        'nextMinVersion' => '8.1',
+        'nextMinVersion' => '8.2',
     ],
 ];

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

@@ -70,6 +70,6 @@ public function testMetadataResourcesDeleteController_Success(): void
         $this->assertSuccess();
         $this->assertEmailQueueCount(1);
         $this->assertEmailSubject($user->username, sprintf('%s deleted a password', Purifier::clean($owner->profile->first_name)));
-        $this->assertEmailInBatchContains(sprintf('%s deleted a password', Purifier::clean($owner->profile->full_name)), $user->username);
+        $this->assertEmailInBatchContains(sprintf('%s deleted a password', $owner->profile->full_name), $user->username);
     }
 }

plugins/PassboltCe/MultiFactorAuthentication/tests/Lib/MfaIntegrationTestCase.php

@@ -123,13 +123,18 @@ public function mockSessionId(string $sessionId)
      * Mock form to prevent failing verify call due timestamp mismatch.
      *
      * @param string $className Form class to mock.
+     * @param \App\Utility\UserAccessControl $uac User access control
      * @return void
      */
-    public function mockTotpMfaForm(string $className): void
+    public function mockTotpMfaFormInterface(string $className, UserAccessControl $uac): void
     {
-        $form = $this->createMock($className);
+        $mfaSettingsMock = $this->getMockBuilder(MfaSettings::class)->disableOriginalConstructor()->getMock();
+        $form = $this->getMockBuilder($className)
+            ->setConstructorArgs([$uac, $mfaSettingsMock])
+            ->onlyMethods(['isValidOtp'])
+            ->getMock();
         $form->method('isValidOtp')->willReturn(true);
-        $this->mockService($className, function () use ($form) {
+        $this->mockService(MfaFormInterface::class, function () use ($form) {
             return $form;
         });
     }

plugins/PassboltCe/MultiFactorAuthentication/tests/TestCase/Controllers/Totp/TotpSetupPostControllerTest.php

@@ -171,7 +171,7 @@ public function testTotpSetupPostController_SuccessSelfGeneratedUriSuccess()
         $otp = Factory::loadFromProvisioningUri($uri);
         $sessionId = 'some_session_id';
         $this->mockSessionId($sessionId);
-        $this->mockTotpMfaForm(TotpSetupForm::class);
+        $this->mockTotpMfaFormInterface(TotpSetupForm::class, $this->makeUac($user));
 
         $this->post('/mfa/setup/totp.json?api-version=v2', [
             'otpProvisioningUri' => $uri,
@@ -199,7 +199,7 @@ public function testTotpSetupPostController_SuccessSelfGeneratedUriSuccess_JWT_A
         $uri = MfaOtpFactory::generateTOTP($this->makeUac($user));
         /** @var \OTPHP\TOTPInterface $otp */
         $otp = Factory::loadFromProvisioningUri($uri);
-        $this->mockTotpMfaForm(TotpSetupForm::class);
+        $this->mockTotpMfaFormInterface(TotpSetupForm::class, $this->makeUac($user));
 
         $this->post('/mfa/setup/totp.json?api-version=v2', [
             'otpProvisioningUri' => $uri,

plugins/PassboltCe/MultiFactorAuthentication/tests/TestCase/Controllers/Totp/TotpVerifyPostControllerTest.php

@@ -58,7 +58,7 @@ public function testMfaVerifyPostTotpUriSuccess()
         [$uri] = $this->loadFixtureScenario(MfaTotpScenario::class, $user);
         /** @var \OTPHP\TOTPInterface $otp */
         $otp = Factory::loadFromProvisioningUri($uri);
-        $this->mockTotpMfaForm(TotpVerifyForm::class);
+        $this->mockTotpMfaFormInterface(TotpVerifyForm::class, $this->makeUac($user));
 
         $this->post('/mfa/verify/totp?redirect=' . $redirect, [
             'totp' => $otp->now(),

tests/TestCase/Controller/Users/UsersIndexControllerPaginationTest.php

@@ -85,16 +85,17 @@ public function testUsersIndexController_Success_Pagination(?string $sortedField
         $page = 2;
         $expectedCurrent = 9;
 
+        $data = Hash::merge(
+            $this->getArrayOfDistinctRandomStrings($numberOfUsers, 'first_name'),
+            $this->getArrayOfDistinctRandomPastDates($numberOfUsers, 'created')
+        );
+
         $admin = UserFactory::make()
             ->admin()
-            ->with('Profiles')
+            ->with('Profiles', array_shift($data))
             ->withLogIn(3)
             ->persist();
 
-        $data = Hash::merge(
-            $this->getArrayOfDistinctRandomStrings($numberOfUsers - 1, 'first_name'),
-            $this->getArrayOfDistinctRandomPastDates($numberOfUsers - 1, 'created')
-        );
         ProfileFactory::make($data)
             ->with('Users', UserFactory::make()->user()->without('Profiles')->withLogIn(3))
             ->persist();