Skip to content

Commit 2325d87

Browse files
committed
refactor: simplify environment variable checks in ConfigService
1 parent 46a6d2c commit 2325d87

File tree

1 file changed

+20
-26
lines changed

1 file changed

+20
-26
lines changed

server/src/config/config.service.ts

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -762,38 +762,32 @@ export class ConfigService {
762762
}
763763

764764
public static getLocalauthEnabled(): boolean {
765-
let enabled = false;
766-
process.env.KUBERO_SESSION_KEY == undefined ||
767-
process.env.KUBERO_SESSION_KEY == ''
768-
? (enabled = false)
769-
: (enabled = true);
770-
771-
return enabled;
765+
// return true only when a non-empty session key exists
766+
return (
767+
process.env.KUBERO_SESSION_KEY !== undefined &&
768+
process.env.KUBERO_SESSION_KEY !== ''
769+
);
772770
}
773771

774772
public static getGithubEnabled(): boolean {
775-
let enabled = false;
776-
process.env.GITHUB_CLIENT_SECRET == undefined ||
777-
process.env.GITHUB_CLIENT_ID == undefined ||
778-
process.env.GITHUB_CLIENT_CALLBACKURL == undefined ||
779-
process.env.GITHUB_CLIENT_ORG == undefined
780-
? (enabled = false)
781-
: (enabled = true);
782-
783-
return enabled;
773+
// return true only when all required GitHub env vars are present
774+
return (
775+
process.env.GITHUB_CLIENT_SECRET !== undefined &&
776+
process.env.GITHUB_CLIENT_ID !== undefined &&
777+
process.env.GITHUB_CLIENT_CALLBACKURL !== undefined &&
778+
process.env.GITHUB_CLIENT_ORG !== undefined
779+
);
784780
}
785781

786782
public static getOauth2Enabled(): boolean {
787-
let enabled = false;
788-
process.env.OAUTH2_CLIENT_AUTH_URL == undefined ||
789-
process.env.OAUTH2_CLIENT_TOKEN_URL == undefined ||
790-
process.env.OAUTH2_CLIENT_ID == undefined ||
791-
process.env.OAUTH2_CLIENT_SECRET == undefined ||
792-
process.env.OAUTH2_CLIENT_CALLBACKURL == undefined
793-
? (enabled = false)
794-
: (enabled = true);
795-
796-
return enabled;
783+
// return true only when all required OAuth2 env vars are present
784+
return (
785+
process.env.OAUTH2_CLIENT_AUTH_URL !== undefined &&
786+
process.env.OAUTH2_CLIENT_TOKEN_URL !== undefined &&
787+
process.env.OAUTH2_CLIENT_ID !== undefined &&
788+
process.env.OAUTH2_CLIENT_SECRET !== undefined &&
789+
process.env.OAUTH2_CLIENT_CALLBACKURL !== undefined
790+
);
797791
}
798792

799793
public static getAuthenticationScope(scope: string | undefined): string[] {

0 commit comments

Comments
 (0)