NEXT-36303 - Feature: In App Purchases

Author: mstegmeyer

changelog/_unreleased/2024-08-15-allow-injection-of-additional-context-actions-above-uninstall-in-sw-extension-card-base.md

@@ -0,0 +1,9 @@
+---
+title: Allow injection of additional context actions above dangerous actions in sw-extension-card-base
+issue: NEXT-37409
+author: Lennart Tinkloh
+author_email: [email protected]
+author_github: @lernhart
+---
+# Administration
+* Added block `sw_extension_card_base_context_menu_actions_additional` in `sw-extension-card-base` to allow injection of additional context actions above dangerous actions like uninstall.

devenv.lock

@@ -3,10 +3,10 @@
     "devenv": {
       "locked": {
         "dir": "src/modules",
-        "lastModified": 1731361978,
+        "lastModified": 1732585607,
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "4b770aa91211fc1875d9d07aedf80ea2eae012d5",
+        "rev": "a520f05c40ebecaf5e17064b27e28ba8e70c49fb",
         "type": "github"
       },
       "original": {
@@ -53,10 +53,10 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731245184,
+        "lastModified": 1732238832,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
+        "rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
         "type": "github"
       },
       "original": {
@@ -68,10 +68,10 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1731239293,
+        "lastModified": 1731797254,
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9256f7c71a195ebe7a218043d9f93390d49e6884",
+        "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
         "type": "github"
       },
       "original": {
@@ -91,10 +91,10 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1731363552,
+        "lastModified": 1732021966,
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cd1af27aa85026ac759d5d3fccf650abe7e1bbf0",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
         "type": "github"
       },
       "original": {

phpstan-baseline.neon

@@ -1,10 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Throwing new exceptions within classes are not allowed\\. Please use domain exception pattern\\. See https\\://github\\.com/shopware/platform/blob/v6\\.4\\.20\\.0/adr/2022\\-02\\-24\\-domain\\-exceptions\\.md$#"
-			count: 5
-			path: src/Administration/Controller/AdminExtensionApiController.php
-
 		-
 			message: "#^Throwing new exceptions within classes are not allowed\\. Please use domain exception pattern\\. See https\\://github\\.com/shopware/platform/blob/v6\\.4\\.20\\.0/adr/2022\\-02\\-24\\-domain\\-exceptions\\.md$#"
 			count: 2

src/Administration/Controller/AdminExtensionApiController.php

@@ -2,18 +2,17 @@
 
 namespace Shopware\Administration\Controller;
 
-use Shopware\Administration\Controller\Exception\AppByNameNotFoundException;
-use Shopware\Administration\Controller\Exception\MissingAppSecretException;
 use Shopware\Core\Framework\App\ActionButton\AppAction;
 use Shopware\Core\Framework\App\ActionButton\Executor;
 use Shopware\Core\Framework\App\AppEntity;
+use Shopware\Core\Framework\App\AppException;
 use Shopware\Core\Framework\App\Hmac\QuerySigner;
-use Shopware\Core\Framework\App\Manifest\Exception\UnallowedHostException;
 use Shopware\Core\Framework\App\Payload\AppPayloadServiceHelper;
 use Shopware\Core\Framework\Context;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Criteria;
 use Shopware\Core\Framework\DataAbstractionLayer\Search\Filter\EqualsFilter;
+use Shopware\Core\Framework\Feature;
 use Shopware\Core\Framework\Log\Package;
 use Shopware\Core\Framework\Uuid\Uuid;
 use Shopware\Core\Framework\Validation\DataBag\RequestDataBag;
@@ -49,28 +48,31 @@ public function runAction(RequestDataBag $requestDataBag, Context $context): Res
         /** @var AppEntity|null $app */
         $app = $this->appRepository->search($criteria, $context)->first();
         if ($app === null) {
-            throw new AppByNameNotFoundException($appName);
+            throw AppException::appNotFoundByName($appName);
         }
 
         if ($app->getAppSecret() === null) {
-            throw new MissingAppSecretException();
+            if (Feature::isActive('v6.7.0.0')) {
+                throw AppException::appSecretMissing($app->getName());
+            }
+            throw AppException::secretMissing();
         }
 
         $targetUrl = $requestDataBag->getString('url');
         $targetHost = \parse_url($targetUrl, \PHP_URL_HOST);
         $allowedHosts = $app->getAllowedHosts() ?? [];
         if (!$targetHost || !\in_array($targetHost, $allowedHosts, true)) {
-            throw new UnallowedHostException($targetUrl, $allowedHosts, $app->getName());
+            throw AppException::hostNotAllowed($targetUrl, $app->getName());
         }
 
         $ids = $requestDataBag->get('ids', []);
         if (!$ids instanceof RequestDataBag) {
-            throw new \InvalidArgumentException('Ids must be an array');
+            throw AppException::invalidArgument('Ids must be an array');
         }
 
         $action = new AppAction(
             $app,
-            $this->appPayloadServiceHelper->buildSource($app->getVersion()),
+            $this->appPayloadServiceHelper->buildSource($app->getVersion(), $app->getId()),
             $targetUrl,
             $requestDataBag->getString('entity'),
             $requestDataBag->getString('action'),
@@ -93,7 +95,7 @@ public function signUri(RequestDataBag $requestDataBag, Context $context): Respo
         /** @var AppEntity|null $app */
         $app = $this->appRepository->search($criteria, $context)->first();
         if ($app === null) {
-            throw new AppByNameNotFoundException($appName);
+            throw AppException::appNotFoundByName($appName);
         }
 
         $uri = $this->querySigner->signUri($requestDataBag->get('uri'), $app, $context)->__toString();

src/Administration/Resources/app/administration/package-lock.json

@@ -53,7 +53,7 @@
     "safari >= 7"
   ],
   "dependencies": {
-    "@shopware-ag/meteor-admin-sdk": "5.5.0",
+    "@shopware-ag/meteor-admin-sdk": "5.6.1",
     "@shopware-ag/meteor-component-library": "3.11.0",
     "@shopware-ag/meteor-icon-kit": "5.4.0",
     "@shopware-ag/webpack-copy-after-build": "1.0.1",

src/Administration/Resources/app/administration/package.json

@@ -23,6 +23,7 @@
     <sw-license-violation />
     <sw-hidden-iframes />
     <sw-modals-renderer />
+    <sw-in-app-purchase-checkout v-if="isLoggedIn" />
     <sw-app-wrong-app-url-modal v-if="isLoggedIn" />
 
     <mt-toast

src/Administration/Resources/app/administration/src/app/component/structure/sw-admin/sw-admin.html.twig

@@ -16,6 +16,7 @@ async function createWrapper(isLoggedIn, forwardLogout = () => {}, route = 'sw.w
                 'sw-license-violation': true,
                 'sw-hidden-iframes': true,
                 'sw-modals-renderer': true,
+                'sw-in-app-purchase-checkout': true,
                 'sw-app-wrong-app-url-modal': true,
                 'router-view': true,
             },