@itentialopensource/adapter-zscaler 0.11.3 → 0.11.5

package/adapter.js

@@ -540,8 +540,17 @@ class Zscaler extends AdapterBaseCl {
     const origin = `${this.id}-${meth}`;
     log.trace(origin);
 
+    let mymetadata = metadata;
+    if (!mymetadata) {
+      mymetadata = {
+        authData: this.getObfuscatedKey()
+      };
+    } else {
+      mymetadata.authData = this.getObfuscatedKey();
+    }
+
     try {
-      return super.iapExpandedGenericAdapterRequest(metadata, uriPath, restMethod, pathVars, queryData, requestBody, addlHeaders, callback);
+      return super.iapExpandedGenericAdapterRequest(mymetadata, uriPath, restMethod, pathVars, queryData, requestBody, addlHeaders, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -569,7 +578,7 @@ class Zscaler extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.genericAdapterRequest(uriPath, restMethod, queryData, requestBody, addlHeaders, callback);
+      return this.iapExpandedGenericAdapterRequest(null, uriPath, restMethod, null, queryData, requestBody, addlHeaders, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);
@@ -597,7 +606,7 @@ class Zscaler extends AdapterBaseCl {
     log.trace(origin);
 
     try {
-      return super.genericAdapterRequestNoBasePath(uriPath, restMethod, queryData, requestBody, addlHeaders, callback);
+      return this.iapExpandedGenericAdapterRequest(null, uriPath, restMethod, null, queryData, requestBody, addlHeaders, callback);
     } catch (err) {
       log.error(`${origin}: ${err}`);
       return callback(null, err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@itentialopensource/adapter-zscaler",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "This adapter integrates with system Zscaler",
   "main": "adapter.js",
   "wizardVersion": "2.44.7",
@@ -23,9 +23,7 @@
     "troubleshoot": "node utils/tbScript.js troubleshoot",
     "healthcheck": "node utils/tbScript.js healthcheck",
     "basicget": "node utils/tbScript.js basicget",
-    "connectivity": "node utils/tbScript.js connectivity",
-    "deploy": "npm publish --registry=https://registry.npmjs.org --access=public",
-    "build": "npm run deploy"
+    "connectivity": "node utils/tbScript.js connectivity"
   },
   "keywords": [
     "Itential",
@@ -49,7 +47,7 @@
   "author": "Itential",
   "homepage": "https://gitlab.com/itentialopensource/adapters/adapter-zscaler#readme",
   "dependencies": {
-    "@itentialopensource/adapter-utils": "5.10.20",
+    "@itentialopensource/adapter-utils": "5.10.23",
     "acorn": "8.14.1",
     "ajv": "8.17.1",
     "axios": "1.9.0",

package/report/adapterInfo.json

@@ -1,10 +1,10 @@
 {
-  "version": "0.11.0",
+  "version": "0.11.4",
   "configLines": 35632,
   "scriptLines": 2498,
-  "codeLines": 31206,
-  "testLines": 20221,
-  "testCases": 1033,
-  "totalCodeLines": 53925,
+  "codeLines": 31215,
+  "testLines": 20248,
+  "testCases": 1034,
+  "totalCodeLines": 53961,
   "wfTasks": 369
 }

package/test/integration/adapterTestIntegration.js

@@ -431,6 +431,33 @@ describe('[integration] Zscaler Adapter Test', () => {
         }
       }).timeout(attemptTimeout);
     });
+
+    describe('#genericAdapterRequest - errors', () => {
+      it('should work if integrated but since no mockdata should error when run standalone', (done) => {
+        try {
+          a.genericAdapterRequest('/fake/data', 'GET', {}, {}, {}, (data, error) => {
+            try {
+              if (stub) {
+                assert.equal(null, data);
+                assert.notEqual(null, error);
+                assert.notEqual(undefined, error);
+              } else {
+                assert.equal(undefined, error);
+                assert.notEqual(null, data);
+                assert.notEqual(undefined, data);
+              }
+              done();
+            } catch (err) {
+              log.error(`Test Failure: ${err}`);
+              done(err);
+            }
+          });
+        } catch (error) {
+          log.error(`Adapter Exception: ${error}`);
+          done(error);
+        }
+      }).timeout(attemptTimeout);
+    });
     /*
     -----------------------------------------------------------------------
     -----------------------------------------------------------------------

package/test/unit/adapterBaseTestUnit.js

@@ -956,14 +956,16 @@ describe('[unit] Adapter Base Test', () => {
       });
       it('should get information for all of the requests currently in the queue', (done) => {
         try {
-          const expectedFunctions = a.iapGetAdapterQueue();
-          try {
-            assert.equal(0, expectedFunctions.length);
-            done();
-          } catch (err) {
-            log.error(`Test Failure: ${err}`);
-            done(err);
-          }
+          a.iapGetAdapterQueue((data, error) => {
+            try {
+              assert.notEqual(null, data);
+              assert.equal(0, data.length);
+              done();
+            } catch (err) {
+              log.error(`Test Failure: ${err}`);
+              done(err);
+            }
+          });
         } catch (error) {
           log.error(`Adapter Exception: ${error}`);
           done(error);

package/test/unit/adapterTestUnit.js

@@ -252,8 +252,6 @@ describe('[unit] Zscaler Adapter Test', () => {
           assert.equal('mocha test/unit/adapterTestUnit.js --LOG=error', packageDotJson.scripts['test:unit']);
           assert.equal('mocha test/integration/adapterTestIntegration.js --LOG=error', packageDotJson.scripts['test:integration']);
           assert.equal('npm run test:baseunit && npm run test:unit && npm run test:integration', packageDotJson.scripts.test);
-          assert.equal('npm publish --registry=https://registry.npmjs.org --access=public', packageDotJson.scripts.deploy);
-          assert.equal('npm run deploy', packageDotJson.scripts.build);
           done();
         } catch (error) {
           log.error(`Test Failure: ${error}`);