Remove moduleKey usage, fix license check

FriendsOfShopware · Apr 1, 2021 · a1cd67b · a1cd67b
1 parent 5984e36
commit a1cd67b
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/examples/api/plugins.json b/examples/api/plugins.json
@@ -49,7 +49,6 @@
     },
     "name": "",
     "code": "Frosh33641717512",
-    "moduleKey": "",
     "lifecycleStatus": {
       "id": 1,
       "name": "created",

diff --git a/src/Components/SBP/Components/Producer.php b/src/Components/SBP/Components/Producer.php
@@ -39,8 +39,8 @@ public function getPlugin(string $name): Plugin
         $plugins = $this->getPlugins($name);
 
         foreach ($plugins as $plugin) {
-            if (strtolower($name) === strtolower($plugin->moduleKey)) {
-                return $plugin;
+            if (strtolower($name) === strtolower($plugin->name)) {
+                return $this->client->Plugins()->get($plugin->id);
             }
         }
 
@@ -60,7 +60,6 @@ public function createPlugin(string $name, string $generation): Plugin
 
         $createdPlugin = Plugin::map(json_decode($plugin));
         $createdPlugin->name = $name;
-        $createdPlugin->moduleKey = $name;
 
         return $this->client->Plugins()->put($createdPlugin->id, $createdPlugin);
     }

diff --git a/src/Structs/Plugin.php b/src/Structs/Plugin.php
@@ -43,9 +43,6 @@ class Plugin extends Struct
     /** @var string */
     public $code;
 
-    /** @var string */
-    public $moduleKey;
-
     /** @var LifecycleStatus */
     public $lifecycleStatus;
 

diff --git a/tests/fixtures/plugin.json b/tests/fixtures/plugin.json
@@ -60,7 +60,6 @@
   },
   "name": "FroshPlatformThumbnailProcessor",
   "code": "Frosh69611263569",
-  "moduleKey": "FroshPlatformThumbnailProcessor",
   "lifecycleStatus": {
     "id": 5,
     "name": "readyforstore",