Refactor login

MaxwellBo · Apr 10, 2018 · e1beda0 · e1beda0
1 parent 5c69e30
commit e1beda0
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/src/components/Auth.tsx b/src/components/Auth.tsx
@@ -86,10 +86,12 @@ export default class Login extends React.Component<Props, State> {
     this.setState({ creating: true });
 
     firebase.auth().createUserWithEmailAndPassword(email, password).then(() => {
-      const nme = 'Account created';
-      const message = 'Your account was successfully created';
+      const success = { 
+        name: 'Account created',
+        message: 'Your account was successfully created' 
+      };
 
-      this.setState({ creating: false, success: { name: nme, message } });
+      this.setState({ creating: false, success });
     }).catch(err => {
       this.setState({ creating: false, error: err });
     });
@@ -100,19 +102,25 @@ export default class Login extends React.Component<Props, State> {
     this.setState({ resetting: true });
 
     firebase.auth().sendPasswordResetEmail(email).then(() => {
-      const nme = 'Password reset';
-      const message = `Check your inbox at ${email} for further instructions`;
+      const success = {
+        name: 'Password reset',
+        message: `Check your inbox at ${email} for further instructions`
+      };
 
-      this.setState({ resetting: false, success: { name: nme, message }  });
+      this.setState({ resetting: false, success });
     }).catch(err => {
       this.setState({ resetting: false, error: err });
     });
   }
 
-  handleDismiss = () => {
+  handleDismissError = () => {
     this.setState({ error: undefined });
   }
 
+  handleDismissSuccess = () => {
+    this.setState({ success: undefined });
+  }
+
   emailHandler = (e: React.FormEvent<HTMLInputElement>) =>
     this.setState({ email: e.currentTarget.value })
 
@@ -140,7 +148,8 @@ export default class Login extends React.Component<Props, State> {
   }
 
   renderLogin = () => {
-    const { emailHandler, passwordHandler, handleDismiss, createHandler, loginHandler, passwordResetHandler } = this;
+    const { emailHandler, passwordHandler, handleDismissError, handleDismissSuccess, createHandler, 
+      loginHandler, passwordResetHandler } = this;
     const { loggingIn, creating, user, resetting, email, password } = this.state;
     const { allowSignup } = this.props;
 
@@ -177,14 +186,15 @@ export default class Login extends React.Component<Props, State> {
         <Message
           key="success"
           success
+          onDismiss={handleDismissSuccess}
         >
           <Message.Header>{succ ? succ.name : ''}</Message.Header>
           <Message.Content>{succ ? succ.message : ''}</Message.Content>
         </Message>
         <Message
           key="error"
           error
-          onDismiss={handleDismiss}
+          onDismiss={handleDismissError}
         >
           <Message.Header>{err ? err.name : ''}</Message.Header>
           <Message.Content>{err ? err.message : ''}</Message.Content>