Skip to content

Commit 0a38c54

Browse files
committed
fix: refactoring
1 parent bad84aa commit 0a38c54

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

packages/cli/src/cli/cmd/ci/index.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,9 @@ export default new Command()
105105
}
106106

107107
const env = {
108-
LINGODOTDEV_API_KEY: settings.auth.apiKey,
108+
...(settings.auth.apiKey && {
109+
LINGODOTDEV_API_KEY: settings.auth.apiKey,
110+
}),
109111
LINGODOTDEV_PULL_REQUEST: options.pullRequest?.toString() || "false",
110112
...(options.commitMessage && {
111113
LINGODOTDEV_COMMIT_MESSAGE: options.commitMessage,

packages/cli/src/cli/localizer/lingodotdev.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export default function createLingoDotDevLocalizer(
1616
dedent`
1717
You're trying to use ${chalk.hex(colors.green)(
1818
"Lingo.dev",
19-
)} provider, however, no API key is configured.
19+
)} provider, however, you are not authenticated.
2020
2121
To fix this issue:
2222
1. Run ${chalk.dim("lingo.dev login")} to authenticate, or

packages/cli/src/cli/utils/settings.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export function getSettings(explicitApiKey: string | undefined): CliSettings {
2525
systemFile.auth?.apiKey ||
2626
defaults.auth.apiKey,
2727
apiUrl:
28-
env.LINGO_API_URL ||
2928
env.LINGODOTDEV_API_URL ||
3029
systemFile.auth?.apiUrl ||
3130
defaults.auth.apiUrl,
@@ -99,11 +98,10 @@ function _loadDefaults(): CliSettings {
9998

10099
function _loadEnv() {
101100
return Z.looseObject({
102-
LINGO_API_KEY: Z.string().optional(),
103-
LINGO_API_URL: Z.string().optional(),
104101
LINGODOTDEV_API_KEY: Z.string().optional(),
105102
LINGODOTDEV_API_URL: Z.string().optional(),
106103
LINGODOTDEV_WEB_URL: Z.string().optional(),
104+
LINGO_API_KEY: Z.string().optional(),
107105
OPENAI_API_KEY: Z.string().optional(),
108106
ANTHROPIC_API_KEY: Z.string().optional(),
109107
GROQ_API_KEY: Z.string().optional(),
@@ -153,7 +151,7 @@ function _getSettingsFilePath(): string {
153151
function _legacyEnvVarWarning() {
154152
const env = _loadEnv();
155153

156-
if (env.REPLEXICA_API_KEY && !env.LINGO_API_KEY && !env.LINGODOTDEV_API_KEY) {
154+
if (env.REPLEXICA_API_KEY && !env.LINGODOTDEV_API_KEY) {
157155
console.warn(
158156
"\x1b[33m%s\x1b[0m",
159157
`
@@ -171,13 +169,10 @@ function _envVarsInfo() {
171169
const env = _loadEnv();
172170
const systemFile = _loadSystemFile();
173171

174-
if (
175-
(env.LINGO_API_KEY || env.LINGODOTDEV_API_KEY) &&
176-
systemFile.auth?.apiKey
177-
) {
172+
if (env.LINGODOTDEV_API_KEY && systemFile.auth?.apiKey) {
178173
console.info(
179174
"\x1b[36m%s\x1b[0m",
180-
`ℹ️ Using API key from env var instead of credentials from user config`,
175+
`ℹ️ Using LINGODOTDEV_API_KEY env var instead of credentials from user config`,
181176
);
182177
}
183178
if (env.OPENAI_API_KEY && systemFile.llm?.openaiApiKey) {
@@ -216,10 +211,10 @@ function _envVarsInfo() {
216211
`ℹ️ Using MISTRAL_API_KEY env var instead of key from user config`,
217212
);
218213
}
219-
if (env.LINGO_API_URL || env.LINGODOTDEV_API_URL) {
214+
if (env.LINGODOTDEV_API_URL) {
220215
console.info(
221216
"\x1b[36m%s\x1b[0m",
222-
`ℹ️ Using custom API URL: ${env.LINGO_API_URL || env.LINGODOTDEV_API_URL}`,
217+
`ℹ️ Using LINGODOTDEV_API_URL: ${env.LINGODOTDEV_API_URL}`,
223218
);
224219
}
225220
if (env.LINGODOTDEV_WEB_URL) {

0 commit comments

Comments
 (0)