fix: Fall back to config org if no option passed

Mattlk13 · Oct 5, 2018 · 99021be · 99021be
1 parent 20b8ccc
commit 99021be
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/src/cli/commands/protect/wizard.js b/src/cli/commands/protect/wizard.js
@@ -44,7 +44,7 @@ var unsupportedPackageManagers = {
 };
 
 function wizard(options = {}) {
-  options.org = config.org || null;
+  options.org = options.org || config.org || null;
 
   return processPackageManager(options)
     .then(processWizardFlow)

diff --git a/src/lib/authorization.js b/src/lib/authorization.js
@@ -3,6 +3,7 @@ var request = require('./request');
 var config = require('./config');
 
 function actionAllowed(action, options) {
+  const org = options.org || config.org || null;
   return new Promise(function (resolve, reject) {
     request({
       method: 'GET',
@@ -11,7 +12,7 @@ function actionAllowed(action, options) {
       headers: {
         authorization: 'token ' + snyk.api,
       },
-      qs: options.org && {org: options.org},
+      qs: org && {org},
     }, function (error, res, body) {
       if (error) {
         return reject(error);

diff --git a/src/lib/plugins/yarn/index.js b/src/lib/plugins/yarn/index.js
@@ -4,7 +4,7 @@ const fs = require('then-fs');
 const path = require('path');
 const lockFileParser = require('snyk-nodejs-lockfile-parser');
 const debug = require('debug')('snyk');
-const getRuntimeVersion = '../get-node-runtime-version';
+const getRuntimeVersion = require('../get-node-runtime-version');
 
 module.exports = {
   inspect,

diff --git a/src/lib/snyk-test/common.js b/src/lib/snyk-test/common.js
@@ -1,9 +1,11 @@
+const config = require('../config');
 
 module.exports.assembleQueryString = function (options) {
-  var qs = {};
-  if (options.org) {
-    qs.org = options.org;
-  }
+  const org = options.org || config.org || null;
+  const qs = {
+    org,
+  };
+
   if (options.severityThreshold) {
     qs.severityThreshold = options.severityThreshold;
   }