wip signin

src/lib/components/sidebar/Sidebar.svelte

@@ -24,11 +24,6 @@
     cookies.remove("hf_access_token");
     window.location.href = "/";
   }
-  // if (!e.data.code) return;
-  //   if (e.data.type === "user-oauth" && e?.data?.code && !events.code) {
-  //     events.code = e.data.code;
-  //     loginFromCode(e.data.code);
-  //   }
 </script>
 
 <button class="bg-transparent absolute top-10 right-8 cursor-pointer xl:hidden" on:click="{handleClick}">

src/lib/stores/use-user.ts

@@ -1,32 +1,21 @@
 import { writable } from "svelte/store";
-import cookies from "js-cookie";
-import { env } from "$env/dynamic/public";
+// import cookies from "js-cookie";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export const userStore = writable<any>(null);
 
 export const openWindowLogin = async () => {
-  console.log(window)
-  if (window.location.host.includes("huggingface.co")) {
-    console.log("redirecting to public space", env.PUBLIC_SPACE_URL)
-    window.location.href = env.PUBLIC_SPACE_URL as string;
-    return
-  }
-  return window.open(
-    "/api/auth/login",
-    "Login to LoRAs Studio",
-    "menubar=no,width=500,height=777,location=no,resizable=no,scrollbars=yes,status=no"
-  );
+  window.location.href = "/api/auth/login";
 };
 
-export const loginFromCode = async (code: string) => {
-  const request = await fetch(`/api/auth`, {
-    method: "POST",
-    body: JSON.stringify({ code }),
-  });
-  const { ok, token } = await request.json();
-  if (ok) {
-    cookies.set("hf_access_token", token, { expires: 1, domain: process.env.SPACE_HOST });
-    window.location.reload();
-  }
-};
+// export const loginFromCode = async (code: string) => {
+//   const request = await fetch(`/api/auth`, {
+//     method: "POST",
+//     body: JSON.stringify({ code }),
+//   });
+//   const { ok, token } = await request.json();
+//   if (ok) {
+//     cookies.set("hf_access_token", token, { expires: 1, domain: process.env.SPACE_HOST });
+//     window.location.reload();
+//   }
+// };

src/routes/+layout.svelte

@@ -1,11 +1,10 @@
 <script>
 	import { get } from "svelte/store";
-	import { browser } from '$app/environment';
 	import Icon from "@iconify/svelte";
 
 	import Sidebar from "$lib/components/sidebar/Sidebar.svelte";
 	import "$lib/styles/tailwind.css"
-	import { userStore, loginFromCode } from "$lib/stores/use-user";
+	import { userStore } from "$lib/stores/use-user";
 	import Dialog from "$lib/components/dialog/Dialog.svelte";
 	import { loginModalStore } from "$lib/stores/use-login-modal";
 
@@ -17,14 +16,6 @@
 	loginModalStore.subscribe((v) => {
 		open = v;
   });
-
-	if (browser) {
-    window.addEventListener("message", async (event) => {
-      if (event.data?.type === "user-oauth") {
-      	await loginFromCode(event.data.code);
-      }
-    });
-  }
 </script>
 
 <div class="flex items-start">

src/routes/login/callback/+page.svelte

@@ -1,29 +1,3 @@
-<script lang="ts">
-  import { browser } from '$app/environment';
-export let data;
-
-if (browser && data?.code) {
-  if (window.opener) {
-    window.opener.postMessage(
-      {
-        code: data?.code,
-        type: "user-oauth",
-      },
-      window.location.origin
-    );
-    setTimeout(() => window.close(), 200);
-  } else {
-    window.postMessage(
-      {
-        code: data?.code,
-        type: "user-oauth",
-      },
-      window.location.origin
-    );
-  }
-}
-</script>
-
 <div class="p-10">
   <h1 class="text-white text-2xl font-bold">Login in progress..</h1>
 </div>

src/routes/login/callback/+page.ts

@@ -1,6 +1,21 @@
+import cookies from "js-cookie";
+
 export async function load({ url }) {
   const code = url.searchParams.get("code")
 
+  // let token;
+  if (code) {
+    const request = await fetch(`/api/auth`, {
+      method: "POST",
+      body: JSON.stringify({ code }),
+    });
+    const { ok, token } = await request.json();
+    if (ok) {
+      cookies.set("hf_access_token", token, { expires: 1, domain: process.env.SPACE_HOST });
+      window.location.href = "/";
+    }
+  }
+
   return {
     code
   }