6.7 compatibility

Author: runelaenen

.github/workflows/package.yml

@@ -0,0 +1,27 @@
+name: shopware-cli
+on:
+  pull_request:
+  push:
+
+permissions:
+  contents: write
+
+jobs:
+  checks:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Install Shopware CLI
+        uses: shopware/shopware-cli-action@v1
+
+      - name: Validation
+        run: shopware-cli extension validate --full --reporter github .
+
+  zip:
+    uses: shopware/github-actions/.github/workflows/build-zip.yml@main
+    with:
+      extensionName: RuneLaenenTwoFactorAuth

.github/workflows/shopware-cli.yml

@@ -5,3 +5,4 @@ src/Resources/app/administration/.tmp
 src/Resources/public/administration/.vite
 src/Resources/public/administration/assets
 var/cache
+.DS_Store

.gitignore

@@ -19,9 +19,11 @@ Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website.
    - German
    - French
    - Dutch
+   - Polish
+ 
 ## Providers
 At the moment only Google Authenticator (compatible) apps are supported. 
-For example Google Authenticator, Authy, LastPass, ...
+For example Google Authenticator, Authy, LastPass, Bitwarden, ...
 
 ## Installation guide
 
@@ -40,4 +42,4 @@ bin/build-js.sh
 ```
 
 ## Development
- - Use bin/ecs-fix.sh to fix code standard issues.
+Keep in mind that 2FA authentication will not work in the development Administration watcher mode.

README.md

@@ -1,43 +1,50 @@
 {
-    "name": "runelaenen/shopware6-two-factor-auth",
-    "description": "Two Factor Authentication plugin",
-    "type": "shopware-platform-plugin",
-    "license": "MIT",
-    "version": "7.0.0",
-    "autoload": {
-        "psr-4": {
-            "RuneLaenen\\TwoFactorAuth\\": "src/"
-        }
+  "name": "runelaenen/shopware6-two-factor-auth",
+  "description": "Two Factor Authentication plugin",
+  "type": "shopware-platform-plugin",
+  "license": "MIT",
+  "version": "7.0.0",
+  "autoload": {
+    "psr-4": {
+      "RuneLaenen\\TwoFactorAuth\\": "src/"
+    }
+  },
+  "extra": {
+    "shopware-plugin-class": "RuneLaenen\\TwoFactorAuth\\RuneLaenenTwoFactorAuth",
+    "plugin-icon": "src/Resources/config/plugin.png",
+    "label": {
+      "de-DE": "Two Factor Authentication plugin",
+      "en-GB": "Two Factor Authentication plugin"
     },
-    "extra": {
-        "shopware-plugin-class": "RuneLaenen\\TwoFactorAuth\\RuneLaenenTwoFactorAuth",
-        "plugin-icon": "src/Resources/config/plugin.png",
-        "label": {
-            "de-DE": "Two Factor Authentication plugin",
-            "en-GB": "Two Factor Authentication plugin"
-        },
-        "description": {
-            "de-DE": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website.",
-            "en-GB": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website."
-        },
-        "manufacturerLink": {
-            "de-DE": "https://kraftware.be/",
-            "en-GB": "https://kraftware.be/"
-        },
-        "supportLink": {
-            "de-DE": "https://github.com/runelaenen/shopware6-two-factor-auth/issues",
-            "en-GB": "https://github.com/runelaenen/shopware6-two-factor-auth/issues"
-        }
+    "description": {
+      "de-DE": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website.",
+      "en-GB": "Add extra security to your Shopware 6 shop by enabling Two Factor Authentication. Adds an extra prompt to admin- or customer-accounts in your Shopware 6 website."
     },
-    "require": {
-        "shopware/core": "~6.7.0",
-        "pragmarx/google2fa": "^8.0",
-        "bacon/bacon-qr-code": "^3.0"
+    "manufacturerLink": {
+      "de-DE": "https://kraftware.be/",
+      "en-GB": "https://kraftware.be/"
     },
-    "require-dev": {
-        "phpro/grumphp-shim": "^1.3",
-        "shopware/platform": "*",
-        "symplify/easy-coding-standard": "^9.4",
-        "kubawerlos/php-cs-fixer-custom-fixers": "^3.1"
+    "supportLink": {
+      "de-DE": "https://github.com/runelaenen/shopware6-two-factor-auth/issues",
+      "en-GB": "https://github.com/runelaenen/shopware6-two-factor-auth/issues"
+    }
+  },
+  "require": {
+    "shopware/core": "~6.7.0",
+    "pragmarx/google2fa": "^8.0",
+    "bacon/bacon-qr-code": "^3.0"
+  },
+  "require-dev": {
+    "phpro/grumphp-shim": "^1.3",
+    "shopware/platform": "*",
+    "symplify/easy-coding-standard": "^9.4",
+    "kubawerlos/php-cs-fixer-custom-fixers": "^3.1"
+  },
+  "authors": [
+    {
+      "name": "Kraftware",
+      "email": "hello@kraftware.be",
+      "homepage": "https://www.kraftware.be"
     }
+  ]
 }

composer.json

@@ -30,7 +30,8 @@ public function __construct(
         private readonly EventDispatcherInterface $dispatcher,
         #[Autowire(service: 'Shopware\Core\Checkout\Customer\SalesChannel\LogoutRoute')]
         private readonly AbstractLogoutRoute $logoutRoute,
-    ) {}
+    ) {
+    }
 
     #[Route(path: '/rl-2fa/verification', name: 'frontend.rl2fa.verification', methods: ['GET', 'POST'])]
     public function verification(Request $request, SalesChannelContext $context): Response

src/Controller/StorefrontTwoFactorAuthController.php

@@ -27,7 +27,8 @@ public function __construct(
         #[Autowire(service: 'Shopware\Storefront\Framework\Routing\Router')]
         private readonly RouterInterface $router,
         private readonly ConfigurationService $configurationService,
-    ) {}
+    ) {
+    }
 
     #[Route(path: '/generate-secret', name: 'api.action.rl-2fa.generate-secret', methods: ['GET'])]
     public function generateSecret(Request $request): JsonResponse

src/Controller/TwoFactorAuthenticationApiController.php

@@ -5,11 +5,13 @@
 namespace RuneLaenen\TwoFactorAuth\Controller;
 
 use RuneLaenen\TwoFactorAuth\Service\ConfigurationService;
+use RuneLaenen\TwoFactorAuth\Service\TimebasedOneTimePasswordService;
 use RuneLaenen\TwoFactorAuth\Service\TimebasedOneTimePasswordServiceInterface;
 use Shopware\Core\Checkout\Customer\Password\LegacyPasswordVerifier;
 use Shopware\Core\Framework\DataAbstractionLayer\EntityRepository;
 use Shopware\Core\System\SalesChannel\SalesChannelContext;
 use Shopware\Storefront\Controller\StorefrontController;
+use Shopware\Storefront\Framework\Routing\Router;
 use Symfony\Component\DependencyInjection\Attribute\AutoconfigureTag;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\HttpFoundation\JsonResponse;
@@ -25,14 +27,15 @@ class TwoFactorAuthenticationController extends StorefrontController
 {
     public function __construct(
         private readonly ConfigurationService $configurationService,
-        #[Autowire(service: 'RuneLaenen\TwoFactorAuth\Service\TimebasedOneTimePasswordService')]
+        #[Autowire(service: TimebasedOneTimePasswordService::class)]
         private readonly TimebasedOneTimePasswordServiceInterface $totpService,
-        #[Autowire(service: 'Shopware\Storefront\Framework\Routing\Router')]
+        #[Autowire(service: Router::class)]
         private readonly RouterInterface $router,
         #[Autowire(service: 'customer.repository')]
         private readonly EntityRepository $customerRepository,
         private readonly LegacyPasswordVerifier $legacyPasswordVerifier,
-    ) {}
+    ) {
+    }
 
     #[Route(
         path: '/rl-2fa/profile/setup',

src/Controller/TwoFactorAuthenticationController.php

@@ -8,7 +8,9 @@
 
 readonly class StorefrontTwoFactorAuthEvent
 {
-    public function __construct(private SalesChannelContext $salesChannelContext) {}
+    public function __construct(private SalesChannelContext $salesChannelContext)
+    {
+    }
 
     public function getSalesChannelContext(): SalesChannelContext
     {

src/Event/StorefrontTwoFactorAuthEvent.php

@@ -8,7 +8,9 @@
 
 readonly class StorefrontTwoFactorCancelEvent
 {
-    public function __construct(private SalesChannelContext $salesChannelContext) {}
+    public function __construct(private SalesChannelContext $salesChannelContext)
+    {
+    }
 
     public function getSalesChannelContext(): SalesChannelContext
     {