Skip to content

Commit 7f1467c

Browse files
committed
Fix gh env schema union issue
1 parent 7507028 commit 7f1467c

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

apps/webapp/app/env.server.ts

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

66
const GithubAppEnvSchema = z
7-
.discriminatedUnion("GITHUB_APP_ENABLED", [
8-
z.object({
9-
GITHUB_APP_ENABLED: z.literal("1"),
10-
GITHUB_APP_ID: z.string(),
11-
GITHUB_APP_PRIVATE_KEY: z.string(),
12-
GITHUB_APP_WEBHOOK_SECRET: z.string(),
13-
GITHUB_APP_SLUG: z.string(),
14-
}),
15-
z.object({
16-
GITHUB_APP_ENABLED: z.literal("0"),
17-
}),
18-
])
19-
.default({
20-
GITHUB_APP_ENABLED: "0",
21-
});
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+
);
2228

2329
const EnvironmentSchema = z
2430
.object({

0 commit comments

Comments
 (0)