Merge branch 'feature/PB-40684-common' into 'common'

PB-40684 When disabling v5 flag, the metadata plugin should be shown as disabled in settings.json

See merge request passbolt/passbolt-pro-api!2103

Author: pabloelcolombiano

plugins/PassboltCe/Metadata/tests/TestCase/Controller/SettingsIndexControllerTest.php

@@ -42,6 +42,17 @@ public function testSettingsIndexController_MetadataPlugin_Not_Enabled_Logged_In
         Configure::write('passbolt.v5.enabled', false);
         $this->logInAsUser();
         $this->getJson('/settings.json');
-        $this->assertFalse(isset($this->_responseJsonBody->passbolt->plugins->metadata));
+        $this->assertFalse($this->_responseJsonBody->passbolt->plugins->metadata->enabled);
+    }
+
+    public function testSettingsIndexController_v5_Flag_Disabled_MetadataPlugin_Enabled(): void
+    {
+        // Disable the v5 flag
+        Configure::write('passbolt.v5.enabled', false);
+        // The metadata enabled flag should be overwritten by 'passbolt.v5.enabled'
+        Configure::write('passbolt.plugins.metadata.enabled', true);
+        $this->logInAsUser();
+        $this->getJson('/settings.json');
+        $this->assertFalse($this->_responseJsonBody->passbolt->plugins->metadata->enabled);
     }
 }

src/BaseSolutionBootstrapper.php

@@ -53,10 +53,8 @@ public function addFeaturePlugins(Application $app): void
         }
 
         // Add Common plugins.
-        if (Configure::read('passbolt.v5.enabled')) {
-            $app->addPlugin('Passbolt/Metadata', ['bootstrap' => true, 'routes' => true]);
-            Configure::write('passbolt.plugins.metadata.enabled', true);
-        }
+        Configure::write('passbolt.plugins.metadata.enabled', Configure::read('passbolt.v5.enabled'));
+        $this->addFeaturePluginIfEnabled($app, 'Metadata');
         $this->addFeaturePluginIfEnabled($app, 'Rbacs');
         $app->addPlugin('Passbolt/AccountSettings', ['bootstrap' => true, 'routes' => true]);
         $app->addPlugin('Passbolt/Import', ['bootstrap' => true, 'routes' => true]);