fix race condition

2 files changed, 2 insertions, 53 deletions

diff --git a/src/routes/(static)/login/+page.server.ts b/src/routes/(static)/login/+page.server.ts
index d402fdad..68143d83 100644
--- a/src/routes/(static)/login/+page.server.ts
+++ b/src/routes/(static)/login/+page.server.ts
@@ -97,57 +97,6 @@ export const actions = {
     };
   },
 
-  passwordAuth: async ({ cookies, fetch, request }) => {
-    const form = await fd(request);
-    let { event, challenge, username, loginRedirect, recaptcha, token: twofa } = form;
-    if (loginRedirect === "null" || loginRedirect === "undefined") loginRedirect = undefined;
-    event = JSON.parse(event);
-
-    const maxAge = 380 * 24 * 60 * 60;
-
-    const res = await fetch(`${PUBLIC_COINOS_URL}/authKeyLogin`, {
-      method: "POST",
-      body: JSON.stringify({ event, challenge, username, recaptcha, twofa }),
-      headers: {
-        "content-type": "application/json",
-        accept: "application/json",
-        "cf-connecting-ip": request.headers.get("cf-connecting-ip") ?? "",
-        "x-forwarded-host": request.headers.get("host") ?? "",
-      },
-    });
-
-    const text = await res.text();
-
-    if (res.status === 401) {
-      if (text.startsWith("2fa")) throw new Error("2fa");
-      throw new Error(text);
-    }
-
-    if (!res.ok) {
-      let message;
-      try {
-        ({ message } = JSON.parse(text));
-      } catch {
-        message = text;
-      }
-      return fail(400, { error: message || "Login failed" });
-    }
-
-    const { user, token } = JSON.parse(text);
-    if (!token) return fail(400, { error: "Login failed" });
-    const { username: uname, language } = user;
-
-    const expires = new Date();
-    expires.setSeconds(expires.getSeconds() + maxAge);
-
-    const opts = { path: "/", expires };
-    if (language) cookies.set("lang", language, opts);
-    cookies.set("username", uname, opts);
-    cookies.set("token", token, opts);
-
-    redirect(307, loginRedirect || `/${uname}`);
-  },
-
   passkey: async ({ cookies, fetch, request }) => {
     const form = await fd(request);
     let { credential, challengeId, loginRedirect } = form;
diff --git a/src/routes/(static)/register/auth/+page.svelte b/src/routes/(static)/register/auth/+page.svelte
index d285e0af..ad5d6e54 100644
--- a/src/routes/(static)/register/auth/+page.svelte
+++ b/src/routes/(static)/register/auth/+page.svelte
@@ -71,7 +71,7 @@
 
   const getRecaptchaToken = () =>
     new Promise((resolve, reject) => {
-      if (isTor) return resolve("");
+      if (isTor || !recaptchaSiteKey) return resolve("");
       if (!browser || !grecaptcha) return reject(new Error("captcha unavailable"));
       grecaptcha.ready(() => {
         grecaptcha.execute(recaptchaSiteKey, { action: "register" }).then(resolve).catch(reject);
@@ -144,7 +144,7 @@
 
     const result = deserialize(await response.text());
 
-    if (result.type === "success") {
+    if (result.type === "success" || result.type === "redirect") {
       try {
         const { deriveAuthKeypair } = await import("$lib/deriveAuthKey");
         const { sk } = await deriveAuthKeypair(user.username, user.password);