fix oauth redirect

nichtsam · Jan 15, 2025 · c1da2b8 · c1da2b8
1 parent 330dc6f
commit c1da2b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/utils/auth/providers/discord.server.ts b/app/utils/auth/providers/discord.server.ts
@@ -4,6 +4,7 @@ import { cachified, longLivedCache } from '#app/utils/cache.server.ts'
 import { env } from '#app/utils/env.server.ts'
 import { type ServerTiming } from '#app/utils/timings.server.ts'
 import { type AuthProvider } from './model.ts'
+import { getDomainUrl } from '#app/utils/request.server.ts'
 
 const getEmail = (profile: Profile) =>
 	profile.verified && profile.email ? profile.email : undefined
@@ -46,7 +47,7 @@ export class DiscordProvider implements AuthProvider {
 			{
 				clientId: env.DISCORD_CLIENT_ID,
 				clientSecret: env.DISCORD_CLIENT_SECRET,
-				redirectURI: new URL('/auth/discord/callback', request.url),
+				redirectURI: new URL('/auth/discord/callback', getDomainUrl(request)),
 				scopes: ['identify', 'email'],
 			},
 			async ({ tokens }) => {

diff --git a/app/utils/auth/providers/github.server.ts b/app/utils/auth/providers/github.server.ts
@@ -4,6 +4,7 @@ import { cachified, longLivedCache } from '#app/utils/cache.server.ts'
 import { env } from '#app/utils/env.server.ts'
 import { type ServerTiming } from '#app/utils/timings.server.ts'
 import { type AuthProvider } from './model.ts'
+import { getDomainUrl } from '#app/utils/request.server.ts'
 
 const getDisplayName = (profile: Profile) => profile.login
 const getProfileLink = (profile: Profile) =>
@@ -74,7 +75,7 @@ export class GitHubProvider implements AuthProvider {
 			{
 				clientId: env.GITHUB_CLIENT_ID,
 				clientSecret: env.GITHUB_CLIENT_SECRET,
-				redirectURI: new URL('/auth/github/callback', request.url),
+				redirectURI: new URL('/auth/github/callback', getDomainUrl(request)),
 				scopes: ['user'],
 			},
 			async ({ tokens }) => {