Skip to content

Commit 319171e

Browse files
committed
fix github auth api url
1 parent cf5ecec commit 319171e

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

packages/web/src/ee/sso/sso.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,22 @@ export const getSSOProviders = (): Provider[] => {
1818
const providers: Provider[] = [];
1919

2020
if (env.AUTH_EE_GITHUB_CLIENT_ID && env.AUTH_EE_GITHUB_CLIENT_SECRET) {
21+
const baseUrl = env.AUTH_EE_GITHUB_BASE_URL ?? "https://github.com";
22+
const apiUrl = env.AUTH_EE_GITHUB_BASE_URL ? `${env.AUTH_EE_GITHUB_BASE_URL}/api/v3` : "https://api.github.com";
2123
providers.push(GitHub({
2224
clientId: env.AUTH_EE_GITHUB_CLIENT_ID,
2325
clientSecret: env.AUTH_EE_GITHUB_CLIENT_SECRET,
2426
authorization: {
25-
url: `${env.AUTH_EE_GITHUB_BASE_URL}/login/oauth/authorize`,
27+
url: `${baseUrl}/login/oauth/authorize`,
2628
params: {
2729
scope: "read:user user:email",
2830
},
2931
},
3032
token: {
31-
url: `${env.AUTH_EE_GITHUB_BASE_URL}/login/oauth/access_token`,
33+
url: `${baseUrl}/login/oauth/access_token`,
3234
},
3335
userinfo: {
34-
url: `${env.AUTH_EE_GITHUB_BASE_URL}/api/v3/user`,
36+
url: `${apiUrl}/user`,
3537
},
3638
}));
3739
}

packages/web/src/env.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const env = createEnv({
2828
AUTH_EE_ENABLE_JIT_PROVISIONING: booleanSchema.default('false'),
2929
AUTH_EE_GITHUB_CLIENT_ID: z.string().optional(),
3030
AUTH_EE_GITHUB_CLIENT_SECRET: z.string().optional(),
31-
AUTH_EE_GITHUB_BASE_URL: z.string().default("https://github.com"),
31+
AUTH_EE_GITHUB_BASE_URL: z.string().optional(),
3232
AUTH_EE_GITLAB_CLIENT_ID: z.string().optional(),
3333
AUTH_EE_GITLAB_CLIENT_SECRET: z.string().optional(),
3434
AUTH_EE_GITLAB_BASE_URL: z.string().default("https://gitlab.com"),

0 commit comments

Comments
 (0)