chore: Enable "curly" rule to avoid single-statement if confusion/errors.

This commit is contained in:
cpojer
2026-01-31 16:19:20 +09:00
parent 009b16fab8
commit 5ceff756e1
1266 changed files with 27871 additions and 9393 deletions

View File

@@ -36,7 +36,9 @@ async function refreshOAuthTokenWithLock(params: {
const store = ensureAuthProfileStore(params.agentDir);
const cred = store.profiles[params.profileId];
if (!cred || cred.type !== "oauth") return null;
if (!cred || cred.type !== "oauth") {
return null;
}
if (Date.now() < cred.expires) {
return {
@@ -63,7 +65,9 @@ async function refreshOAuthTokenWithLock(params: {
return { apiKey: newCredentials.access, newCredentials };
})()
: await getOAuthApiKey(cred.provider, oauthCreds);
if (!result) return null;
if (!result) {
return null;
}
store.profiles[params.profileId] = {
...cred,
...result.newCredentials,
@@ -91,10 +95,16 @@ async function tryResolveOAuthProfile(params: {
}): Promise<{ apiKey: string; provider: string; email?: string } | null> {
const { cfg, store, profileId } = params;
const cred = store.profiles[profileId];
if (!cred || cred.type !== "oauth") return null;
if (!cred || cred.type !== "oauth") {
return null;
}
const profileConfig = cfg?.auth?.profiles?.[profileId];
if (profileConfig && profileConfig.provider !== cred.provider) return null;
if (profileConfig && profileConfig.mode !== cred.type) return null;
if (profileConfig && profileConfig.provider !== cred.provider) {
return null;
}
if (profileConfig && profileConfig.mode !== cred.type) {
return null;
}
if (Date.now() < cred.expires) {
return {
@@ -108,7 +118,9 @@ async function tryResolveOAuthProfile(params: {
profileId,
agentDir: params.agentDir,
});
if (!refreshed) return null;
if (!refreshed) {
return null;
}
return {
apiKey: refreshed.apiKey,
provider: cred.provider,
@@ -124,12 +136,18 @@ export async function resolveApiKeyForProfile(params: {
}): Promise<{ apiKey: string; provider: string; email?: string } | null> {
const { cfg, store, profileId } = params;
const cred = store.profiles[profileId];
if (!cred) return null;
if (!cred) {
return null;
}
const profileConfig = cfg?.auth?.profiles?.[profileId];
if (profileConfig && profileConfig.provider !== cred.provider) return null;
if (profileConfig && profileConfig.provider !== cred.provider) {
return null;
}
if (profileConfig && profileConfig.mode !== cred.type) {
// Compatibility: treat "oauth" config as compatible with stored token profiles.
if (!(profileConfig.mode === "oauth" && cred.type === "token")) return null;
if (!(profileConfig.mode === "oauth" && cred.type === "token")) {
return null;
}
}
if (cred.type === "api_key") {
@@ -137,7 +155,9 @@ export async function resolveApiKeyForProfile(params: {
}
if (cred.type === "token") {
const token = cred.token?.trim();
if (!token) return null;
if (!token) {
return null;
}
if (
typeof cred.expires === "number" &&
Number.isFinite(cred.expires) &&
@@ -161,7 +181,9 @@ export async function resolveApiKeyForProfile(params: {
profileId,
agentDir: params.agentDir,
});
if (!result) return null;
if (!result) {
return null;
}
return {
apiKey: result.apiKey,
provider: cred.provider,
@@ -191,7 +213,9 @@ export async function resolveApiKeyForProfile(params: {
profileId: fallbackProfileId,
agentDir: params.agentDir,
});
if (fallbackResolved) return fallbackResolved;
if (fallbackResolved) {
return fallbackResolved;
}
} catch {
// keep original error
}