fixed callback url

src/lib/client/api.js

@@ -8,7 +8,7 @@ import { get } from 'svelte/store';
 export async function createApp(host) {
     let form = new FormData();
     form.append("client_name", "space social");
-    form.append("redirect_uris", `${location.origin}`);
+    form.append("redirect_uris", `${location.origin}/callback`);
     form.append("scopes", "read write push");
     form.append("website", "https://spacesocial.arimelody.me");
 
@@ -35,7 +35,7 @@ export function getOAuthUrl() {
     return `https://${client.instance.host}/oauth/authorize` +
         `?client_id=${client.app.id}` +
         "&scope=read+write+push" +
-        `&redirect_uri=${location.origin}` +
+        `&redirect_uri=${location.origin}/callback` +
         "&response_type=code";
 }
 
@@ -44,7 +44,7 @@ export async function getToken(code) {
     let form = new FormData();
     form.append("client_id", client.app.id);
     form.append("client_secret", client.app.secret);
-    form.append("redirect_uri", `${location.origin}`);
+    form.append("redirect_uri", `${location.origin}/callback`);
     form.append("grant_type", "authorization_code");
     form.append("code", code);
     form.append("scope", "read write push");

src/routes/+layout.svelte

@@ -1,4 +1,7 @@
 <script>
+    import '$lib/app.css';
+    import LogoLight from '$lib/../img/spacesocial-logo-light.svg';
+    import LogoDark from '$lib/../img/spacesocial-logo-dark.svg';
     import Navigation from '$lib/ui/Navigation.svelte';
     import Widgets from '$lib/ui/Widgets.svelte';
 </script>

src/routes/+page.svelte

@@ -1,9 +1,4 @@
 <script>
-    import '$lib/app.css';
-    import LogoLight from '$lib/../img/spacesocial-logo-light.svg';
-    import LogoDark from '$lib/../img/spacesocial-logo-dark.svg';
-    import Navigation from '$lib/ui/Navigation.svelte';
-    import Widgets from '$lib/ui/Widgets.svelte';
     import Feed from '$lib/ui/Feed.svelte';
     import { Client } from '$lib/client/client.js';
     import Button from '$lib/ui/Button.svelte';
@@ -14,16 +9,6 @@
     let instance_url_error = false;
     let logging_in = false;
 
-    if (typeof location !== typeof undefined) {
-        let auth_code = new URLSearchParams(location.search).get("code");
-        if (auth_code) {
-            client.getToken(auth_code).then(() => {
-                client.save();
-                location = location.origin;
-            });
-        }
-    }
-
     if (client.app && client.app.token) {
         // this triggers the client actually getting the authenticated user's data.
         client.verifyCredentials().then(user => {
@@ -97,8 +82,8 @@
         <h1>Home</h1>
         <nav>
             <Button centered active>Home</Button>
-                <Button centered disabled>Local</Button>
+            <Button centered disabled>Local</Button>
-                    <Button centered disabled>Federated</Button>
+            <Button centered disabled>Federated</Button>
         </nav>
     </header>
 
@@ -112,6 +97,7 @@
         flex-direction: column;
         justify-content: center;
         align-items: center;
+        text-align: center;
     }
 
     a {

src/routes/callback/+layout.svelte

@@ -0,0 +1 @@
+<slot/>

src/routes/callback/+page.js

@@ -0,0 +1,20 @@
+import { Client } from '$lib/client/client.js';
+import { goto } from '$app/navigation';
+import { error } from '@sveltejs/kit';
+import { get } from 'svelte/store';
+
+export const ssr = false;
+
+export async function load({ params, url }) {
+    const client = get(Client.get());
+    let auth_code = url.searchParams.get("code");
+    if (auth_code) {
+        client.getToken(auth_code).then(() => {
+            client.save();
+            goto(url.origin);
+        });
+    }
+    error(400, {
+        message: "Bad request"
+    });
+}

svelte.config.js

@@ -11,8 +11,8 @@ const config = {
         adapter: adapter({
             pages: 'build',
             assets: 'build',
-            fallback: undefined,
+            fallback: "index.html",
-            precompress: false,
+            precompress: true,
             strict: true,
         }),
         version: {