Skip to content

Fix getting the API base url and 404 error message #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jdalton merged 1 commit into from
Mar 27, 2025
Merged

Fix getting the API base url and 404 error message #388

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@ import type {
SocketSdkOperations
} from '@socketsecurity/sdk'

const { SOCKET_SECURITY_API_BASE_URL } = constants

export function handleUnsuccessfulApiResponse<T extends SocketSdkOperations>(
_name: T,
sockSdkError: SocketSdkErrorType<T>
Expand Down Expand Up @@ -54,8 +52,10 @@ export async function handleApiError(code: number) {
return 'One of the options passed might be incorrect.'
} else if (code === 403) {
return 'You might be trying to access an organization that is not linked to the API key you are logged in with.'
} else if (code === 404) {
return 'The requested Socket API endpoint was not found (404). This could be a temporary problem caused by an incident or a bug in the CLI. If the problem persists please let us know.'
} else {
;`Server responded with status code ${code}`
return `Server responded with status code ${code}`
}
}

Expand All @@ -67,9 +67,13 @@ export function getLastFiveOfApiToken(token: string): string {
// The API server that should be used for operations.
export function getDefaultApiBaseUrl(): string | undefined {
const baseUrl =
// Lazily access constants.ENV[SOCKET_SECURITY_API_BASE_URL].
constants.ENV[SOCKET_SECURITY_API_BASE_URL] || getConfigValue('apiBaseUrl')
return isNonEmptyString(baseUrl) ? baseUrl : undefined
process.env['SOCKET_SECURITY_API_BASE_URL'] || getConfigValue('apiBaseUrl')
if (isNonEmptyString(baseUrl)) {
return baseUrl
}
// Lazily access constants.API_V0_URL.
const API_V0_URL = constants.API_V0_URL
return API_V0_URL
}

export async function queryApi(path: string, apiToken: string) {
Expand Down