Skip to content

Commit ae85140

Browse files
committed
fix(env): restore v1.x environment variable fallbacks
Add missing fallback values for backward compatibility with v1.1.25: - SOCKET_CLI_API_TOKEN: Add SOCKET_CLI_API_KEY, SOCKET_SECURITY_API_KEY - SOCKET_CLI_API_BASE_URL: Add SOCKET_SECURITY_API_BASE_URL - SOCKET_CLI_API_PROXY: Add SOCKET_SECURITY_API_PROXY, HTTPS_PROXY, https_proxy, HTTP_PROXY, http_proxy - SOCKET_CLI_ORG_SLUG: Add SOCKET_ORG_SLUG - SOCKET_CLI_GITHUB_TOKEN: Add SOCKET_SECURITY_GITHUB_PAT, GITHUB_TOKEN These fallbacks were present in v1.x but missing in v2.x, causing issues for users with legacy environment variable names.
1 parent 5520e1f commit ae85140

1 file changed

Lines changed: 31 additions & 5 deletions

File tree

src/env/socket-cli.ts

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,33 @@ export function getSocketCliAcceptRisks(): boolean {
1717

1818
/**
1919
* Socket CLI API base URL (alternative name).
20+
* Checks SOCKET_CLI_API_BASE_URL first, then falls back to legacy SOCKET_SECURITY_API_BASE_URL.
2021
*
2122
* @returns API base URL or undefined
2223
*/
2324
export function getSocketCliApiBaseUrl(): string | undefined {
24-
return getEnvValue('SOCKET_CLI_API_BASE_URL')
25+
return (
26+
getEnvValue('SOCKET_CLI_API_BASE_URL') ||
27+
getEnvValue('SOCKET_SECURITY_API_BASE_URL')
28+
)
2529
}
2630

2731
/**
2832
* Proxy URL for Socket CLI API requests (alternative name).
33+
* Checks SOCKET_CLI_API_PROXY, SOCKET_SECURITY_API_PROXY, then standard proxy env vars.
34+
* Follows the same precedence as v1.x: HTTPS_PROXY → https_proxy → HTTP_PROXY → http_proxy.
2935
*
3036
* @returns API proxy URL or undefined
3137
*/
3238
export function getSocketCliApiProxy(): string | undefined {
33-
return getEnvValue('SOCKET_CLI_API_PROXY')
39+
return (
40+
getEnvValue('SOCKET_CLI_API_PROXY') ||
41+
getEnvValue('SOCKET_SECURITY_API_PROXY') ||
42+
getEnvValue('HTTPS_PROXY') ||
43+
getEnvValue('https_proxy') ||
44+
getEnvValue('HTTP_PROXY') ||
45+
getEnvValue('http_proxy')
46+
)
3447
}
3548

3649
/**
@@ -44,11 +57,18 @@ export function getSocketCliApiTimeout(): number {
4457

4558
/**
4659
* Socket CLI API authentication token (alternative name).
60+
* Checks SOCKET_CLI_API_TOKEN, SOCKET_CLI_API_KEY, SOCKET_SECURITY_API_TOKEN, SOCKET_SECURITY_API_KEY.
61+
* Maintains full v1.x backward compatibility.
4762
*
4863
* @returns API token or undefined
4964
*/
5065
export function getSocketCliApiToken(): string | undefined {
51-
return getEnvValue('SOCKET_CLI_API_TOKEN')
66+
return (
67+
getEnvValue('SOCKET_CLI_API_TOKEN') ||
68+
getEnvValue('SOCKET_CLI_API_KEY') ||
69+
getEnvValue('SOCKET_SECURITY_API_TOKEN') ||
70+
getEnvValue('SOCKET_SECURITY_API_KEY')
71+
)
5272
}
5373

5474
/**
@@ -89,11 +109,12 @@ export function getSocketCliOptimize(): boolean {
89109

90110
/**
91111
* Socket CLI organization slug identifier (alternative name).
112+
* Checks SOCKET_CLI_ORG_SLUG first, then falls back to SOCKET_ORG_SLUG.
92113
*
93114
* @returns Organization slug or undefined
94115
*/
95116
export function getSocketCliOrgSlug(): string | undefined {
96-
return getEnvValue('SOCKET_CLI_ORG_SLUG')
117+
return getEnvValue('SOCKET_CLI_ORG_SLUG') || getEnvValue('SOCKET_ORG_SLUG')
97118
}
98119

99120
/**
@@ -107,9 +128,14 @@ export function getSocketCliViewAllRisks(): boolean {
107128

108129
/**
109130
* Socket CLI GitHub authentication token.
131+
* Checks SOCKET_CLI_GITHUB_TOKEN, SOCKET_SECURITY_GITHUB_PAT, then falls back to GITHUB_TOKEN.
110132
*
111133
* @returns GitHub token or undefined
112134
*/
113135
export function getSocketCliGithubToken(): string | undefined {
114-
return getEnvValue('SOCKET_CLI_GITHUB_TOKEN')
136+
return (
137+
getEnvValue('SOCKET_CLI_GITHUB_TOKEN') ||
138+
getEnvValue('SOCKET_SECURITY_GITHUB_PAT') ||
139+
getEnvValue('GITHUB_TOKEN')
140+
)
115141
}

0 commit comments

Comments
 (0)