fix(Auth): Fixed auth token missing error

moltin · Jul 26, 2021 · 80de8eb · 80de8eb
1 parent 32d7bfa
commit 80de8eb
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 37 deletions.
diff --git a/src/endpoints/account-addresses.js b/src/endpoints/account-addresses.js
@@ -15,7 +15,10 @@ class AccountAddressesEndpoint extends BaseExtend {
       'GET',
       undefined,
       undefined,
-      token
+      true,
+      null,
+      null,
+      { 'EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN': token }
     )
   }
 
@@ -25,7 +28,10 @@ class AccountAddressesEndpoint extends BaseExtend {
       'GET',
       undefined,
       undefined,
-      token
+      true,
+      null,
+      null,
+      { 'EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN': token }
     )
   }
 
@@ -35,7 +41,10 @@ class AccountAddressesEndpoint extends BaseExtend {
       'POST',
       { ...body, type: singularize(this.endpoint) },
       undefined,
-      token
+      true,
+      null,
+      null,
+      { 'EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN': token }
     )
   }
 
@@ -45,7 +54,10 @@ class AccountAddressesEndpoint extends BaseExtend {
       'DELETE',
       undefined,
       undefined,
-      token
+      true,
+      null,
+      null,
+      { 'EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN': token }
     )
   }
 
@@ -55,7 +67,10 @@ class AccountAddressesEndpoint extends BaseExtend {
       'PUT',
       { ...body, type: singularize(this.endpoint) },
       undefined,
-      token
+      true,
+      null,
+      null,
+      { 'EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN': token }
     )
   }
 }

diff --git a/src/endpoints/account-members.js b/src/endpoints/account-members.js
@@ -27,7 +27,6 @@ class AccountMembersEndpoint extends BaseExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this,
       headers
     )

diff --git a/src/endpoints/account-memberships.js b/src/endpoints/account-memberships.js
@@ -22,7 +22,6 @@ class AccountMembershipsEndpoint extends BaseExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this
     )
 

diff --git a/src/endpoints/accounts.js b/src/endpoints/accounts.js
@@ -22,7 +22,6 @@ class AccountsEndpoint extends CRUDExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this,
       headers
     )

diff --git a/src/endpoints/authentication-realm.js b/src/endpoints/authentication-realm.js
@@ -21,7 +21,6 @@ class AuthenticationRealmsEndpoint extends CRUDExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this,
       headers
     )

diff --git a/src/endpoints/catalog.js b/src/endpoints/catalog.js
@@ -205,7 +205,6 @@ class CatalogEndpoint extends CatalogQuery {
       'GET',
       undefined,
       token,
-      undefined,
       this
     )
 

diff --git a/src/endpoints/customers.js b/src/endpoints/customers.js
@@ -12,7 +12,6 @@ class CustomersEndpoint extends CRUDExtend {
         'POST',
         tokenRequestBody,
         null,
-        undefined,
         {
           ...headers
         }

diff --git a/src/endpoints/merchant-realm-mappings.js b/src/endpoints/merchant-realm-mappings.js
@@ -8,14 +8,7 @@ class MerchantRealmMappings {
   }
 
   All(token = null) {
-    this.call = this.request.send(
-      this.endpoint,
-      'GET',
-      undefined,
-      token,
-      undefined,
-      this
-    )
+    this.call = this.request.send(this.endpoint, 'GET', undefined, token, this)
 
     return this.call
   }

diff --git a/src/endpoints/node-relationships.js b/src/endpoints/node-relationships.js
@@ -32,10 +32,7 @@ class NodeRelationshipsEndpoint {
     return this.request.send(
       `hierarchies/${hierarchyId}/nodes/${nodeId}/relationships/parent`,
       'PUT',
-      {
-        ...body,
-        type: singularize(this.endpoint)
-      },
+      { ...body, type: singularize(this.endpoint) },
       token
     )
   }

diff --git a/src/endpoints/oidc-profile.js b/src/endpoints/oidc-profile.js
@@ -21,7 +21,6 @@ class OidcProfileEndpoint extends CRUDExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this,
       headers
     )
@@ -43,7 +42,6 @@ class OidcProfileEndpoint extends CRUDExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this,
       headers
     )

diff --git a/src/endpoints/price-book-prices.js b/src/endpoints/price-book-prices.js
@@ -20,7 +20,6 @@ class PriceBookPricesEndpoint {
       'GET',
       undefined,
       token,
-      undefined,
       this
     )
   }

diff --git a/src/extends/base.js b/src/extends/base.js
@@ -21,7 +21,6 @@ class BaseExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this
     )
 
@@ -36,7 +35,6 @@ class BaseExtend {
       'GET',
       undefined,
       token,
-      undefined,
       this
     )
 

diff --git a/src/factories/request.js b/src/factories/request.js
@@ -82,11 +82,11 @@ class RequestFactory {
     uri,
     method,
     body = undefined,
-    customerToken = undefined,
-    accountToken = undefined,
-    instance,
+    token = undefined,
+    instance = undefined,
     wrapBody = true,
-    version = null
+    version = null,
+    additionalHeaders = undefined
   ) {
     const { config, storage } = this
 
@@ -122,17 +122,18 @@ class RequestFactory {
           headers['X-MOLTIN-LANGUAGE'] = config.language
         }
 
-        if (customerToken) {
-          headers['X-MOLTIN-CUSTOMER-TOKEN'] = customerToken
-        }
-        if (accountToken) {
-          headers['EP-ACCOUNT-MANAGEMENT-AUTHENTICATION-TOKEN'] = accountToken
+        if (token) {
+          headers['X-MOLTIN-CUSTOMER-TOKEN'] = token
         }
 
         if (config.headers) {
           Object.assign(headers, config.headers)
         }
 
+        if (additionalHeaders) {
+          Object.assign(headers, additionalHeaders)
+        }
+
         fetch(
           `${config.protocol}://${config.host}/${
             version || config.version ? `${version || config.version}/` : ''