From 3199cfd8ddbcdf92a49863b751c94d9e26f071ed Mon Sep 17 00:00:00 2001
From: split <split@split.pet>
Date: Wed, 10 Jul 2024 22:09:11 -0700
Subject: [PATCH] fix redirect

---
 src/lib/oidc.ts                | 6 +++---
 src/routes/set/+page.server.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/oidc.ts b/src/lib/oidc.ts
index 8bab640..0158259 100644
--- a/src/lib/oidc.ts
+++ b/src/lib/oidc.ts
@@ -12,7 +12,7 @@ const userInfoCache = new Map<string, User>()
  * @description Launch an OAuth2 login request for this request.
  * @param req Request to launch the login for; required to obtain the Host header.
  */
-export function launchLogin(req: Request) {
+export function launchLogin(url: string) {
     // Create a state to be used in the OAuth2 authorization request
     const state = crypto.randomUUID()
 
@@ -20,7 +20,7 @@ export function launchLogin(req: Request) {
     const searchParams = new URLSearchParams({
         response_type: "code",
         client_id: configuration.oauth2.client.id,
-        redirect_uri: req.url,
+        redirect_uri: url,
         scope: "openid profile",
         state
     })
@@ -41,7 +41,7 @@ export function launchLogin(req: Request) {
                     () => states.delete(state),
                     2*60*1000
                 ),
-                redirect_uri: req.url
+                redirect_uri: url
             }
         )
     
diff --git a/src/routes/set/+page.server.ts b/src/routes/set/+page.server.ts
index f01e9c2..61ec07a 100644
--- a/src/routes/set/+page.server.ts
+++ b/src/routes/set/+page.server.ts
@@ -3,13 +3,13 @@ import configuration from "$lib/configuration.js";
 import { fail } from "@sveltejs/kit";
 import { avatarDirectory, renderSizes, setNewAvatar } from "$lib/avatars.js";
 import { join } from "path";
-export async function load({ request, parent }) {
+export async function load({ request, parent, url }) {
     const { user } = await parent();
     if (!user)
-        launchLogin(request)
+        launchLogin(url.toString())
 
     return {
-        url: request.url,
+        url: url.toString(),
         allowedImageTypes: configuration.allowed_types,
         renderSizes
     }