@devite/shopware-client 1.7.4 → 1.7.6

package/dist/index.cjs

@@ -53,7 +53,7 @@ class BinaryPayload extends Payload {
 }
 
 class JsonPayload extends Payload {
-  static CONTENT_TYPES = ["application/json"];
+  static CONTENT_TYPES = ["application/json", "application/vnd.api+json"];
   data;
   constructor(data) {
     super();
@@ -154,6 +154,8 @@ class ShopwareClient {
         payload = new JsonPayload();
       } else if (HtmlPayload.CONTENT_TYPES.includes(contentType)) {
         payload = new HtmlPayload();
+      } else {
+        console.warn("Unsupported content type:", contentType);
       }
     }
     if (payload && response._data) await payload.deserialize(response._data);
@@ -1272,21 +1274,21 @@ class WebhookClient extends Client {
 }
 
 class AdminShopwareClient extends ShopwareClient {
-  clientId = null;
-  constructor(baseUrl) {
+  clientId;
+  constructor(baseUrl, clientId) {
     super(baseUrl + "/api");
+    this.clientId = clientId;
   }
   async doRequest(path, options) {
     return await super.doRequest(path, await this.withOAuth(options));
   }
-  async authenticateAsClient(clientId, clientSecret, scopes) {
-    this.clientId = clientId;
+  async authenticateAsClient(clientSecret, scope) {
     const authResponse = await super.doRequest("/oauth/token", {
       method: HTTPRequestMethod.POST,
       body: new JsonPayload({
         grant_type: "client_credentials",
-        scopes,
-        client_id: clientId,
+        scope,
+        client_id: this.clientId,
         client_secret: clientSecret
       })
     });
@@ -1294,14 +1296,14 @@ class AdminShopwareClient extends ShopwareClient {
       throw new ShopwareError("Authentication as client failed", authResponse);
     this.authStore.getOrCreateEntry(new OAuthEntry()).save(authResponse);
   }
-  async authenticateAsUser(username, password, scopes) {
+  async authenticateAsUser(username, password, scope) {
     this.clientId = "administration";
     const authResponse = await super.doRequest("/oauth/token", {
       method: HTTPRequestMethod.POST,
       body: new JsonPayload({
         grant_type: "password",
         client_id: this.clientId,
-        scopes,
+        scope,
         username,
         password
       })
@@ -1326,8 +1328,12 @@ class AdminShopwareClient extends ShopwareClient {
             refresh_token: entry.refreshToken
           })
         });
-        entry.save(refreshResponse);
-        entryHeaders = entry.load().headers;
+        if (refreshResponse.statusCode === 200) {
+          entry.save(refreshResponse);
+          entryHeaders = entry.load().headers;
+        } else {
+          entry.clear();
+        }
       } else throw error;
     }
     return {

package/dist/index.d.cts

@@ -276,10 +276,10 @@ interface RangeFilter {
     type: "range";
     field: string;
     parameters: {
-        gte?: number;
-        gt?: number;
-        lte?: number;
-        lt?: number;
+        gte?: number | string;
+        gt?: number | string;
+        lte?: number | string;
+        lt?: number | string;
     };
 }
 
@@ -5720,11 +5720,11 @@ declare class WebhookClient extends Client {
 }
 
 declare class AdminShopwareClient extends ShopwareClient {
-    private clientId;
-    constructor(baseUrl: string);
+    clientId: string | "administration";
+    constructor(baseUrl: string, clientId: string | "administration");
     doRequest(path: string, options?: ClientRequestOptions): Promise<ClientResponse>;
-    authenticateAsClient(clientId: string, clientSecret: string, scopes: OAuthScope): Promise<void>;
-    authenticateAsUser(username: string, password: string, scopes: OAuthScope): Promise<void>;
+    authenticateAsClient(clientSecret: string, scope: OAuthScope): Promise<void>;
+    authenticateAsUser(username: string, password: string, scope: OAuthScope): Promise<void>;
     private withOAuth;
     forApp(): AppClient;
     forCategory(): CategoryClient$1;

package/dist/index.d.mts

@@ -276,10 +276,10 @@ interface RangeFilter {
     type: "range";
     field: string;
     parameters: {
-        gte?: number;
-        gt?: number;
-        lte?: number;
-        lt?: number;
+        gte?: number | string;
+        gt?: number | string;
+        lte?: number | string;
+        lt?: number | string;
     };
 }
 
@@ -5720,11 +5720,11 @@ declare class WebhookClient extends Client {
 }
 
 declare class AdminShopwareClient extends ShopwareClient {
-    private clientId;
-    constructor(baseUrl: string);
+    clientId: string | "administration";
+    constructor(baseUrl: string, clientId: string | "administration");
     doRequest(path: string, options?: ClientRequestOptions): Promise<ClientResponse>;
-    authenticateAsClient(clientId: string, clientSecret: string, scopes: OAuthScope): Promise<void>;
-    authenticateAsUser(username: string, password: string, scopes: OAuthScope): Promise<void>;
+    authenticateAsClient(clientSecret: string, scope: OAuthScope): Promise<void>;
+    authenticateAsUser(username: string, password: string, scope: OAuthScope): Promise<void>;
     private withOAuth;
     forApp(): AppClient;
     forCategory(): CategoryClient$1;

package/dist/index.d.ts

@@ -276,10 +276,10 @@ interface RangeFilter {
     type: "range";
     field: string;
     parameters: {
-        gte?: number;
-        gt?: number;
-        lte?: number;
-        lt?: number;
+        gte?: number | string;
+        gt?: number | string;
+        lte?: number | string;
+        lt?: number | string;
     };
 }
 
@@ -5720,11 +5720,11 @@ declare class WebhookClient extends Client {
 }
 
 declare class AdminShopwareClient extends ShopwareClient {
-    private clientId;
-    constructor(baseUrl: string);
+    clientId: string | "administration";
+    constructor(baseUrl: string, clientId: string | "administration");
     doRequest(path: string, options?: ClientRequestOptions): Promise<ClientResponse>;
-    authenticateAsClient(clientId: string, clientSecret: string, scopes: OAuthScope): Promise<void>;
-    authenticateAsUser(username: string, password: string, scopes: OAuthScope): Promise<void>;
+    authenticateAsClient(clientSecret: string, scope: OAuthScope): Promise<void>;
+    authenticateAsUser(username: string, password: string, scope: OAuthScope): Promise<void>;
     private withOAuth;
     forApp(): AppClient;
     forCategory(): CategoryClient$1;

package/dist/index.mjs

@@ -51,7 +51,7 @@ class BinaryPayload extends Payload {
 }
 
 class JsonPayload extends Payload {
-  static CONTENT_TYPES = ["application/json"];
+  static CONTENT_TYPES = ["application/json", "application/vnd.api+json"];
   data;
   constructor(data) {
     super();
@@ -152,6 +152,8 @@ class ShopwareClient {
         payload = new JsonPayload();
       } else if (HtmlPayload.CONTENT_TYPES.includes(contentType)) {
         payload = new HtmlPayload();
+      } else {
+        console.warn("Unsupported content type:", contentType);
       }
     }
     if (payload && response._data) await payload.deserialize(response._data);
@@ -1270,21 +1272,21 @@ class WebhookClient extends Client {
 }
 
 class AdminShopwareClient extends ShopwareClient {
-  clientId = null;
-  constructor(baseUrl) {
+  clientId;
+  constructor(baseUrl, clientId) {
     super(baseUrl + "/api");
+    this.clientId = clientId;
   }
   async doRequest(path, options) {
     return await super.doRequest(path, await this.withOAuth(options));
   }
-  async authenticateAsClient(clientId, clientSecret, scopes) {
-    this.clientId = clientId;
+  async authenticateAsClient(clientSecret, scope) {
     const authResponse = await super.doRequest("/oauth/token", {
       method: HTTPRequestMethod.POST,
       body: new JsonPayload({
         grant_type: "client_credentials",
-        scopes,
-        client_id: clientId,
+        scope,
+        client_id: this.clientId,
         client_secret: clientSecret
       })
     });
@@ -1292,14 +1294,14 @@ class AdminShopwareClient extends ShopwareClient {
       throw new ShopwareError("Authentication as client failed", authResponse);
     this.authStore.getOrCreateEntry(new OAuthEntry()).save(authResponse);
   }
-  async authenticateAsUser(username, password, scopes) {
+  async authenticateAsUser(username, password, scope) {
     this.clientId = "administration";
     const authResponse = await super.doRequest("/oauth/token", {
       method: HTTPRequestMethod.POST,
       body: new JsonPayload({
         grant_type: "password",
         client_id: this.clientId,
-        scopes,
+        scope,
         username,
         password
       })
@@ -1324,8 +1326,12 @@ class AdminShopwareClient extends ShopwareClient {
             refresh_token: entry.refreshToken
           })
         });
-        entry.save(refreshResponse);
-        entryHeaders = entry.load().headers;
+        if (refreshResponse.statusCode === 200) {
+          entry.save(refreshResponse);
+          entryHeaders = entry.load().headers;
+        } else {
+          entry.clear();
+        }
       } else throw error;
     }
     return {

package/dist/types/api/global/filter/RangeFilter.d.ts

@@ -2,9 +2,9 @@ export interface RangeFilter {
     type: "range";
     field: string;
     parameters: {
-        gte?: number;
-        gt?: number;
-        lte?: number;
-        lt?: number;
+        gte?: number | string;
+        gt?: number | string;
+        lte?: number | string;
+        lt?: number | string;
     };
 }

package/dist/types/auth/OAuthResponseBody.d.ts

@@ -1,5 +1,5 @@
 export interface OAuthResponseBody {
     access_token: string;
-    refresh_token: string;
+    refresh_token?: string;
     expires_in: number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devite/shopware-client",
-  "version": "1.7.4",
+  "version": "1.7.6",
   "description": "Third party API client for Shopware 6.",
   "repository": "devite-io/shopware-client",
   "license": "MIT",
@@ -41,13 +41,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@types/node": "^22.15.12",
+    "@types/node": "^22.16.5",
+    "@types/qs": "^6.14.0",
     "changelogen": "^0.5.7",
-    "eslint": "^9.26.0",
-    "prettier": "^3.5.3",
+    "eslint": "^9.32.0",
+    "prettier": "^3.6.2",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.0",
-    "unbuild": "^3.5.0",
+    "typescript-eslint": "^8.38.0",
+    "unbuild": "^3.6.0",
     "vitest": "^2.1.9"
   },
   "dependencies": {