Merge branch 'next-14498/remove-plugin-manager-in-first-run-wizard' into 'trunk'

NEXT-14498 - Remove plugin manager services and refactor extension service

See merge request shopware/6/product/platform!4916

Author: taltholtmann

CHANGELOG.md

@@ -274,6 +274,7 @@ This is the official changelog index of Shopware 6. Here you find a registry of
 *  [NEXT-13821 - Remove the plugin manager from the administration](/changelog/release-6-4-0-0/2021-03-16-remove-the-plugin-manager-from-the-administration.md)
 *  [NEXT-14418 - Component overrides now consider mixins](/changelog/release-6-4-0-0/2021-03-23-component-overrides-now-consider-mixins.md)
 *  [NEXT-13838 - Use sql null safe equals operator](/changelog/release-6-4-0-0/2021-03-24-use-sql-null-safe-equals-operator.md)
+*  [NEXT-14498 - Remove plugin manager dependencies](/changelog/release-6-4-0-0/2021-04-01-remove-plugin-manager-dependencies.md)
 
 ## 6.3.5.2
 *  [NEXT-13710 - Added api aware flag for category tree](/changelog/release-6-3-5-2/2021-02-22-added-api-aware-flag-for-category-tree.md)

UPGRADE-6.4.md

@@ -113,6 +113,7 @@ Use `bin/console dal:validate` to see if you have to adjust your plugins anywher
 
 ## Removed plugin manager
 The plugin manager in the administration is removed with all of its components and replaced by the `sw-extension` module.
+The controller for the plugin manager with all of its routes is removed and replaced by the `ExtensionStoreActionsController`.
 
 ---
 

changelog/release-6-4-0-0/2021-04-01-remove-plugin-manager-dependencies.md

@@ -0,0 +1,24 @@
+---
+title: Remove plugin manager dependencies
+issue: NEXT-14498
+author: Timo Altholtmann
+ 
+---
+# Core
+* Removed class `PluginController`
+* Removed controller for route `/api/_action/plugin/upload`
+* Removed controller for route `/api/_action/plugin/delete`
+* Removed controller for route `/api/_action/plugin/refresh`
+* Removed controller for route `/api/_action/plugin/install`
+* Removed controller for route `/api/_action/plugin/uninstall`
+* Removed controller for route `/api/_action/plugin/activate`
+* Removed controller for route `/api/_action/plugin/deactivate`
+* Removed controller for route `/api/_action/plugin/update`
+___
+# Administration
+* Removed service `pluginService`
+* Removed service `extensionService`
+___
+# Upgrade Information
+## Removed plugin manager code
+The controller for the plugin manager with all of its routes is removed and replaced by the `ExtensionStoreActionsController`.

phpstan-baseline.neon

@@ -3245,11 +3245,6 @@ parameters:
 			count: 1
 			path: src/Core/Framework/Migration/MigrationCollection.php
 
-		-
-			message: "#^Parameter \\#1 \\$mimeType of class Shopware\\\\Core\\\\Framework\\\\Plugin\\\\Exception\\\\PluginNotAZipFileException constructor expects string, string\\|null given\\.$#"
-			count: 1
-			path: src/Core/Framework/Plugin/Api/PluginController.php
-
 		-
 			message: "#^Method Shopware\\\\Core\\\\Framework\\\\Plugin\\\\Changelog\\\\ChangelogParser\\:\\:parseTitle\\(\\) has parameter \\$line with no typehint specified\\.$#"
 			count: 1

src/Administration/Resources/app/administration/src/app/component/utils/sw-license-violation/index.js

@@ -11,7 +11,6 @@ Shopware.Component.register('sw-license-violation', {
 
     inject: [
         'licenseViolationService',
-        'pluginService',
         'cacheApiService',
         'loginService'
 
@@ -127,9 +126,9 @@ Shopware.Component.register('sw-license-violation', {
             this.addLoading('fetchPlugins');
 
             if (Shopware.Feature.isActive('FEATURE_NEXT_12608')) {
-                const extensionApiService = Shopware.Service('extensionApiService');
+                const extensionStoreActionService = Shopware.Service('extensionStoreActionService');
 
-                extensionApiService.getMyExtensions()
+                extensionStoreActionService.getMyExtensions()
                     .then((response) => {
                         this.plugins = response;
                     })
@@ -166,7 +165,7 @@ Shopware.Component.register('sw-license-violation', {
 
             const matchingPlugin = this.plugins.find((plugin) => plugin.name === violation.name);
 
-            return this.licenseViolationService.forceDeletePlugin(this.pluginService, matchingPlugin)
+            return this.licenseViolationService.forceDeletePlugin(matchingPlugin)
                 .then(() => {
                     this.createNotificationSuccess({
                         message: this.$tc('sw-license-violation.successfullyDeleted')

src/Administration/Resources/app/administration/src/app/main.js

@@ -103,8 +103,7 @@ Application
     .addServiceProvider('extensionHelperService', () => {
         return new ExtensionHelperService({
             storeService: Shopware.Service('storeService'),
-            pluginService: Shopware.Service('pluginService'),
-            extensionApiService: Shopware.Service('extensionApiService')
+            extensionStoreActionService: Shopware.Service('extensionStoreActionService')
         });
     })
     .addServiceProvider('languageAutoFetchingService', () => {

src/Administration/Resources/app/administration/src/app/service/extension-helper.service.js

@@ -1,40 +1,39 @@
 export default class ExtensionHelperService {
-    constructor({ storeService, pluginService, extensionApiService }) {
+    constructor({ storeService, extensionStoreActionService }) {
         this.storeService = storeService;
-        this.pluginService = pluginService;
-        this.extensionApiService = extensionApiService;
+        this.extensionStoreActionService = extensionStoreActionService;
     }
 
-    async downloadAndActivateExtension(extensionName) {
+    async downloadAndActivateExtension(extensionName, type = 'plugin') {
         const extensionStatus = await this.getStatusOfExtension(extensionName);
 
         if (!extensionStatus.downloaded) {
             await this.downloadStoreExtension(extensionName);
         }
 
         if (!extensionStatus.installedAt) {
-            await this.installStoreExtension(extensionName);
+            await this.installStoreExtension(extensionName, type);
         }
 
         if (!extensionStatus.active) {
-            await this.activateStoreExtension(extensionName);
+            await this.activateStoreExtension(extensionName, type);
         }
     }
 
     downloadStoreExtension(extensionName) {
         return this.storeService.downloadPlugin(extensionName, true, true);
     }
 
-    installStoreExtension(extensionName) {
-        return this.pluginService.install(extensionName);
+    installStoreExtension(extensionName, type) {
+        return this.extensionStoreActionService.installExtension(extensionName, type);
     }
 
-    activateStoreExtension(extensionName) {
-        return this.pluginService.activate(extensionName);
+    activateStoreExtension(extensionName, type) {
+        return this.extensionStoreActionService.activateExtension(extensionName, type);
     }
 
     async getStatusOfExtension(extensionName) {
-        const extensions = await this.extensionApiService.getMyExtensions();
+        const extensions = await this.extensionStoreActionService.getMyExtensions();
         const extension = extensions.find(e => e && e.name === extensionName);
 
         if (!extension) {

src/Administration/Resources/app/administration/src/app/service/license-violations.service.js

@@ -151,49 +151,28 @@ export default function createLicenseViolationsService(storeService) {
         localStorage.removeItem(responseCacheKey);
     }
 
-    async function forceDeletePlugin(pluginService, extension) {
-        if (Shopware.Feature.isActive('FEATURE_NEXT_12608')) {
-            const extensionApiService = Shopware.Service('shopwareExtensionService');
-            const cacheService = Shopware.Service('cacheApiService');
-
-            try {
-                const isActive = extension.active;
-                const isInstalled = extension.installedAt !== null;
-
-                if (isActive) {
-                    await extensionApiService.deactivateExtension(extension.name, extension.type);
-                    await cacheService.clear();
-                }
-
-                if (isInstalled) {
-                    await extensionApiService.uninstallExtension(extension.name, extension.type);
-                }
+    async function forceDeletePlugin(extension) {
+        const shopwareExtensionService = Shopware.Service('shopwareExtensionService');
+        const cacheService = Shopware.Service('cacheApiService');
 
-                await extensionApiService.removeExtension(extension.name, extension.type);
+        try {
+            const isActive = extension.active;
+            const isInstalled = extension.installedAt !== null;
 
-                return true;
-            } catch (error) {
-                throw new Error(error);
+            if (isActive) {
+                await shopwareExtensionService.deactivateExtension(extension.name, extension.type);
+                await cacheService.clear();
             }
-        } else {
-            try {
-                const isActive = extension.active;
-                const isInstalled = extension.installedAt !== null;
-
-                if (isActive) {
-                    await pluginService.deactivate(extension.name);
-                }
 
-                if (isInstalled) {
-                    await pluginService.uninstall(extension.name);
-                }
+            if (isInstalled) {
+                await shopwareExtensionService.uninstallExtension(extension.name, extension.type);
+            }
 
-                await pluginService.delete(extension.name);
+            await shopwareExtensionService.removeExtension(extension.name, extension.type);
 
-                return true;
-            } catch (error) {
-                throw new Error(error);
-            }
+            return true;
+        } catch (error) {
+            throw new Error(error);
         }
     }
 

src/Administration/Resources/app/administration/src/core/service/api/plugin.api.service.js

@@ -7,7 +7,7 @@ const { Component, Mixin } = Shopware;
 Component.register('sw-extension-file-upload', {
     template,
 
-    inject: ['extensionApiService', 'repositoryFactory'],
+    inject: ['extensionStoreActionService', 'repositoryFactory'],
 
     mixins: [
         Mixin.getByName('notification')
@@ -35,7 +35,7 @@ Component.register('sw-extension-file-upload', {
             const formData = new FormData();
             formData.append('file', files[0]);
 
-            return this.extensionApiService.upload(formData).then(() => {
+            return this.extensionStoreActionService.upload(formData).then(() => {
                 Shopware.Service('shopwareExtensionService').updateExtensionData().then(() => {
                     return this.createNotificationSuccess({
                         message: this.$tc('sw-extension.my-extensions.fileUpload.messageUploadSuccess')