Cleanup organization

Author: jdalton

src/commands/organization/cmd-organization.ts

@@ -1,10 +1,11 @@
+import colors from 'yoctocolors-cjs'
+
 import { getOrganization } from './get-organization.ts'
+import { commonFlags, outputFlags } from '../../flags.ts'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
-import { commonFlags, outputFlags } from '../../flags.ts'
-import colors from 'yoctocolors-cjs'
 
 const config: CliCommandConfig = {
   commandName: 'organizations',

src/commands/organization/get-organization.ts

@@ -2,7 +2,11 @@ import colors from 'yoctocolors-cjs'
 
 import { Spinner } from '@socketsecurity/registry/lib/spinner'
 
-import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
+import {
+  getLastFiveOfApiToken,
+  handleApiCall,
+  handleUnsuccessfulApiResponse
+} from '../../utils/api'
 import { AuthError } from '../../utils/errors'
 import { getDefaultToken, setupSdk } from '../../utils/sdk'
 
@@ -15,7 +19,6 @@ export async function getOrganization(
       'User must be authenticated to run this command. To log in, run the command `socket login` and enter your API key.'
     )
   }
-
   await printOrganizationsFromToken(apiToken, format)
 }
 
@@ -30,69 +33,74 @@ async function printOrganizationsFromToken(
     'looking up organizations'
   )
 
-  if (result.success === false) {
+  if (!result.success) {
     handleUnsuccessfulApiResponse('getOrganizations', result, spinner)
     return
   }
 
-  spinner.stop('')
+  spinner.stop()
 
   const organizations = Object.values(result.data.organizations)
+  const lastFiveOfApiToken = getLastFiveOfApiToken(apiToken)
 
-  if (format === 'json') {
-    const obj = Array.from(organizations).map(o => ({
-      name: o.name,
-      id: o.id,
-      plan: o.plan
-    }))
-    console.log(JSON.stringify(obj, null, 2))
-    return
-  }
-
-  if (format === 'markdown') {
-    // | Syntax      | Description |
-    // | ----------- | ----------- |
-    // | Header      | Title       |
-    // | Paragraph   | Text        |
-
-    let mw1 = 4
-    let mw2 = 2
-    let mw3 = 4
-    for (const o of organizations) {
-      mw1 = Math.max(mw1, (o?.name || '').length)
-      mw2 = Math.max(mw2, (o?.id || '').length)
-      mw3 = Math.max(mw3, (o?.plan || '').length)
+  switch (format) {
+    case 'json': {
+      console.log(
+        JSON.stringify(
+          organizations.map(o => ({
+            name: o.name,
+            id: o.id,
+            plan: o.plan
+          })),
+          null,
+          2
+        )
+      )
+      return
     }
-
-    console.log('# Organizations\n')
-    console.log(
-      `List of organizations associated with your API key, ending with: ${colors.italic(apiToken.slice(-10, -4))}\n`
-    )
-    console.log(
-      `| Name${' '.repeat(mw1 - 4)} | ID${' '.repeat(mw2 - 2)} | Plan${' '.repeat(mw3 - 4)} |`
-    )
-    console.log(
-      `| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} | ${'-'.repeat(mw3)} |`
-    )
-    for (const o of organizations) {
+    case 'markdown': {
+      // | Syntax      | Description |
+      // | ----------- | ----------- |
+      // | Header      | Title       |
+      // | Paragraph   | Text        |
+      let mw1 = 4
+      let mw2 = 2
+      let mw3 = 4
+      for (const o of organizations) {
+        mw1 = Math.max(mw1, o.name.length)
+        mw2 = Math.max(mw2, o.id.length)
+        mw3 = Math.max(mw3, o.plan.length)
+      }
+      console.log('# Organizations\n')
       console.log(
-        `| ${(o?.name || '').padEnd(mw1, ' ')} | ${(o?.id || '').padEnd(mw2, ' ')} | ${(o?.plan || '').padEnd(mw3, ' ')} |`
+        `List of organizations associated with your API key, ending with: ${colors.italic(lastFiveOfApiToken)}\n`
       )
+      console.log(
+        `| Name${' '.repeat(mw1 - 4)} | ID${' '.repeat(mw2 - 2)} | Plan${' '.repeat(mw3 - 4)} |`
+      )
+      console.log(
+        `| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} | ${'-'.repeat(mw3)} |`
+      )
+      for (const o of organizations) {
+        console.log(
+          `| ${(o.name || '').padEnd(mw1, ' ')} | ${(o.id || '').padEnd(mw2, ' ')} | ${(o.plan || '').padEnd(mw3, ' ')} |`
+        )
+      }
+      console.log(
+        `| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} | ${'-'.repeat(mw3)} |`
+      )
+      return
+    }
+    default: {
+      console.log(
+        `List of organizations associated with your API key, ending with: ${colors.italic(lastFiveOfApiToken)}\n`
+      )
+      // Just dump
+      for (const o of organizations) {
+        console.log(
+          `- Name: ${colors.bold(o.name)}, ID: ${colors.bold(o.id)}, Plan: ${colors.bold(o.plan)}`
+        )
+      }
     }
-    console.log(
-      `| ${'-'.repeat(mw1)} | ${'-'.repeat(mw2)} | ${'-'.repeat(mw3)} |`
-    )
-    return
-  }
-
-  console.log(
-    `List of organizations associated with your API key, ending with: ${colors.italic(apiToken.slice(-10, -4))}\n`
-  )
-
-  // Just dump
-  for (const o of organizations) {
-    console.log(
-      `- Name: ${colors.bold(o?.name)}, ID: ${colors.bold(o?.id)}, Plan: ${colors.bold(o?.plan)}`
-    )
   }
 }