fixes

Author: evanpelle

resources/lang/en.json

@@ -142,7 +142,8 @@
   "account_modal": {
     "title": "Account",
     "logged_in_as": "Logged in as {email}",
-    "logged_in_with_discord": "Logged in with Discord"
+    "logged_in_with_discord": "Logged in with Discord",
+    "recovery_email_sent": "Recovery email sent to {email}"
   },
   "map": {
     "map": "Map",

src/client/AccountModal.ts

@@ -184,7 +184,11 @@ export class AccountModal extends LitElement {
       });
 
       if (response.ok) {
-        alert(`Recovery email sent to: ${this.email}`);
+        alert(
+          translateText("account_modal.recovery_email_sent", {
+            email: this.email,
+          }),
+        );
         this.close();
       } else {
         console.error(
@@ -219,15 +223,10 @@ export class AccountModal extends LitElement {
   }
 
   private async handleLogout() {
-    try {
-      await logOut();
-      this.close();
-      // Refresh the page after logout to update the UI state
-      window.location.reload();
-    } catch (error) {
-      console.error("Error during logout:", error);
-      alert("Error during logout. Please try again.");
-    }
+    await logOut();
+    this.close();
+    // Refresh the page after logout to update the UI state
+    window.location.reload();
   }
 }
 

src/client/Main.ts

@@ -449,8 +449,8 @@ class Client {
       if (token) {
         strip();
         window.addEventListener("beforeunload", () => {
-          // The page refreshes after token login, so we need to save the pattern name
-          // in case it is unset during login.
+          // The page reloads after token login, so we need to save the pattern name
+          // in case it is unset during reload.
           this.userSettings.setSelectedPatternName(patternName);
         });
         this.tokenLoginModal.open(token);
@@ -466,7 +466,7 @@ class Client {
 
       if (!token) {
         alertAndStrip(
-          `login failed! got url ${window.location.href} Please try again.`,
+          `login failed! Please try again later or contact support.`,
         );
         return;
       }

src/client/jwt.ts

@@ -75,22 +75,21 @@ export async function tokenLogin(token: string): Promise<string | null> {
   const response = await fetch(
     `${getApiBase()}/login/token?login-token=${token}`,
   );
-  if (response.status === 200) {
-    const json = await response.json();
-    const { jwt, email } = json;
-    const payload = decodeJwt(jwt);
-    const result = TokenPayloadSchema.safeParse(payload);
-    if (!result.success) {
-      console.error("Invalid token", result.error, result.error.message);
-      return null;
-    }
-    clearToken();
-    localStorage.setItem("token", jwt);
-    return email;
-  } else {
+  if (response.status !== 200) {
     console.error("Token login failed", response);
     return null;
   }
+  const json = await response.json();
+  const { jwt, email } = json;
+  const payload = decodeJwt(jwt);
+  const result = TokenPayloadSchema.safeParse(payload);
+  if (!result.success) {
+    console.error("Invalid token", result.error, result.error.message);
+    return null;
+  }
+  clearToken();
+  localStorage.setItem("token", jwt);
+  return email;
 }
 
 export function getAuthHeader(): string {