@shopware/api-client 1.0.2 → 1.1.0

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { ofetch } from 'ofetch';
 import { createHooks } from 'hookable';
 import defu from 'defu';
 
-function createHeaders(init) {
+function createHeaders(init, hookCallback) {
   const _headers = {
     "Content-Type": "application/json"
   };
@@ -17,7 +17,12 @@ function createHeaders(init) {
       if (prop === "apply") {
         throw new Error("Cannot override apply method");
       }
+      hookCallback?.(prop, value);
       return Reflect.set(target, prop, value);
+    },
+    deleteProperty: (target, prop) => {
+      hookCallback?.(prop);
+      return Reflect.deleteProperty(target, prop);
     }
   };
   const headersProxy = new Proxy(
@@ -109,13 +114,21 @@ function createPathWithParams(requestPath, pathParams) {
 }
 
 function createAPIClient(params) {
-  const defaultHeaders = createHeaders({
-    "sw-access-key": params.accessToken,
-    Accept: "application/json",
-    "sw-context-token": params.contextToken,
-    ...params.defaultHeaders
-  });
   const apiClientHooks = createHooks();
+  const defaultHeaders = createHeaders(
+    {
+      "sw-access-key": params.accessToken,
+      accept: "application/json",
+      "sw-context-token": params.contextToken,
+      ...params.defaultHeaders
+    },
+    (key, value) => {
+      apiClientHooks.callHook("onDefaultHeaderChanged", key, value);
+      if (key === "sw-context-token") {
+        apiClientHooks.callHook("onContextChanged", value);
+      }
+    }
+  );
   const apiFetch = ofetch.create({
     baseURL: params.baseURL,
     // async onRequest({ request, options }) {},
@@ -127,7 +140,6 @@ function createAPIClient(params) {
           "sw-context-token"
         );
         defaultHeaders["sw-context-token"] = newContextToken;
-        apiClientHooks.callHook("onContextChanged", newContextToken);
       }
     },
     async onResponseError({ response }) {
@@ -145,11 +157,15 @@ function createAPIClient(params) {
     const fetchOptions = {
       ...currentParams.fetchOptions || {}
     };
+    let mergedHeaders = defu(currentParams.headers, defaultHeaders);
+    if (mergedHeaders?.["Content-Type"]?.includes("multipart/form-data") && typeof window !== "undefined") {
+      delete mergedHeaders["Content-Type"];
+    }
     const resp = await apiFetch.raw(requestPathWithParams, {
       ...fetchOptions,
       method,
       body: currentParams.body,
-      headers: defu(defaultHeaders, currentParams.headers),
+      headers: mergedHeaders,
       query: currentParams.query
     });
     return {
@@ -176,16 +192,21 @@ function createAuthorizationHeader(token) {
 }
 function createAdminAPIClient(params) {
   const isTokenBasedAuth = params.credentials?.grant_type === "client_credentials";
+  const apiClientHooks = createHooks();
   const sessionData = {
     accessToken: params.sessionData?.accessToken || "",
     refreshToken: params.sessionData?.refreshToken || "",
     expirationTime: Number(params.sessionData?.expirationTime || 0)
   };
-  const defaultHeaders = createHeaders({
-    Authorization: createAuthorizationHeader(sessionData.accessToken),
-    Accept: "application/json"
-  });
-  const apiClientHooks = createHooks();
+  const defaultHeaders = createHeaders(
+    {
+      Authorization: createAuthorizationHeader(sessionData.accessToken),
+      Accept: "application/json"
+    },
+    (key, value) => {
+      apiClientHooks.callHook("onDefaultHeaderChanged", key, value);
+    }
+  );
   function getSessionData() {
     return { ...sessionData };
   }
@@ -235,12 +256,10 @@ function createAdminAPIClient(params) {
             if (!context.response._data)
               return;
             updateSessionData(context.response._data);
-            options.headers = {
-              ...options.headers,
-              Authorization: createAuthorizationHeader(
-                context.response._data.access_token
-              )
-            };
+            options.headers.append(
+              "Authorization",
+              createAuthorizationHeader(sessionData.accessToken)
+            );
           }
         });
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shopware/api-client",
-  "version": "1.0.2",
+  "version": "1.1.0",
   "description": "Shopware client for API connection.",
   "author": "Shopware",
   "type": "module",
@@ -44,17 +44,18 @@
   "devDependencies": {
     "@codspeed/vitest-plugin": "3.1.1",
     "@types/prettier": "3.0.0",
-    "@vitest/coverage-v8": "2.0.4",
+    "@vitest/coverage-v8": "2.1.4",
+    "jsdom": "^25.0.1",
     "prettier": "3.3.3",
     "unbuild": "2.0.0",
-    "vitest": "2.0.4",
+    "vitest": "2.1.4",
     "eslint-config-shopware": "1.0.0",
     "tsconfig": "0.0.0"
   },
   "dependencies": {
     "defu": "6.1.4",
     "hookable": "5.5.3",
-    "ofetch": "1.3.4"
+    "ofetch": "1.4.1"
   },
   "scripts": {
     "build": "export NODE_ENV=production && unbuild && pnpm build:types",