@socketsecurity/cli 0.10.0 → 0.11.0

package/lib/commands/index.js

@@ -12,3 +12,4 @@ export * from './scan/index.js'
 export * from './audit-log/index.js'
 export * from './repos/index.js'
 export * from './dependencies/index.js'
+export * from './organizations/index.js'

package/lib/commands/organizations/index.js

@@ -0,0 +1,81 @@
+/* eslint-disable no-console */
+
+import chalk from 'chalk'
+import meow from 'meow'
+import ora from 'ora'
+
+import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api-helpers.js'
+import { getDefaultKey, setupSdk } from '../../utils/sdk.js'
+
+/** @type {import('../../utils/meow-with-subcommands.js').CliSubcommand} */
+export const organizations = {
+  description: 'List organizations associated with the API key used',
+  async run (argv, importMeta, { parentName }) {
+    const name = parentName + ' organizations'
+
+    setupCommand(name, organizations.description, argv, importMeta)
+    await fetchOrganizations()
+  }
+}
+
+// Internal functions
+
+/**
+ * @param {string} name
+ * @param {string} description
+ * @param {readonly string[]} argv
+ * @param {ImportMeta} importMeta
+ * @returns {void}
+ */
+function setupCommand (name, description, argv, importMeta) {
+  meow(`
+    Usage
+      $ ${name}
+  `, {
+    argv,
+    description,
+    importMeta
+  })
+}
+
+/**
+ * @typedef OrganizationsData
+ * @property {import('@socketsecurity/sdk').SocketSdkReturnType<'getOrganizations'>["data"]} data
+ */
+
+/**
+ * @returns {Promise<void|OrganizationsData>}
+ */
+async function fetchOrganizations () {
+  const apiKey = getDefaultKey()
+  const socketSdk = await setupSdk(apiKey)
+  const spinner = ora('Fetching organizations...').start()
+
+  const result = await handleApiCall(socketSdk.getOrganizations(), 'looking up organizations')
+
+  if (result.success === false) {
+    return handleUnsuccessfulApiResponse('getOrganizations', result, spinner)
+  }
+
+  spinner.stop()
+
+  const organizations = Object.values(result.data.organizations)
+  if (apiKey) {
+    console.log(`List of organizations associated with your API key: ${chalk.italic(apiKey)}`)
+  } else {
+    console.log('List of organizations associated with your API key.')
+  }
+
+  organizations.map(o => {
+    console.log(`
+Name: ${o?.name}
+ID: ${o?.id}
+Plan: ${o?.plan}
+    `)
+    return o
+  })
+
+  return {
+    data: result.data
+  }
+}

package/lib/shadow/npm-injection.cjs

@@ -254,7 +254,7 @@ const ttyServerPromise = chalkPromise.then(async (chalk) => {
 const npmEntrypoint = fs.realpathSync(`${process.argv[1]}`)
 /**
  * @param {string} filepath
- * @returns {string}
+ * @returns {string | null}
  */
 function findRoot (filepath) {
   if (path.basename(filepath) === 'npm') {
@@ -262,21 +262,36 @@ function findRoot (filepath) {
   }
   const parent = path.dirname(filepath)
   if (parent === filepath) {
-    process.exit(127)
+    return null
   }
   return findRoot(parent)
 }
 const npmDir = findRoot(path.dirname(npmEntrypoint))
-const arboristLibClassPath = path.join(npmDir, 'node_modules', '@npmcli', 'arborist', 'lib', 'arborist', 'index.js')
+if (npmDir === null) {
+  console.error('Unable to find npm cli install directory, this is potentiall a bug with socket-npm caused by changes to npm cli.')
+  console.error(`Searched parent directories of ${npmEntrypoint}`)
+  process.exit(127)
+}
+let arboristLibClassPath
+try {
+  arboristLibClassPath = path.join(npmDir, 'node_modules', '@npmcli', 'arborist', 'lib', 'arborist', 'index.js')
+} catch (e) {
+  console.error('Unable to integrate with npm cli internals, this is potentially a bug with socket-npm caused by changes to npm cli.')
+  process.exit(127);
+}
 
-const npmVersion = process.env.NPM_VERSION.split('.')
 let npmlog
 
-if(npmVersion[0] === '10' && npmVersion[1] >= '6'){
-  const { log } = require(path.join(npmDir, 'node_modules', 'proc-log', 'lib', 'index.js'))
-  npmlog = log
-} else {
+try {
   npmlog = require(path.join(npmDir, 'node_modules', 'npmlog', 'lib', 'log.js'))
+} catch {
+  try {
+    const { log } = require(path.join(npmDir, 'node_modules', 'proc-log', 'lib', 'index.js'))
+    npmlog = log
+  } catch {
+    console.error('Unable to integrate with npm cli logging infrastructure, this is potentially a bug with socket-npm caused by changes to npm cli.')
+    process.exit(127);
+  }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@socketsecurity/cli",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "description": "CLI tool for Socket.dev",
   "homepage": "http://github.com/SocketDev/socket-cli-js",
   "repository": {
@@ -101,15 +101,14 @@
   "engines": {
     "node": "^20.9.0 || >=21.1.0"
   },
-
   "scripts": {
-    "check:dependency-check": "dependency-check '*.js' 'lib/shadow/*.cjs' '*.mjs' 'test/**/*.js' --no-dev --ignore-module node:* --ignore-module @cyclonedx/* --ignore-module synp",
+    "check:dependency-check": "dependency-check '*.js' 'lib/shadow/*.cjs' '*.mjs' 'test/*.js' --no-dev --ignore-module node:* --ignore-module @cyclonedx/* --ignore-module synp",
     "check:installed-check": "installed-check -i eslint-plugin-jsdoc",
     "check:lint": "eslint --report-unused-disable-directives .",
     "check:tsc": "tsc",
     "check:type-coverage": "type-coverage --detail --strict --at-least 95 --ignore-files 'test/*'",
     "check": "run-p -c --aggregate-output check:*",
-    "prepare": "husky install",
+    "prepare": "husky",
     "test:unit": "c8 --reporter=lcov --reporter text node --test",
     "test-ci": "run-s test:*",
     "test": "run-s check test:*",