Make badge consistent, poish other error handling cases

Author: pvdz

src/cli.ts

@@ -5,7 +5,6 @@ import { pathToFileURL } from 'node:url'
 
 import { messageWithCauses, stackWithCauses } from 'pony-cause'
 import updateNotifier from 'tiny-updater'
-import colors from 'yoctocolors-cjs'
 
 import { logger } from '@socketsecurity/registry/lib/logger'
 
@@ -35,6 +34,7 @@ import { cmdThreatFeed } from './commands/threat-feed/cmd-threat-feed'
 import { cmdWrapper } from './commands/wrapper/cmd-wrapper'
 import constants from './constants'
 import { AuthError, InputError, captureException } from './utils/errors'
+import { failMsgWithBadge } from './utils/fail-msg-with-badge'
 import { meowWithSubcommands } from './utils/meow-with-subcommands'
 
 const { SOCKET_CLI_BIN_NAME } = constants
@@ -107,9 +107,7 @@ void (async () => {
     } else {
       errorTitle = 'Unexpected error with no details'
     }
-    logger.fail(
-      `${colors.bgRed(colors.white(`${errorTitle}:`))} ${errorMessage}`
-    )
+    logger.fail(failMsgWithBadge(errorTitle, errorMessage))
     if (errorBody) {
       logger.error(`\n${errorBody}`)
     }

src/commands/analytics/cmd-analytics.test.ts

@@ -70,7 +70,7 @@ describe('socket analytics', async () => {
           |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket analytics\`, cwd: <redacted>
 
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m:
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
           - Scope must be "repo" or "org" (\\x1b[32mok\\x1b[39m)
 

src/commands/analytics/display-analytics.ts

@@ -10,9 +10,7 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { fetchOrgAnalyticsData } from './fetch-org-analytics'
 import { fetchRepoAnalyticsData } from './fetch-repo-analytics'
 import constants from '../../constants'
-import { AuthError } from '../../utils/errors'
 import { mdTableStringNumber } from '../../utils/markdown'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 import type { Widgets } from 'blessed' // Note: Widgets does not seem to actually work as code :'(
@@ -76,38 +74,6 @@ export async function displayAnalytics({
   repo: string
   outputKind: 'json' | 'markdown' | 'print'
   filePath: string
-}): Promise<void> {
-  const apiToken = getDefaultToken()
-  if (!apiToken) {
-    throw new AuthError(
-      'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API token.'
-    )
-  }
-
-  await outputAnalyticsWithToken({
-    apiToken,
-    filePath,
-    outputKind,
-    repo,
-    scope,
-    time
-  })
-}
-
-async function outputAnalyticsWithToken({
-  apiToken,
-  filePath,
-  outputKind,
-  repo,
-  scope,
-  time
-}: {
-  apiToken: string
-  scope: string
-  time: number
-  repo: string
-  outputKind: 'json' | 'markdown' | 'print'
-  filePath: string
 }): Promise<void> {
   // Lazily access constants.spinner.
   const { spinner } = constants
@@ -119,9 +85,9 @@ async function outputAnalyticsWithToken({
     | SocketSdkReturnType<'getOrgAnalytics'>['data']
     | SocketSdkReturnType<'getRepoAnalytics'>['data']
   if (scope === 'org') {
-    data = await fetchOrgAnalyticsData(time, spinner, apiToken)
+    data = await fetchOrgAnalyticsData(time, spinner)
   } else if (repo) {
-    data = await fetchRepoAnalyticsData(repo, time, spinner, apiToken)
+    data = await fetchRepoAnalyticsData(repo, time, spinner)
   }
 
   // A message should already have been printed if we have no data here

src/commands/analytics/fetch-org-analytics.ts

@@ -8,10 +8,9 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 
 export async function fetchOrgAnalyticsData(
   time: number,
-  spinner: Spinner,
-  apiToken: string
+  spinner: Spinner
 ): Promise<SocketSdkReturnType<'getOrgAnalytics'>['data'] | undefined> {
-  const sockSdk = await setupSdk(apiToken)
+  const sockSdk = await setupSdk()
   const result = await handleApiCall(
     sockSdk.getOrgAnalytics(time.toString()),
     'fetching analytics data'

src/commands/analytics/fetch-repo-analytics.ts

@@ -9,10 +9,9 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchRepoAnalyticsData(
   repo: string,
   time: number,
-  spinner: Spinner,
-  apiToken: string
+  spinner: Spinner
 ): Promise<SocketSdkReturnType<'getRepoAnalytics'>['data'] | undefined> {
-  const sockSdk = await setupSdk(apiToken)
+  const sockSdk = await setupSdk()
   const result = await handleApiCall(
     sockSdk.getRepoAnalytics(repo, time.toString()),
     'fetching analytics data'

src/commands/audit-log/cmd-audit-log.test.ts

@@ -67,7 +67,7 @@ describe('socket audit-log', async () => {
           |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket audit-log\`, cwd: <redacted>
 
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m:
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
           - Org name should be the first arg (\\x1b[31mmissing\\x1b[39m)
 

src/commands/cdxgen/cmd-cdxgen.ts

@@ -147,16 +147,6 @@ async function run(
     importMeta,
     parentName
   })
-  // if (cli.input.length)
-  //   logger.fail(
-  //     stripIndents`
-  //       ${colors.bgRed(colors.white('Input error'))}: Please provide the required fields:
-  //
-  //       - Unexpected arguments
-  //   `)
-  //   config.help(parentName, config)
-  //   return
-  // }
 
   // TODO: Convert to meow.
   const yargv = {

src/commands/config/cmd-config-get.test.ts

@@ -69,7 +69,7 @@ describe('socket config get', async () => {
           |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config get\`, cwd: <redacted>
 
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m:
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)"
       `)

src/commands/config/cmd-config-set.test.ts

@@ -74,7 +74,7 @@ describe('socket config get', async () => {
           |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config set\`, cwd: <redacted>
 
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m:
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)
 

src/commands/config/cmd-config-unset.test.ts

@@ -69,7 +69,7 @@ describe('socket config unset', async () => {
           |__   | . |  _| '_| -_|  _|     | Node: <redacted>, API token set: <redacted>
           |_____|___|___|_,_|___|_|.dev   | Command: \`socket config unset\`, cwd: <redacted>
 
-        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m:
+        \\x1b[31m\\xd7\\x1b[39m \\x1b[41m\\x1b[1m\\x1b[37m Input error: \\x1b[39m\\x1b[22m\\x1b[49m \\x1b[1mPlease review the input requirements and try again\\x1b[22m
 
           - Config key should be the first arg (\\x1b[31mmissing\\x1b[39m)"
       `)