Make setupSdk no longer throw (#530)

pvdz · jdalton · commit eab69e804fff · 2025-05-07T10:29:43.000-07:00
* Make setupSdk no longer throw

* lint

* dejaokay

* ironic
diff --git a/src/commands/analytics/fetch-org-analytics.mts b/src/commands/analytics/fetch-org-analytics.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchOrgAnalyticsData(
   time: number
 ): Promise<CResult<SocketSdkReturnType<'getOrgAnalytics'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgAnalytics(time.toString()),
diff --git a/src/commands/analytics/fetch-repo-analytics.mts b/src/commands/analytics/fetch-repo-analytics.mts
@@ -8,7 +8,11 @@ export async function fetchRepoAnalyticsData(
   repo: string,
   time: number
 ): Promise<CResult<SocketSdkReturnType<'getRepoAnalytics'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getRepoAnalytics(repo, time.toString()),
diff --git a/src/commands/audit-log/fetch-audit-log.mts b/src/commands/audit-log/fetch-audit-log.mts
@@ -17,7 +17,11 @@ export async function fetchAuditLog({
   perPage: number
   logType: string
 }): Promise<CResult<SocketSdkReturnType<'getAuditLogEvents'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getAuditLogEvents(orgSlug, {
diff --git a/src/commands/ci/fetch-default-org-slug.mts b/src/commands/ci/fetch-default-org-slug.mts
@@ -15,7 +15,11 @@ export async function getDefaultOrgSlug(): Promise<CResult<string>> {
     return { ok: true, data: defaultOrgResult }
   }
 
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   const result = await handleApiCall(
     sockSdk.getOrganizations(),
diff --git a/src/commands/config/discover-config-value.mts b/src/commands/config/discover-config-value.mts
@@ -129,7 +129,11 @@ export async function discoverConfigValue(
 async function getDefaultOrgFromToken(): Promise<
   string[] | string | undefined
 > {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return undefined
+  }
+  const sockSdk = sockSdkResult.data
 
   const result = await handleApiCall(
     sockSdk.getOrganizations(),
@@ -153,7 +157,11 @@ async function getDefaultOrgFromToken(): Promise<
 }
 
 async function getEnforceableOrgsFromToken(): Promise<string[] | undefined> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return undefined
+  }
+  const sockSdk = sockSdkResult.data
 
   const result = await handleApiCall(
     sockSdk.getOrganizations(),
diff --git a/src/commands/dependencies/fetch-dependencies.mts b/src/commands/dependencies/fetch-dependencies.mts
@@ -11,7 +11,11 @@ export async function fetchDependencies({
   limit: number
   offset: number
 }): Promise<CResult<SocketSdkReturnType<'searchDependencies'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.searchDependencies({ limit, offset }),
diff --git a/src/commands/info/fetch-package-info.mts b/src/commands/info/fetch-package-info.mts
@@ -12,7 +12,11 @@ export async function fetchPackageInfo(
   pkgVersion: string,
   includeAllIssues: boolean
 ): Promise<void | PackageData> {
-  const sockSdk = await setupSdk(getPublicToken())
+  const sockSdkResult = await setupSdk(getPublicToken())
+  if (!sockSdkResult.ok) {
+    throw new Error('Was unable to setup sdk. Run `socket login` first.')
+  }
+  const sockSdk = sockSdkResult.data
 
   const result = await handleApiCall(
     sockSdk.getIssuesByNPMPackage(pkgName, pkgVersion),
diff --git a/src/commands/login/attempt-login.mts b/src/commands/login/attempt-login.mts
@@ -32,9 +32,13 @@ export async function attemptLogin(
     })) || SOCKET_PUBLIC_API_TOKEN
 
   const sdk = await setupSdk(apiToken, apiBaseUrl, apiProxy)
+  if (!sdk.ok) {
+    logger.fail(failMsgWithBadge(sdk.message, sdk.cause))
+    return
+  }
 
   const result = await handleApiCall(
-    sdk.getOrganizations(),
+    sdk.data.getOrganizations(),
     'token verification'
   )
 
diff --git a/src/commands/oops/cmd-oops.mts b/src/commands/oops/cmd-oops.mts
@@ -2,9 +2,9 @@ import { logger } from '@socketsecurity/registry/lib/logger'
 
 import constants from '../../constants.mts'
 import { commonFlags, outputFlags } from '../../flags.mts'
-import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mjs'
+import { failMsgWithBadge } from '../../utils/fail-msg-with-badge.mts'
 import { meowOrExit } from '../../utils/meow-with-subcommands.mts'
-import { serializeResultJson } from '../../utils/serialize-result-json.mjs'
+import { serializeResultJson } from '../../utils/serialize-result-json.mts'
 
 import type { CliCommandConfig } from '../../utils/meow-with-subcommands.mts'
 
diff --git a/src/commands/organization/fetch-license-policy.mts b/src/commands/organization/fetch-license-policy.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchLicensePolicy(
   orgSlug: string
 ): Promise<CResult<SocketSdkReturnType<'getOrgLicensePolicy'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgLicensePolicy(orgSlug),
diff --git a/src/commands/organization/fetch-organization-list.mts b/src/commands/organization/fetch-organization-list.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchOrganization(): Promise<
   CResult<SocketSdkReturnType<'getOrganizations'>['data']>
 > {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(sockSdk.getOrganizations(), 'organization list')
 }
diff --git a/src/commands/organization/fetch-quota.mts b/src/commands/organization/fetch-quota.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchQuota(): Promise<
   CResult<SocketSdkReturnType<'getQuota'>['data']>
 > {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(sockSdk.getQuota(), 'token quota')
 }
diff --git a/src/commands/organization/fetch-security-policy.mts b/src/commands/organization/fetch-security-policy.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchSecurityPolicy(
   orgSlug: string
 ): Promise<CResult<SocketSdkReturnType<'getOrgSecurityPolicy'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgSecurityPolicy(orgSlug),
diff --git a/src/commands/package/fetch-purls-shallow-score.mts b/src/commands/package/fetch-purls-shallow-score.mts
@@ -1,7 +1,7 @@
 import { logger } from '@socketsecurity/registry/lib/logger'
 
 import { handleApiCall } from '../../utils/api.mts'
-import { getPublicToken, setupSdk } from '../../utils/sdk.mts'
+import { setupSdk } from '../../utils/sdk.mts'
 
 import type { CResult } from '../../types.mts'
 import type { SocketSdkReturnType } from '@socketsecurity/sdk'
@@ -13,7 +13,11 @@ export async function fetchPurlsShallowScore(
     `Requesting shallow score data for ${purls.length} package urls (purl): ${purls.join(', ')}`
   )
 
-  const sockSdk = await setupSdk(getPublicToken())
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   const result = await handleApiCall(
     sockSdk.batchPackageFetch(
diff --git a/src/commands/repos/cmd-repos-list.mts b/src/commands/repos/cmd-repos-list.mts
@@ -126,7 +126,7 @@ async function run(
     },
     {
       nook: true,
-      test: hasApiToken ,
+      test: hasApiToken,
       message:
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
diff --git a/src/commands/repos/fetch-create-repo.mts b/src/commands/repos/fetch-create-repo.mts
@@ -19,7 +19,11 @@ export async function fetchCreateRepo({
   default_branch: string
   visibility: string
 }): Promise<CResult<SocketSdkReturnType<'createOrgRepo'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.createOrgRepo(orgSlug, {
diff --git a/src/commands/repos/fetch-delete-repo.mts b/src/commands/repos/fetch-delete-repo.mts
@@ -8,7 +8,11 @@ export async function fetchDeleteRepo(
   orgSlug: string,
   repoName: string
 ): Promise<CResult<SocketSdkReturnType<'deleteOrgRepo'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.deleteOrgRepo(orgSlug, repoName),
diff --git a/src/commands/repos/fetch-list-repos.mts b/src/commands/repos/fetch-list-repos.mts
@@ -17,7 +17,11 @@ export async function fetchListRepos({
   per_page: number
   sort: string
 }): Promise<CResult<SocketSdkReturnType<'getOrgRepoList'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgRepoList(orgSlug, {
diff --git a/src/commands/repos/fetch-update-repo.mts b/src/commands/repos/fetch-update-repo.mts
@@ -19,7 +19,11 @@ export async function fetchUpdateRepo({
   default_branch: string
   visibility: string
 }): Promise<CResult<SocketSdkReturnType<'updateOrgRepo'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.updateOrgRepo(orgSlug, repoName, {
diff --git a/src/commands/repos/fetch-view-repo.mts b/src/commands/repos/fetch-view-repo.mts
@@ -8,7 +8,11 @@ export async function fetchViewRepo(
   orgSlug: string,
   repoName: string
 ): Promise<CResult<SocketSdkReturnType<'getOrgRepo'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgRepo(orgSlug, repoName),
diff --git a/src/commands/scan/cmd-scan-diff.mts b/src/commands/scan/cmd-scan-diff.mts
@@ -154,7 +154,7 @@ async function run(
     },
     {
       nook: true,
-      test: hasApiToken ,
+      test: hasApiToken,
       message:
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
diff --git a/src/commands/scan/cmd-scan-list.mts b/src/commands/scan/cmd-scan-list.mts
@@ -159,7 +159,7 @@ async function run(
     },
     {
       nook: true,
-      test: hasApiToken ,
+      test: hasApiToken,
       message:
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
diff --git a/src/commands/scan/cmd-scan-metadata.mts b/src/commands/scan/cmd-scan-metadata.mts
@@ -114,7 +114,7 @@ async function run(
     },
     {
       nook: true,
-      test: hasApiToken ,
+      test: hasApiToken,
       message:
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
diff --git a/src/commands/scan/cmd-scan-view.mts b/src/commands/scan/cmd-scan-view.mts
@@ -133,7 +133,7 @@ async function run(
     },
     {
       nook: true,
-      test: hasApiToken ,
+      test: hasApiToken,
       message:
         'You need to be logged in to use this command. See `socket login`.',
       pass: 'ok',
diff --git a/src/commands/scan/fetch-create-org-full-scan.mts b/src/commands/scan/fetch-create-org-full-scan.mts
@@ -27,7 +27,11 @@ export async function fetchCreateOrgFullScan(
     repoName: string
   }
 ): Promise<CResult<SocketSdkReturnType<'CreateOrgFullScan'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.createOrgFullScan(
diff --git a/src/commands/scan/fetch-delete-org-full-scan.mts b/src/commands/scan/fetch-delete-org-full-scan.mts
@@ -8,7 +8,11 @@ export async function fetchDeleteOrgFullScan(
   orgSlug: string,
   scanId: string
 ): Promise<CResult<SocketSdkReturnType<'deleteOrgFullScan'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.deleteOrgFullScan(orgSlug, scanId),
diff --git a/src/commands/scan/fetch-list-scans.mts b/src/commands/scan/fetch-list-scans.mts
@@ -23,7 +23,11 @@ export async function fetchListScans({
   repo: string
   sort: string
 }): Promise<CResult<SocketSdkReturnType<'getOrgFullScanList'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgFullScanList(orgSlug, {
diff --git a/src/commands/scan/fetch-report-data.mts b/src/commands/scan/fetch-report-data.mts
@@ -23,7 +23,11 @@ export async function fetchReportData(
     securityPolicy: SocketSdkReturnType<'getOrgSecurityPolicy'>['data']
   }>
 > {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   let scanStatus = 'requested..'
   let policyStatus = 'requested..'
diff --git a/src/commands/scan/fetch-scan-metadata.mts b/src/commands/scan/fetch-scan-metadata.mts
@@ -8,7 +8,11 @@ export async function fetchScanMetadata(
   orgSlug: string,
   scanId: string
 ): Promise<CResult<SocketSdkReturnType<'getOrgFullScanMetadata'>['data']>> {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getOrgFullScanMetadata(orgSlug, scanId),
diff --git a/src/commands/scan/fetch-supported-scan-file-names.mts b/src/commands/scan/fetch-supported-scan-file-names.mts
@@ -7,7 +7,11 @@ import type { SocketSdkReturnType } from '@socketsecurity/sdk'
 export async function fetchSupportedScanFileNames(): Promise<
   CResult<SocketSdkReturnType<'getReportSupportedFiles'>['data']>
 > {
-  const sockSdk = await setupSdk()
+  const sockSdkResult = await setupSdk()
+  if (!sockSdkResult.ok) {
+    return sockSdkResult
+  }
+  const sockSdk = sockSdkResult.data
 
   return await handleApiCall(
     sockSdk.getReportSupportedFiles(),
diff --git a/src/commands/scan/stream-scan.mts b/src/commands/scan/stream-scan.mts
diff --git a/src/commands/scan/suggest-org-slug.mts b/src/commands/scan/suggest-org-slug.mts
diff --git a/src/commands/scan/suggest-repo-slug.mts b/src/commands/scan/suggest-repo-slug.mts
diff --git a/src/commands/threat-feed/cmd-threat-feed.mts b/src/commands/threat-feed/cmd-threat-feed.mts
diff --git a/src/utils/alerts-map.mts b/src/utils/alerts-map.mts
diff --git a/src/utils/sdk.mts b/src/utils/sdk.mts
