npq 3.13.5 → 3.14.0

package/lib/marshalls/snyk.marshall.js

@@ -7,10 +7,7 @@ const BaseMarshall = require('./baseMarshall')
 const { marshallCategories } = require('./constants')
 
 const MARSHALL_NAME = 'snyk'
-const SNYK_API_URL = 'https://snyk.io/api/v1/vuln/npm'
-
 const SNYK_PACKAGE_PAGE = 'https://snyk.io/vuln/npm:'
-const SNYK_API_TOKEN = process.env.SNYK_TOKEN
 const SNYK_CONFIG_FILE = '.config/configstore/snyk.json'
 
 class Marshall extends BaseMarshall {
@@ -20,6 +17,11 @@ class Marshall extends BaseMarshall {
     this.categoryId = marshallCategories.SupplyChainSecurity.id
 
     this.snykApiToken = this.getSnykToken()
+    this.snykApiUrl = this.getSnykApiUrl()
+  }
+
+  getSnykApiUrl() {
+    return process.env.SNYK_API_URL || process.env.SNYK_API || 'https://snyk.io/api/v1/vuln/npm'
   }
 
   title() {
@@ -119,7 +121,7 @@ class Marshall extends BaseMarshall {
       return this.getOsvVulnerabilityInfo({ packageName, packageVersion })
     }
 
-    const url = `${SNYK_API_URL}/${encodeURIComponent(packageName + '@' + packageVersion)}`
+    const url = `${this.snykApiUrl}/${encodeURIComponent(packageName + '@' + packageVersion)}`
 
     return fetch(url, {
       headers: {
@@ -150,8 +152,11 @@ class Marshall extends BaseMarshall {
   }
 
   getSnykToken() {
-    if (SNYK_API_TOKEN) {
-      return SNYK_API_TOKEN
+    // Check for SNYK_API_TOKEN first, then fall back to SNYK_TOKEN
+    const snykApiToken = process.env.SNYK_API_TOKEN || process.env.SNYK_TOKEN
+
+    if (snykApiToken) {
+      return snykApiToken
     }
 
     const snykConfigPath = path.join(os.homedir(), SNYK_CONFIG_FILE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npq",
-  "version": "3.13.5",
+  "version": "3.14.0",
   "description": "marshall your npm/npm package installs with high quality and class 🎖",
   "bin": {
     "npq": "./bin/npq.js",