Merge branch 'epic/ECTO-2267' into trunk

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "swag/swag-extension-store",
-    "version": "4.2.3",
+    "version": "7.0.0",
     "description": "SWAG Extension Store",
     "type": "shopware-platform-plugin",
     "license": "MIT",

src/Controller/LicenseController.php

@@ -35,15 +35,15 @@ public function createCart(Request $request, Context $context): JsonResponse
         $extensionId = $request->request->get('extensionId');
         $variantId = $request->request->get('variantId');
 
-        if (!is_numeric($extensionId)) {
+        if (!\is_int($extensionId) && !\is_string($extensionId)) {
             throw ExtensionStoreException::invalidExtensionId();
         }
 
-        if (!is_numeric($variantId)) {
+        if (!\is_int($variantId) && !\is_string($variantId)) {
             throw ExtensionStoreException::invalidVariantId();
         }
 
-        $cart = $this->licenseService->createCart((int) $extensionId, (int) $variantId, $context);
+        $cart = $this->licenseService->createCart($extensionId, $variantId, $context);
 
         return new JsonResponse($cart);
     }

src/Exception/ExtensionStoreApiException.php

@@ -11,15 +11,15 @@ class ExtensionStoreApiException extends StoreApiException
 {
     protected string $apiCode;
 
+    protected string $description;
+
     public function __construct(ClientException $exception)
     {
         parent::__construct($exception);
 
-        try {
-            $data = json_decode($exception->getResponse()->getBody()->getContents(), true, 512, \JSON_THROW_ON_ERROR);
-        } catch (\JsonException) {
-        }
+        $data = $this->getData($exception);
         $this->apiCode = $data['code'] ?? '';
+        $this->description = $data['description'] ?? '';
     }
 
     public function getErrors(bool $withTrace = false): \Generator
@@ -29,7 +29,31 @@ public function getErrors(bool $withTrace = false): \Generator
             yield [
                 ...$error,
                 'apiCode' => $this->apiCode,
+                'description' => $this->description,
             ];
         }
     }
+
+    /**
+     * @return array<array-key, mixed>
+     */
+    private function getData(ClientException $exception): array
+    {
+        $body = $exception->getResponse()->getBody();
+
+        // The parent constructor already read the body to its end and left the stream at EOF,
+        // so reading it again without rewinding yields an empty string.
+        if ($body->isSeekable()) {
+            $body->rewind();
+        }
+
+        try {
+            $data = json_decode($body->getContents(), true, 512, \JSON_THROW_ON_ERROR);
+        } catch (\JsonException) {
+            return [];
+        }
+
+        // A body may be valid JSON without being an object, e.g. a bare string or number.
+        return \is_array($data) ? $data : [];
+    }
 }

src/Migration/Migration1779864357StoreIFrameUrlConfig.php

@@ -0,0 +1,41 @@
+<?php declare(strict_types=1);
+
+namespace SwagExtensionStore\Migration;
+
+use Doctrine\DBAL\Connection;
+use Shopware\Core\Defaults;
+use Shopware\Core\Framework\Log\Package;
+use Shopware\Core\Framework\Migration\MigrationStep;
+use Shopware\Core\Framework\Uuid\Uuid;
+
+/**
+ * @internal
+ */
+#[Package('checkout')]
+class Migration1779864357StoreIFrameUrlConfig extends MigrationStep
+{
+    public function getCreationTimestamp(): int
+    {
+        return 1779864357;
+    }
+
+    public function update(Connection $connection): void
+    {
+        $configurationKey = 'SwagExtensionStore.config.iframeUrl';
+        $configurationExists = $connection->fetchOne(
+            'SELECT 1 FROM system_config WHERE configuration_key = :configurationKey',
+            ['configurationKey' => $configurationKey],
+        );
+
+        if ($configurationExists !== false) {
+            return;
+        }
+
+        $connection->insert('system_config', [
+            'id' => Uuid::randomBytes(),
+            'configuration_key' => $configurationKey,
+            'configuration_value' => '{"_value": "https://sky-bridge-store.production.shopware.in"}',
+            'created_at' => (new \DateTimeImmutable())->format(Defaults::STORAGE_DATE_TIME_FORMAT),
+        ]);
+    }
+}

src/Resources/app/administration/eslint.config.mjs

@@ -91,6 +91,7 @@ export default tseslint.config(
             'stylistic/quote-props': ['error', 'as-needed'],
             'stylistic/no-extra-semi': ['error'],
             'stylistic/comma-dangle': ['error', 'always-multiline'],
+            'stylistic/quotes': ['error', 'single'],
             /* stylistic rules */
 
             /* typescript rules */

src/Resources/app/administration/jest.config.js

@@ -46,6 +46,7 @@ module.exports = {
         '^@shopware-ag/meteor-component-library$': `${process.env.ADMIN_PATH}/node_modules/@shopware-ag/meteor-component-library/dist/common/index.js`,
         vue$: `${process.env.ADMIN_PATH}/node_modules/vue/dist/vue.cjs.js`,
         '^@vue/test-utils$': `${process.env.ADMIN_PATH}/node_modules/@vue/test-utils/dist/vue-test-utils.cjs.js`,
+        '^lodash-es/(.*)$': 'lodash/$1',
     },
 
     testEnvironmentOptions: {

src/Resources/app/administration/package.json

@@ -30,5 +30,8 @@
     },
     "optionalDependencies": {
         "administration": "^6.x"
+    },
+    "dependencies": {
+        "@shopware-ag/meteor-admin-sdk": "^6.8.0"
     }
 }

src/Resources/app/administration/src/global.types.ts

@@ -1,12 +1,19 @@
 import type { PropType as TPropType } from 'vue';
 import type InAppPurchasesService from './module/sw-in-app-purchases/service/in-app-purchases.service';
 import type { AxiosError } from 'axios';
+import type ExtensionStorePreferencesService
+    from 'SwagExtensionStore/module/sw-extension-store/service/extension-store-preferences.service';
+import type {
+    ExtensionStoreChannelService,
+} from 'SwagExtensionStore/module/sw-extension-store/service/extension-store-channel.service';
 
 declare global {
     type PropType<T> = TPropType<T>;
 
     interface ServiceContainer {
         inAppPurchasesService: InAppPurchasesService;
+        extensionStoreChannelService: ExtensionStoreChannelService;
+        extensionStorePreferencesService: ExtensionStorePreferencesService;
     }
 
     type ErrorResponse = AxiosError<{ errors: Array<ShopwareHttpError & { apiCode: string }> }>;