Skip to content

Commit 6410676

Browse files
committed
Remove duplicate env vars
1 parent 2809981 commit 6410676

File tree

1 file changed

+21
-28
lines changed

1 file changed

+21
-28
lines changed

apps/webapp/app/env.server.ts

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,27 @@ import { BoolEnv } from "./utils/boolEnv";
33
import { isValidDatabaseUrl } from "./utils/db";
44
import { isValidRegex } from "./utils/regex";
55

6-
const GithubAppEnvSchema = z
7-
.preprocess(
8-
(val) => {
9-
const obj = val as any;
10-
if (!obj || !obj.GITHUB_APP_ENABLED) {
11-
return { ...obj, GITHUB_APP_ENABLED: "0" };
12-
}
13-
return obj;
14-
},
15-
z.discriminatedUnion("GITHUB_APP_ENABLED", [
16-
z.object({
17-
GITHUB_APP_ENABLED: z.literal("1"),
18-
GITHUB_APP_ID: z.string(),
19-
GITHUB_APP_PRIVATE_KEY: z.string(),
20-
GITHUB_APP_WEBHOOK_SECRET: z.string(),
21-
GITHUB_APP_SLUG: z.string(),
22-
}),
23-
z.object({
24-
GITHUB_APP_ENABLED: z.literal("0"),
25-
}),
26-
])
27-
);
6+
const GithubAppEnvSchema = z.preprocess(
7+
(val) => {
8+
const obj = val as any;
9+
if (!obj || !obj.GITHUB_APP_ENABLED) {
10+
return { ...obj, GITHUB_APP_ENABLED: "0" };
11+
}
12+
return obj;
13+
},
14+
z.discriminatedUnion("GITHUB_APP_ENABLED", [
15+
z.object({
16+
GITHUB_APP_ENABLED: z.literal("1"),
17+
GITHUB_APP_ID: z.string(),
18+
GITHUB_APP_PRIVATE_KEY: z.string(),
19+
GITHUB_APP_WEBHOOK_SECRET: z.string(),
20+
GITHUB_APP_SLUG: z.string(),
21+
}),
22+
z.object({
23+
GITHUB_APP_ENABLED: z.literal("0"),
24+
}),
25+
])
26+
);
2827

2928
const EnvironmentSchema = z
3029
.object({
@@ -83,12 +82,6 @@ const EnvironmentSchema = z
8382
SMTP_USER: z.string().optional(),
8483
SMTP_PASSWORD: z.string().optional(),
8584

86-
// GitHub App
87-
GITHUB_APP_ID: z.string(),
88-
GITHUB_APP_PRIVATE_KEY: z.string(),
89-
GITHUB_APP_WEBHOOK_SECRET: z.string(),
90-
GITHUB_APP_SLUG: z.string(),
91-
9285
PLAIN_API_KEY: z.string().optional(),
9386
WORKER_SCHEMA: z.string().default("graphile_worker"),
9487
WORKER_CONCURRENCY: z.coerce.number().int().default(10),

0 commit comments

Comments
 (0)