@sera4/essentia 1.1.41 → 1.1.43

package/helpers/test-server-wrapper.js

@@ -15,7 +15,7 @@ export class TestServerWrapper {
     this.chai = chai;
 
     // Support for older/deprecated apis
-    const oldAuthHeaders = {field: "Authorization", value: `Token organization_token=${oldAuthToken}`};
+    const oldAuthHeaders = {headers: {"Authorization" : `Token organization_token=${oldAuthToken}`}};
     this.v1 = {
       get: (url) => this.getWithPrefix("/v1", url, oldAuthHeaders),
       post: (url) => this.postWithPrefix("/v1", url, oldAuthHeaders),
@@ -58,8 +58,8 @@ export class TestServerWrapper {
     const request = this.chai.request(this.server).get(`${prefix}${sanitizedUrl}`);
     this.applyHeaders(request, this.defaultHeaders);
 
-    if (options?.field) {
-      this.applyHeaders(request, {[options.field] : options.value});
+    if (options?.headers) {
+      this.applyHeaders(request, options.headers);
     }
 
     if (options?.body) {
@@ -77,9 +77,10 @@ export class TestServerWrapper {
     const request = this.chai.request(this.server).post(`${prefix}${sanitizedUrl}`);
     this.applyHeaders(request, this.defaultHeaders);
 
-    if (options?.field) {
-      this.applyHeaders(request, {[options.field] : options.value});
+    if (options?.headers) {
+      this.applyHeaders(request, options.headers);
     }
+
     return request;
   }
 
@@ -92,9 +93,10 @@ export class TestServerWrapper {
     const request = this.chai.request(this.server).put(`${prefix}${sanitizedUrl}`);
     this.applyHeaders(request, this.defaultHeaders);
 
-    if (options?.field) {
-      this.applyHeaders(request, {[options.field] : options.value});
+    if (options?.headers) {
+      this.applyHeaders(request, options.headers);
     }
+
     return request;
   }
 
@@ -107,9 +109,10 @@ export class TestServerWrapper {
     const request = this.chai.request(this.server).delete(`${prefix}${sanitizedUrl}`);
     this.applyHeaders(request, this.defaultHeaders);
 
-    if (options?.field) {
-      this.applyHeaders(request, {[options.field] : options.value});
+    if (options?.headers) {
+      this.applyHeaders(request, options.headers);
     }
+
     return request;
   }
 
@@ -122,8 +125,8 @@ export class TestServerWrapper {
     const request = this.chai.request(this.server).post(`${prefix}${sanitizedUrl}`);
     this.applyHeaders(request, this.defaultHeaders);
 
-    if (options?.field) {
-      this.applyHeaders(request, {[options.field] : options.value});
+    if (options?.headers) {
+      this.applyHeaders(request, options.headers);
     }
 
     request.attach("data", fs.readFileSync(file), {filename: "data"});
@@ -142,21 +145,24 @@ export class TestServerWrapper {
     return this.routePrinter.getAll();
   }
 
-  // Support for injecting certain memberships in every request
-  withMembership (m) {
-    const headers = { field: "tws-membership", value: JSON.stringify(m) }
+  withHeaders (headers) {
     return {
-      get: (url, options) => this.get(url, {...headers, ...options}),
-      post: (url, options) => this.post(url, {...headers, ...options}),
-      put: (url, options) => this.put(url, {...headers, ...options}),
-      delete: (url, options) => this.delete(url, {...headers, ...options}),
-      upload: (url, fields, file, options) => this.upload(url, fields, file, {...headers, ...options}),
+      get: (url, options) => this.get(url, {headers, ...options}),
+      post: (url, options) => this.post(url, {headers, ...options}),
+      put: (url, options) => this.put(url, {headers, ...options}),
+      delete: (url, options) => this.delete(url, {headers, ...options}),
+      upload: (url, fields, file, options) => this.upload(url, fields, file, {headers, ...options}),
       stop: this.stop,
       allRoutes: this.allRoutes,
       v1: this.v1
     }
   }
 
+  withMembership (m) {
+    const h = { "tws-membership" : JSON.stringify(m) }
+    return this.withHeaders(h);
+  }
+
   withS4 () {
     return this.withMembership({s4_role: 1, id: uuidv4(), account_id: uuidv4(), tenant_id: uuidv4()});
   }
@@ -164,4 +170,4 @@ export class TestServerWrapper {
   withTap() {
     return this.withMembership({s4_role: 2, id: uuidv4(), account_id: uuidv4(), tenant_id: uuidv4()});
   }
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sera4/essentia",
-  "version": "1.1.41",
+  "version": "1.1.43",
   "description": "A library of utilities for Teleporte Web Services",
   "main": "index.js",
   "type": "module",