From c286b6fea7bf1789199fb6ef4244154144275bbe Mon Sep 17 00:00:00 2001
From: Thang Vu <hi@thvu.dev>
Date: Sat, 4 Mar 2023 22:25:17 +0700
Subject: [PATCH] seems to work now

---
 apps/dev/sveltekit/src/lib/SignInButton.svelte         | 7 +++----
 apps/dev/sveltekit/src/routes/+layout.server.ts        | 1 +
 apps/dev/sveltekit/src/routes/js-disabled/+page.svelte | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/dev/sveltekit/src/lib/SignInButton.svelte b/apps/dev/sveltekit/src/lib/SignInButton.svelte
index 7de98fcb..e3d64a17 100644
--- a/apps/dev/sveltekit/src/lib/SignInButton.svelte
+++ b/apps/dev/sveltekit/src/lib/SignInButton.svelte
@@ -1,12 +1,11 @@
 <script lang="ts">
   export let provider: any
+  export let callbackUrl: string
 </script>
 
 <form action={provider.signinUrl} method="POST">
-  {#if provider.callbackUrl}
-    <input type="hidden" name="callbackUrl" value={provider.callbackUrl} />
-  {/if}
-  <button type="submit" class="button">
+  <input type="hidden" name="callbackUrl" value={callbackUrl} />
+  <button type="submit">
     <slot>Sign in with {provider.name}</slot>
   </button>
 </form>
diff --git a/apps/dev/sveltekit/src/routes/+layout.server.ts b/apps/dev/sveltekit/src/routes/+layout.server.ts
index d443f182..100674c7 100644
--- a/apps/dev/sveltekit/src/routes/+layout.server.ts
+++ b/apps/dev/sveltekit/src/routes/+layout.server.ts
@@ -4,5 +4,6 @@ export const load: LayoutServerLoad = async (event) => {
   return {
     session: await event.locals.getSession(),
     providers: await event.locals.getProviders(),
+    callbackUrl: new URL(event.request.url).host,
   }
 }
diff --git a/apps/dev/sveltekit/src/routes/js-disabled/+page.svelte b/apps/dev/sveltekit/src/routes/js-disabled/+page.svelte
index 63cd055b..22cd1174 100644
--- a/apps/dev/sveltekit/src/routes/js-disabled/+page.svelte
+++ b/apps/dev/sveltekit/src/routes/js-disabled/+page.svelte
@@ -19,11 +19,11 @@
     >
   </span>
   <form action="/auth/signout" method="POST">
-    <button id="submitButton" type="submit">Sign out</button>
+    <button type="submit">Sign out</button>
   </form>
 {:else}
   <span class="notSignedInText">You are not signed in</span>
   {#each Object.values($page.data.providers) as provider}
-    <SignInButton {provider} />
+    <SignInButton {provider} callbackUrl={$page.data.callbackUrl} />
   {/each}
 {/if}