From 6311c687127cb0e19935bbf76e69e18a6e3c2a11 Mon Sep 17 00:00:00 2001
From: Aman Harwara <amanharwara@protonmail.com>
Date: Wed, 2 Mar 2022 19:43:52 +0530
Subject: [PATCH] feat: show sign-in/sign-up errors under input instead of
 alert (#904)

---
 .../AccountMenu/ConfirmPassword.tsx           | 28 +++++++++----------
 .../components/AccountMenu/CreateAccount.tsx  |  6 ++--
 .../components/AccountMenu/SignIn.tsx         | 26 ++++++-----------
 .../components/AccountMenu/index.tsx          |  1 -
 4 files changed, 25 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
index b4d780545..25dd2c317 100644
--- a/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
+++ b/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
@@ -3,7 +3,7 @@ import { WebApplication } from '@/ui_models/application';
 import { AppState } from '@/ui_models/app_state';
 import { observer } from 'mobx-react-lite';
 import { FunctionComponent } from 'preact';
-import { StateUpdater, useEffect, useRef, useState } from 'preact/hooks';
+import { useEffect, useRef, useState } from 'preact/hooks';
 import { AccountMenuPane } from '.';
 import { Button } from '../Button';
 import { Checkbox } from '../Checkbox';
@@ -17,22 +17,22 @@ type Props = {
   setMenuPane: (pane: AccountMenuPane) => void;
   email: string;
   password: string;
-  setPassword: StateUpdater<string>;
 };
 
 export const ConfirmPassword: FunctionComponent<Props> = observer(
-  ({ application, appState, setMenuPane, email, password, setPassword }) => {
+  ({ application, appState, setMenuPane, email, password }) => {
     const { notesAndTagsCount } = appState.accountMenu;
     const [confirmPassword, setConfirmPassword] = useState('');
     const [showPassword, setShowPassword] = useState(false);
     const [isRegistering, setIsRegistering] = useState(false);
     const [isEphemeral, setIsEphemeral] = useState(false);
     const [shouldMergeLocal, setShouldMergeLocal] = useState(true);
+    const [error, setError] = useState('');
 
     const passwordInputRef = useRef<HTMLInputElement>(null);
 
     useEffect(() => {
-      passwordInputRef?.current?.focus();
+      passwordInputRef.current?.focus();
     }, []);
 
     const handlePasswordChange = (e: Event) => {
@@ -50,6 +50,9 @@ export const ConfirmPassword: FunctionComponent<Props> = observer(
     };
 
     const handleKeyDown = (e: KeyboardEvent) => {
+      if (error.length) {
+        setError('');
+      }
       if (e.key === 'Enter') {
         handleConfirmFormSubmit(e);
       }
@@ -59,7 +62,7 @@ export const ConfirmPassword: FunctionComponent<Props> = observer(
       e.preventDefault();
 
       if (!password) {
-        passwordInputRef?.current!.focus();
+        passwordInputRef.current?.focus();
         return;
       }
 
@@ -76,21 +79,15 @@ export const ConfirmPassword: FunctionComponent<Props> = observer(
           })
           .catch((err) => {
             console.error(err);
-            application.alertService.alert(err).finally(() => {
-              setPassword('');
-              handleGoBack();
-            });
+            setError(err.message);
           })
           .finally(() => {
             setIsRegistering(false);
           });
       } else {
-        application.alertService
-          .alert(STRING_NON_MATCHING_PASSWORDS)
-          .finally(() => {
-            setConfirmPassword('');
-            passwordInputRef?.current!.focus();
-          });
+        setError(STRING_NON_MATCHING_PASSWORDS);
+        setConfirmPassword('');
+        passwordInputRef.current?.focus();
       }
     };
 
@@ -138,6 +135,7 @@ export const ConfirmPassword: FunctionComponent<Props> = observer(
             ref={passwordInputRef}
             disabled={isRegistering}
           />
+          {error ? <div className="color-dark-red my-2">{error}</div> : null}
           <Button
             className="btn-w-full mt-1 mb-3"
             label={
diff --git a/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx b/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
index e8f8b644c..3388d6aa0 100644
--- a/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
+++ b/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
@@ -36,7 +36,7 @@ export const CreateAccount: FunctionComponent<Props> = observer(
 
     useEffect(() => {
       if (emailInputRef.current) {
-        emailInputRef.current!.focus();
+        emailInputRef.current?.focus();
       }
     }, []);
 
@@ -62,12 +62,12 @@ export const CreateAccount: FunctionComponent<Props> = observer(
       e.preventDefault();
 
       if (!email || email.length === 0) {
-        emailInputRef?.current!.focus();
+        emailInputRef.current?.focus();
         return;
       }
 
       if (!password || password.length === 0) {
-        passwordInputRef?.current!.focus();
+        passwordInputRef.current?.focus();
         return;
       }
 
diff --git a/app/assets/javascripts/components/AccountMenu/SignIn.tsx b/app/assets/javascripts/components/AccountMenu/SignIn.tsx
index bc949f3ae..7886ab769 100644
--- a/app/assets/javascripts/components/AccountMenu/SignIn.tsx
+++ b/app/assets/javascripts/components/AccountMenu/SignIn.tsx
@@ -23,7 +23,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
     const { notesAndTagsCount } = appState.accountMenu;
     const [email, setEmail] = useState('');
     const [password, setPassword] = useState('');
-    const [isInvalid, setIsInvalid] = useState(false);
+    const [error, setError] = useState('');
     const [isEphemeral, setIsEphemeral] = useState(false);
     const [isStrictSignin, setIsStrictSignin] = useState(false);
     const [isSigningIn, setIsSigningIn] = useState(false);
@@ -44,8 +44,8 @@ export const SignInPane: FunctionComponent<Props> = observer(
     }, []);
 
     const resetInvalid = () => {
-      if (isInvalid) {
-        setIsInvalid(false);
+      if (error.length) {
+        setError('');
       }
     };
 
@@ -56,8 +56,8 @@ export const SignInPane: FunctionComponent<Props> = observer(
     };
 
     const handlePasswordChange = (e: Event) => {
-      if (isInvalid) {
-        setIsInvalid(false);
+      if (error.length) {
+        setError('');
       }
       if (e.target instanceof HTMLInputElement) {
         setPassword(e.target.value);
@@ -91,11 +91,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
         })
         .catch((err) => {
           console.error(err);
-          if (err.toString().includes('Invalid email or password')) {
-            setIsInvalid(true);
-          } else {
-            application.alertService.alert(err);
-          }
+          setError(err.message ?? err.toString());
           setPassword('');
           passwordInputRef?.current?.blur();
         })
@@ -141,7 +137,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
         </div>
         <div className="px-3 mb-1">
           <InputWithIcon
-            className={`mb-2 ${isInvalid ? 'border-dark-red' : null}`}
+            className={`mb-2 ${error ? 'border-dark-red' : null}`}
             icon="email"
             inputType="email"
             placeholder="Email"
@@ -153,7 +149,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
             ref={emailInputRef}
           />
           <InputWithIcon
-            className={`mb-2 ${isInvalid ? 'border-dark-red' : null}`}
+            className={`mb-2 ${error ? 'border-dark-red' : null}`}
             icon="password"
             inputType={showPassword ? 'text' : 'password'}
             placeholder="Password"
@@ -171,11 +167,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
             }}
             ref={passwordInputRef}
           />
-          {isInvalid ? (
-            <div className="color-dark-red my-2">
-              Invalid email or password.
-            </div>
-          ) : null}
+          {error ? <div className="color-dark-red my-2">{error}</div> : null}
           <Button
             className="btn-w-full mt-1 mb-3"
             label={isSigningIn ? 'Signing in...' : 'Sign in'}
diff --git a/app/assets/javascripts/components/AccountMenu/index.tsx b/app/assets/javascripts/components/AccountMenu/index.tsx
index 35ba2e918..8a99b0b93 100644
--- a/app/assets/javascripts/components/AccountMenu/index.tsx
+++ b/app/assets/javascripts/components/AccountMenu/index.tsx
@@ -74,7 +74,6 @@ const MenuPaneSelector: FunctionComponent<PaneSelectorProps> = observer(
             setMenuPane={setMenuPane}
             email={email}
             password={password}
-            setPassword={setPassword}
           />
         );
     }