@shopware/api-client 1.0.2 → 1.1.1

package/dist/index.cjs

@@ -8,7 +8,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 
 const defu__default = /*#__PURE__*/_interopDefaultCompat(defu);
 
-function createHeaders(init) {
+function createHeaders(init, hookCallback) {
   const _headers = {
     "Content-Type": "application/json"
   };
@@ -23,7 +23,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(
@@ -115,13 +120,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 = hookable.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.ofetch.create({
     baseURL: params.baseURL,
     // async onRequest({ request, options }) {},
@@ -133,7 +146,6 @@ function createAPIClient(params) {
           "sw-context-token"
         );
         defaultHeaders["sw-context-token"] = newContextToken;
-        apiClientHooks.callHook("onContextChanged", newContextToken);
       }
     },
     async onResponseError({ response }) {
@@ -151,11 +163,15 @@ function createAPIClient(params) {
     const fetchOptions = {
       ...currentParams.fetchOptions || {}
     };
+    let mergedHeaders = defu__default(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__default(defaultHeaders, currentParams.headers),
+      headers: mergedHeaders,
       query: currentParams.query
     });
     return {
@@ -182,16 +198,21 @@ function createAuthorizationHeader(token) {
 }
 function createAdminAPIClient(params) {
   const isTokenBasedAuth = params.credentials?.grant_type === "client_credentials";
+  const apiClientHooks = hookable.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 = hookable.createHooks();
+  const defaultHeaders = createHeaders(
+    {
+      Authorization: createAuthorizationHeader(sessionData.accessToken),
+      Accept: "application/json"
+    },
+    (key, value) => {
+      apiClientHooks.callHook("onDefaultHeaderChanged", key, value);
+    }
+  );
   function getSessionData() {
     return { ...sessionData };
   }
@@ -241,12 +262,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)
+            );
           }
         });
       }
@@ -262,19 +281,20 @@ function createAdminAPIClient(params) {
   });
   async function invoke(pathParam, ...params2) {
     const [, method, requestPath] = pathParam.split(" ");
+    const currentParams = params2[0] || {};
     const requestPathWithParams = createPathWithParams(
       requestPath,
-      params2[0]?.pathParams
+      currentParams.pathParams
     );
     const fetchOptions = {
-      ...params2[0]?.fetchOptions || {}
+      ...currentParams.fetchOptions || {}
     };
     const resp = await apiFetch.raw(requestPathWithParams, {
       ...fetchOptions,
       method,
-      body: params2[0]?.body,
-      headers: defu__default(defaultHeaders, params2[0]?.headers),
-      query: params2[0]?.query
+      body: currentParams.body,
+      headers: defu__default(currentParams.headers, defaultHeaders),
+      query: currentParams.query
     });
     return {
       data: resp._data,