feat: add support for shopware 6.7

Author: tinect

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "vienthuong/impersonation",
   "description": "A Shopware 6 Impersonation plugin",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "type": "shopware-platform-plugin",
   "license": "MIT",
   "authors": [
@@ -16,7 +16,7 @@
     }
   },
   "require": {
-      "shopware/core": "~6.5.0||~6.6.0"
+      "shopware/core": "~6.6.0||~6.7.0"
   },
   "extra": {
     "shopware-plugin-class": "VienThuong\\Impersonation\\Impersonation",
@@ -31,9 +31,5 @@
         "en-GB": "Allow administrator to impersonate any user"
     }
   },
-  "conflict": {
-      "shopware/storefront": "<6,>=7",
-      "shopware/administration": "<6,>=7"
-  },
   "prefer-stable": true
 }

src/Resources/app/administration/src/extension/component/structure/sw-page/index.js

@@ -1,7 +1,7 @@
 import template from './sw-page.html.twig';
 import './sw-page.scss';
 
-const { Component, State, Service } = Shopware;
+const { Component, Service } = Shopware;
 
 Component.override('sw-page', {
     template,
@@ -14,7 +14,7 @@ Component.override('sw-page', {
 
     computed: {
         currentUser() {
-            return State.get('session').currentUser;
+            return Shopware.Store.get('session').currentUser;
         },
 
         pageClasses() {
@@ -30,7 +30,6 @@ Component.override('sw-page', {
         isImpersonating() {
             return this.impersonationService.isImpersonating();
         }
-
     },
 
     methods: {

src/Resources/app/administration/src/extension/component/structure/sw-page/sw-page.html.twig

@@ -3,11 +3,13 @@
         {% block sw_page_leave_impersonation_button %}
             <sw-button v-if="isImpersonating"
                        class="impersonation-btn"
-                       variant="danger"
+                       variant="critical"
                        size="x-small"
                        :disabled="isLoading"
                        :isLoading="isLoading"
-                       @click="leaveImpersonation">{{ $tc('impersonation.actions.leaveImpersonation') }}</sw-button>
+                       @click="leaveImpersonation">
+                {{ $tc('impersonation.actions.leaveImpersonation') }}
+            </sw-button>
         {% endblock %}
 
         {% block sw_page_notification_center %}

src/Resources/app/administration/src/extension/component/structure/sw-page/sw-page.scss

@@ -6,7 +6,6 @@
 
             .impersonation-btn {
                 z-index: 800;
-                max-width: 100px;
                 margin-right: 10px;
 
                 .sw-button__content {

src/Resources/app/administration/src/extension/module/sw-users-permissions/components/sw-users-permissions-user-listing/index.js

@@ -1,14 +1,15 @@
 import template from './sw-users-permissions-user-listing.html.twig';
-const { Component, Service, State } = Shopware;
+const { Component, Service} = Shopware;
 
-const componentConfiguration = {
+Component.override('sw-users-permissions-user-listing', {
+    template,
     computed: {
         impersonationService() {
             return Service('impersonationService');
         },
 
         currentUser() {
-            return State.get('session').currentUser;
+            return Shopware.Store.get('session').currentUser;
         },
 
         canImpersonate() {
@@ -35,25 +36,4 @@ const componentConfiguration = {
             this.$router.push({ name: 'sw.dashboard.index' });
         }
     }
-};
-
-// Using sw-settings-user-list until its deprecated
-if (!Component.getComponentRegistry().has('sw-settings-user-list')) {
-    Component.override('sw-users-permissions-user-listing', {
-        template,
-        ...componentConfiguration
-    });
-} else {
-    /**
-     * @deprecated tag:v6.4.0 - use 'sw-users-permissions-user-listing' instead
-     */
-    Component.override('sw-settings-user-list', {
-        template,
-
-        deprecated: {
-            version: '6.4.0',
-            comment: 'Use sw-users-permissions-user-listing instead'
-        },
-        ...componentConfiguration
-    });
-}
+});

src/Resources/app/administration/src/init/impersonation.init.js

@@ -2,7 +2,7 @@ import ImpersonationService from '../service/impersonation.service';
 
 const { State, Application } = Shopware;
 const initContainer = Application.getContainer('init');
-const currentUser = State.get('session').currentUser;
+const currentUser = Shopware.Store.get('session')?.currentUser;
 const httpClient = initContainer.httpClient;
 
 Application.addServiceProvider('impersonationService', (container) => {

src/Resources/app/administration/src/service/impersonation.service.js

@@ -1,6 +1,6 @@
 import {IMPERSONATING_ATTRIBUTE_KEY} from "../constant/impersonation.constant";
 
-const { Application, State } = Shopware;
+const { Application} = Shopware;
 
 class ImpersonationService {
     constructor(impersonatingUser, container, httpClient) {
@@ -39,11 +39,11 @@ class ImpersonationService {
     }
 
     async _initializeUser(user) {
-        State.commit('setCurrentUser', user);
+        const session = Shopware.Store.get('session');
+        session.setCurrentUser(user);
 
         await this.localeHelper.setLocaleWithId(user.localeId);
-
-        State.commit('context/setApiLanguageId', State.get('session').languageId);
+        Shopware.Store.get('context').setApiLanguageId(session.languageId);
 
         this.initializeUserNotifications();
     }

src/Resources/public/administration/.vite/entrypoints.json

@@ -0,0 +1,25 @@
+{
+  "base": "/bundles/impersonation/administration/",
+  "entryPoints": {
+    "impersonation": {
+      "css": [
+        "/bundles/impersonation/administration/css/impersonation.css"
+      ],
+      "dynamic": [],
+      "js": [
+        "/bundles/impersonation/administration/js/impersonation.js"
+      ],
+      "legacy": false,
+      "preload": []
+    }
+  },
+  "legacy": false,
+  "metadatas": {},
+  "version": [
+    "7.0.4",
+    7,
+    0,
+    4
+  ],
+  "viteServer": null
+}

src/Resources/public/administration/.vite/manifest.json

@@ -0,0 +1,11 @@
+{
+  "main.js": {
+    "file": "js/impersonation.js",
+    "name": "impersonation",
+    "src": "main.js",
+    "isEntry": true,
+    "css": [
+      "css/impersonation.css"
+    ]
+  }
+}