From c7e122f6401358645795b49d4efa6c4e4f1eba92 Mon Sep 17 00:00:00 2001
From: Miodec <jack@monkeytype.com>
Date: Thu, 22 Feb 2024 12:59:08 +0100
Subject: [PATCH] impr: authentication error messages

---
 frontend/src/ts/controllers/account-controller.ts | 10 +++++++++-
 frontend/src/ts/popups/google-sign-up-popup.ts    |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/ts/controllers/account-controller.ts b/frontend/src/ts/controllers/account-controller.ts
index 0362bc8cf..547e40d31 100644
--- a/frontend/src/ts/controllers/account-controller.ts
+++ b/frontend/src/ts/controllers/account-controller.ts
@@ -333,6 +333,7 @@ async function signIn(): Promise<void> {
       await loadUser(e.user);
     })
     .catch(function (error) {
+      console.error(error);
       let message = error.message;
       if (error.code === "auth/wrong-password") {
         message = "Incorrect password";
@@ -341,6 +342,9 @@ async function signIn(): Promise<void> {
       } else if (error.code === "auth/invalid-email") {
         message =
           "Invalid email format (make sure you are using your email to login - not your username)";
+      } else if (error.code === "auth/invalid-credential") {
+        message =
+          "Email/password is incorrect or your account does not have password authentication enabled.";
       }
       Notifications.add(message, -1);
       LoginPage.hidePreloader();
@@ -392,7 +396,11 @@ async function signInWithGoogle(): Promise<void> {
         message =
           "Invalid email format (make sure you are using your email to login - not your username)";
       } else if (error.code === "auth/popup-closed-by-user") {
-        message = "Popup closed by user";
+        // message = "Popup closed by user";
+        return;
+      } else if (error.code === "auth/user-cancelled") {
+        // message = "User refused to sign in";
+        return;
       }
       Notifications.add(message, -1);
       LoginPage.hidePreloader();
diff --git a/frontend/src/ts/popups/google-sign-up-popup.ts b/frontend/src/ts/popups/google-sign-up-popup.ts
index e1b30cf4b..e0f3b8d27 100644
--- a/frontend/src/ts/popups/google-sign-up-popup.ts
+++ b/frontend/src/ts/popups/google-sign-up-popup.ts
@@ -48,7 +48,7 @@ function show(credential: UserCredential): void {
 async function hide(): Promise<void> {
   if (isPopupVisible(wrapperId)) {
     if (signedInUser !== undefined) {
-      Notifications.add("Sign up process canceled", 0, {
+      Notifications.add("Sign up process cancelled", 0, {
         duration: 5,
       });
       LoginPage.hidePreloader();