Update and cleanup repos command

src/commands/repos/cmd-repos-create.ts

@@ -5,11 +5,9 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { createRepo } from './create-repo'
 import constants from '../../constants'
-import { commonFlags, outputFlags } from '../../flags'
-import { AuthError } from '../../utils/errors'
+import { commonFlags } from '../../flags'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -21,7 +19,6 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags,
     repoName: {
       type: 'string',
       shortFlag: 'n',
@@ -104,22 +101,12 @@ async function run(
     return
   }
 
-  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 key.'
-    )
-  }
-
   await createRepo({
-    outputJson: Boolean(cli.flags['json']),
-    outputMarkdown: Boolean(cli.flags['markdown']),
     orgSlug,
     repoName,
     description: String(cli.flags['repoDescription'] || ''),
     homepage: String(cli.flags['homepage'] || ''),
     default_branch: String(cli.flags['defaultBranch'] || ''),
-    visibility: String(cli.flags['visibility'] || 'private'),
-    apiToken
+    visibility: String(cli.flags['visibility'] || 'private')
   })
 }

src/commands/repos/cmd-repos-del.ts

@@ -6,10 +6,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { deleteRepo } from './delete-repo'
 import constants from '../../constants'
 import { commonFlags } from '../../flags'
-import { AuthError } from '../../utils/errors'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -74,12 +72,5 @@ async function run(
     return
   }
 
-  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 key.'
-    )
-  }
-
-  await deleteRepo(orgSlug, repoName, apiToken)
+  await deleteRepo(orgSlug, repoName)
 }

src/commands/repos/cmd-repos-list.ts

@@ -6,10 +6,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { listRepos } from './list-repos'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { AuthError } from '../../utils/errors'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -96,21 +94,16 @@ async function run(
     return
   }
 
-  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 key.'
-    )
-  }
-
   await listRepos({
-    apiToken,
-    outputJson: Boolean(cli.flags['json']),
-    outputMarkdown: Boolean(cli.flags['markdown']),
-    orgSlug,
-    sort: String(cli.flags['sort'] || 'created_at'),
     direction: cli.flags['direction'] === 'asc' ? 'asc' : 'desc',
+    orgSlug,
+    outputKind: cli.flags['json']
+      ? 'json'
+      : cli.flags['markdown']
+        ? 'markdown'
+        : 'print',
     page: Number(cli.flags['page']) || 1,
-    per_page: Number(cli.flags['perPage']) || 30
+    per_page: Number(cli.flags['perPage']) || 30,
+    sort: String(cli.flags['sort'] || 'created_at')
   })
 }

src/commands/repos/cmd-repos-update.ts

@@ -5,11 +5,9 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { updateRepo } from './update-repo'
 import constants from '../../constants'
-import { commonFlags, outputFlags } from '../../flags'
-import { AuthError } from '../../utils/errors'
+import { commonFlags } from '../../flags'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -21,7 +19,6 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags,
     repoName: {
       type: 'string',
       shortFlag: 'n',
@@ -106,17 +103,7 @@ async function run(
     return
   }
 
-  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 key.'
-    )
-  }
-
   await updateRepo({
-    apiToken,
-    outputJson: Boolean(cli.flags['json']),
-    outputMarkdown: Boolean(cli.flags['markdown']),
     orgSlug,
     repoName,
     description: String(cli.flags['repoDescription'] || ''),

src/commands/repos/cmd-repos-view.ts

@@ -6,10 +6,8 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 import { viewRepo } from './view-repo'
 import constants from '../../constants'
 import { commonFlags, outputFlags } from '../../flags'
-import { AuthError } from '../../utils/errors'
 import { meowOrExit } from '../../utils/meow-with-subcommands'
 import { getFlagListOutput } from '../../utils/output-formatting'
-import { getDefaultToken } from '../../utils/sdk'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands'
 
@@ -21,7 +19,12 @@ const config: CliCommandConfig = {
   hidden: false,
   flags: {
     ...commonFlags,
-    ...outputFlags
+    ...outputFlags,
+    repoName: {
+      description: 'The repository to check',
+      default: '',
+      type: 'string'
+    }
   },
   help: (command, config) => `
     Usage
@@ -86,12 +89,9 @@ async function run(
     return
   }
 
-  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 key.'
-    )
-  }
-
-  await viewRepo(orgSlug, repoName, apiToken)
+  await viewRepo(
+    orgSlug,
+    repoName,
+    cli.flags['json'] ? 'json' : cli.flags['markdown'] ? 'markdown' : 'print'
+  )
 }

src/commands/repos/create-repo.ts

@@ -1,21 +1,51 @@
 import constants from '../../constants'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
-import { setupSdk } from '../../utils/sdk'
+import { AuthError } from '../../utils/errors'
+import { getDefaultToken, setupSdk } from '../../utils/sdk'
 
 export async function createRepo({
+  default_branch,
+  description,
+  homepage,
+  orgSlug,
+  repoName,
+  visibility
+}: {
+  orgSlug: string
+  repoName: string
+  description: string
+  homepage: string
+  default_branch: string
+  visibility: 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 key.'
+    )
+  }
+
+  await createRepoWithToken({
+    apiToken,
+    default_branch,
+    description,
+    homepage,
+    orgSlug,
+    repoName,
+    visibility
+  })
+}
+
+async function createRepoWithToken({
   apiToken,
   default_branch,
   description,
   homepage,
   orgSlug,
-  outputJson,
-  outputMarkdown,
   repoName,
   visibility
 }: {
   apiToken: string
-  outputJson: boolean
-  outputMarkdown: boolean
   orgSlug: string
   repoName: string
   description: string
@@ -31,9 +61,6 @@ export async function createRepo({
   const socketSdk = await setupSdk(apiToken)
   const result = await handleApiCall(
     socketSdk.createOrgRepo(orgSlug, {
-      outputJson,
-      outputMarkdown,
-      orgSlug,
       name: repoName,
       description,
       homepage,
@@ -43,9 +70,10 @@ export async function createRepo({
     'creating repository'
   )
 
-  if (result.success) {
-    spinner.successAndStop('Repository created successfully')
-  } else {
+  if (!result.success) {
     handleUnsuccessfulApiResponse('createOrgRepo', result, spinner)
+    return
   }
+
+  spinner.successAndStop('Repository created successfully')
 }

src/commands/repos/delete-repo.ts

@@ -1,8 +1,23 @@
 import constants from '../../constants'
 import { handleApiCall, handleUnsuccessfulApiResponse } from '../../utils/api'
-import { setupSdk } from '../../utils/sdk'
+import { AuthError } from '../../utils/errors'
+import { getDefaultToken, setupSdk } from '../../utils/sdk'
 
 export async function deleteRepo(
+  orgSlug: string,
+  repoName: 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 key.'
+    )
+  }
+
+  await deleteRepoWithToken(orgSlug, repoName, apiToken)
+}
+
+async function deleteRepoWithToken(
   orgSlug: string,
   repoName: string,
   apiToken: string
@@ -18,9 +33,10 @@ export async function deleteRepo(
     'deleting repository'
   )
 
-  if (result.success) {
-    spinner.successAndStop('Repository deleted successfully')
-  } else {
+  if (!result.success) {
     handleUnsuccessfulApiResponse('deleteOrgRepo', result, spinner)
+    return
   }
+
+  spinner.successAndStop('Repository deleted successfully')
 }