@devite/shopware-client 1.1.2 → 1.1.3

package/dist/index.cjs

@@ -206,7 +206,7 @@ class OAuthEntry {
     return AuthenticationType.OAUTH;
   }
   isSaved() {
-    return this.accessToken !== null && this.refreshToken !== null && this.expiresAt !== null;
+    return this.accessToken !== null && this.expiresAt !== null;
   }
   save(response) {
     const jsonBody = response.body.data;
@@ -12872,8 +12872,9 @@ class AdminShopwareClient extends ShopwareClient {
   async withOAuth(options = {}) {
     const entry = this.authStore.getEntry(AuthenticationType.OAUTH);
     if (!entry) throw new Error("Not authenticated");
+    let entryHeaders;
     try {
-      return { ...options, ...entry.load() };
+      entryHeaders = entry.load().headers;
     } catch (error) {
       if (error instanceof ExpiredError && entry.refreshToken) {
         const refreshResponse = await super.doRequest("/oauth/token", {
@@ -12885,10 +12886,16 @@ class AdminShopwareClient extends ShopwareClient {
           })
         });
         entry.save(refreshResponse);
-        return { ...options, ...entry.load() };
-      }
-      throw error;
+        entryHeaders = entry.load().headers;
+      } else throw error;
     }
+    return {
+      ...options,
+      headers: {
+        ...options.headers,
+        ...entryHeaders
+      }
+    };
   }
   forApp() {
     return new AppClient(this);
@@ -14009,6 +14016,7 @@ class StoreShopwareClient extends ShopwareClient {
     return super.doRequest(path, {
       ...options,
       headers: {
+        ...options?.headers,
         "sw-access-key": this.apiKey
       }
     });
@@ -14018,7 +14026,13 @@ class StoreShopwareClient extends ShopwareClient {
       AuthenticationType.CONTEXT_TOKEN
     );
     if (!entry) throw new Error("Not authenticated");
-    return { ...options, ...entry.load() };
+    return {
+      ...options,
+      headers: {
+        ...options.headers,
+        ...entry.load().headers
+      }
+    };
   }
   forAccount() {
     return new AccountClient(this);

package/dist/index.mjs

@@ -204,7 +204,7 @@ class OAuthEntry {
     return AuthenticationType.OAUTH;
   }
   isSaved() {
-    return this.accessToken !== null && this.refreshToken !== null && this.expiresAt !== null;
+    return this.accessToken !== null && this.expiresAt !== null;
   }
   save(response) {
     const jsonBody = response.body.data;
@@ -12870,8 +12870,9 @@ class AdminShopwareClient extends ShopwareClient {
   async withOAuth(options = {}) {
     const entry = this.authStore.getEntry(AuthenticationType.OAUTH);
     if (!entry) throw new Error("Not authenticated");
+    let entryHeaders;
     try {
-      return { ...options, ...entry.load() };
+      entryHeaders = entry.load().headers;
     } catch (error) {
       if (error instanceof ExpiredError && entry.refreshToken) {
         const refreshResponse = await super.doRequest("/oauth/token", {
@@ -12883,10 +12884,16 @@ class AdminShopwareClient extends ShopwareClient {
           })
         });
         entry.save(refreshResponse);
-        return { ...options, ...entry.load() };
-      }
-      throw error;
+        entryHeaders = entry.load().headers;
+      } else throw error;
     }
+    return {
+      ...options,
+      headers: {
+        ...options.headers,
+        ...entryHeaders
+      }
+    };
   }
   forApp() {
     return new AppClient(this);
@@ -14007,6 +14014,7 @@ class StoreShopwareClient extends ShopwareClient {
     return super.doRequest(path, {
       ...options,
       headers: {
+        ...options?.headers,
         "sw-access-key": this.apiKey
       }
     });
@@ -14016,7 +14024,13 @@ class StoreShopwareClient extends ShopwareClient {
       AuthenticationType.CONTEXT_TOKEN
     );
     if (!entry) throw new Error("Not authenticated");
-    return { ...options, ...entry.load() };
+    return {
+      ...options,
+      headers: {
+        ...options.headers,
+        ...entry.load().headers
+      }
+    };
   }
   forAccount() {
     return new AccountClient(this);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/shopware-client",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Third party API client for Shopware 6.",
   "repository": "devite-io/shopware-client",
   "license": "MIT",