Seems to be all working!!

account/server/config/passport-strategies/local.js

@@ -26,6 +26,10 @@ const local = new LocalStrategy({
 		console.error("Auth Error - user not found: " + email);
 		return done(null, false, { message: `Invalid email or password` })
 	}
+	if (!user.confirmEmail) {
+		console.error("Auth Error - user has not confirmed email: " + email);
+		return done(null, false, { message: `User's email is not confirmed` })
+	}
 	user.comparePassword(password, (err, isMatch) => {
 		if (isMatch) {
 			return done(null, user)

account/server/controllers/users.js

@@ -91,11 +91,15 @@ exports.login = function (req, res, next) {
       }
       if (!user.confirmEmail) {
         req.logout();
+        req.logout(function (err) {
+          if (err) { return next(err); }
+          res.clearCookie('sessionId', { domain: cookie_domain, path: '/' });
           return res.json({
             success: false,
             message: "unconfirmed email",
             userId: user.id
           });
+        });
       }
       //console.log("account/server/controllers/users.js - req.login() Authenicated: " + user.email);
       // go ahead and create the new user
@@ -370,7 +374,6 @@ function handleSendConfirmEmail(user) {
         TextPart: "Thanks for signing up for " + site_name + ". We just wanted to check and make sure your email address was real. Copy and paste this addres in your browser to confirm your email address: " + account_server + "/confirm-email/" + user._id + "/" + token,
         HTMLPart: "<h3>Thanks for signing up for " + site_name + "</h3><br />We just wanted to check and make sure your email address was real. Copy and paste this addres in your browser to confirm your email address:<p> " + account_server + "/confirm-email/" + user._id + "/" + token + "</p>"
       }]
-    });
     }).then(result => {
       console.log("Confirm email sent to: " + user.email);
       resolve({
@@ -386,6 +389,7 @@ function handleSendConfirmEmail(user) {
         message: err
       });
     });
+  });
 }
 
 // -------------------------------------------
@@ -425,11 +429,14 @@ exports.sendConfirmEmail = async function (req, res, next) {
 
 exports.logout = function (req, res, next) {
   // the logout method is added to the request object automatically by Passport
-  req.logout();
+  req.logout(function (err) {
+    if (err) { return next(err); }
+
     res.clearCookie('sessionId', { domain: cookie_domain, path: '/' });
     return res.json({
       success: true
     });
+  });
 };
 
 exports.terms = async function (req, res, next) {
@@ -542,6 +549,30 @@ exports.updateProfile = async function (req, res, next) {
     });
     return;
   }
+
+  // Lets make sure someone else isn't using this screenName
+  screenNameUser = await User.findOne({ screenName: req.body.screenName }).catch(err => {
+    console.error(err);
+    res.status(500);
+    res.json({
+      success: false,
+      message: err
+    });
+    return;
+  });
+
+  // Did we find a user with the screeName, is it not us?
+  if (screenNameUser && (screenNameUser.userId != user.userId)) {
+    res.status(500);
+    res.json({
+      success: false,
+      message: "Screen Name already in use"
+    });
+    return;
+  }
+
+
+
   // go ahead and create the new user
   user.firstName = res.locals.firstName
   user.lastName = res.locals.lastName
@@ -608,6 +639,24 @@ exports.register = async function (req, res, next) {
     });
     return;
   }
+  user = await User.findOne({ screenName: req.body.screenName }).catch(err => {
+    console.error(err);
+    res.status(500);
+    res.json({
+      success: false,
+      message: err
+    });
+    return;
+  });
+  // is email address already in use?
+  if (user) {
+    res.status(500);
+    res.json({
+      success: false,
+      message: "Screen Name already in use"
+    });
+    return;
+  }
   // go ahead and create the new user
   user = (({
     firstName,
@@ -628,12 +677,16 @@ exports.register = async function (req, res, next) {
   user.password = req.body.password;
   user.email = req.body.email;
 
-  await User.create(user)
+  let savedUser = await User.create(user)
 
   console.log("Successfully registered: " + user.email + ", now sending confirmation email.");
-  // Since regiestration worked, send a confirmation email.
+  // Since registration worked, send a confirmation email.
-  handleSendConfirmEmail(user).then(function (result) {
+  handleSendConfirmEmail(savedUser).then(function (result) {
-    res.json(result);
+    console.log("Confirmation email sent to: " + user.email);
+    res.json({
+      success: true,
+      message: result
+    });
     return;
   }).catch(function (err) {
     console.error("Error creating user: " + user.email + " Error: " + err);

account/src/App/Restricted.js

@@ -18,11 +18,10 @@ const Restricted = ({children }) => {
 
   if (hasAuthenticated) {
     if (authenticated) {
-      return children;;
+      return children;
     }
     else {
-    
+      navigate("/login")
-    navigate("/list-systems")
     }
   }
   return <div />

account/src/User/ConfirmEmail.js

@@ -1,4 +1,4 @@
-import React, { Component } from "react";
+import React, { useState, useEffect } from "react";
 import {
   Container,
   Dimmer,
@@ -7,56 +7,49 @@ import {
   Message,
   Icon
 } from "semantic-ui-react";
-import { Link } from "react-router-dom";
+import { Link, useParams } from "react-router-dom";
+import { confirmEmail } from "../features/user/userSlice";
+import { useDispatch } from 'react-redux'
 
-class ConfirmEmail extends Component {
+const ConfirmEmail = (props) => {
+  const dispatch = useDispatch();
+  const [loading, setLoading] = useState(true);
+  const [confirmMessage, setConfirmMessage] = useState({ success: false, message: "" });
+  const { userId, token } = useParams();
 
-  state = {
-    loading: true,
-    confirmMessage: { success: false, message:""}
-  };
-  componentDidMount() {
-    const { match: { params } } = this.props;
 
-    this.props
+  const checkConfirmation = async(userId, token) => {
-      .confirmEmail(params.userId, params.token)
+    const result = await dispatch(confirmEmail({ userId, token })).unwrap();
-      .then(confirmMessage => {
+    if (result) {
-        if (confirmMessage) {
+      setConfirmMessage(result);
-          // report to the user is there was a problem during login
+      setLoading(false);
-          this.setState({
-            confirmMessage: confirmMessage, loading: false
-          });
     }
-      });
   }
 
-  render() {
+  useEffect(() => {
-    var dimmerProps = {  };
+    checkConfirmation(userId, token);
-    if (this.state.loading) {
+  }, []);
-      dimmerProps["active"] = true;
+
-    }
+  const dimmerProps = { active: loading };
+
   return (
-
     <Container text>
       <Dimmer {...dimmerProps}>
         <Loader indeterminate>Confirming Email Address</Loader>
       </Dimmer>
 
-          
+      {confirmMessage.success ? (
-        {this.state.confirmMessage.success ? (
         <Message icon>
-          
           <Icon name='check' />
           <Message.Content>
             <Message.Header>Success</Message.Header>
             <p>You have successfully confirmed you email address.</p>
-             <Link to="/">
+            <Link to="/login">
               <Button
                 size="large"
                 content="Continue to Login"
                 fluid
               /></Link>
-
           </Message.Content>
         </Message>
       ) : (
@@ -64,15 +57,15 @@ class ConfirmEmail extends Component {
           <Icon name='exclamation' />
           <Message.Content>
             <Message.Header>Error</Message.Header>
-            <p>{this.state.confirmMessage.message}</p>
+            <p>{confirmMessage.message}</p>
           </Message.Content>
-          
         </Message>
       )}
 
     </Container>
   );
 }
-}
 
 export default ConfirmEmail;
+
+

account/src/User/Profile.js

@@ -20,7 +20,7 @@ const Profile = (props) => {
       if (result.success) {
       console.log(result)
     } else {
-      setMessage = result.message;
+      setMessage(result.message);
     }
   }
 

account/src/User/ResetPassword.js

@@ -43,7 +43,6 @@ const ResetPassword = (props) => {
       setConfirmPasswordError(false);
     }
 
-    const { match: { params } } = props;
     setCheckInputMessages(inputMessages);
     if (!error) {
       const result = await dispatch(resetPassword({ userId, token, password })).unwrap();

account/src/User/UserForm.js

@@ -28,6 +28,7 @@ const UserForm = (props) => {
   const [passwordError, setPasswordError] = useState(false);
   const [confirmPasswordError, setConfirmPasswordError] = useState(false);
   const [isEditing, setIsEditing] = useState(props.isEditing);
+  const [changed, setChanged] = useState(false);
   const requestMessage = props.requestMessage;
   
   useEffect(() => {
@@ -37,6 +38,7 @@ const UserForm = (props) => {
       setScreenName(props.user.screenName);
       setEmail(props.user.email);
       setLocation(props.user.location);
+      setChanged(false);
     }
   }, [props.isEditing, props.user]);
 
@@ -120,6 +122,7 @@ const UserForm = (props) => {
 
     if (!inputError) {
       const user ={ firstName, lastName, screenName, location, email, password };
+      setChanged(false);
       props.onSubmit(user);
     }
   }
@@ -153,6 +156,7 @@ const UserForm = (props) => {
       </Message>
     );
   }
+  const buttonDisabled = changed?{}:{disabled:true}
   return (
     <div>
       <Form
@@ -168,7 +172,7 @@ const UserForm = (props) => {
             <Form.Input
               type="text"
               name="firstName"
-              onChange={e => setFirstName(e.target.value)}
+              onChange={e => {setFirstName(e.target.value); setChanged(true)}}
               error={firstNameError}
               value={firstName}
               label="First name"
@@ -179,7 +183,7 @@ const UserForm = (props) => {
             <Form.Input
               type="text"
               name="lastName"
-              onChange={e => setLastName(e.target.value)}
+              onChange={e => {setLastName(e.target.value); setChanged(true)}}
               error={lastNameError}
               value={lastName}
               label="Last name"
@@ -192,7 +196,7 @@ const UserForm = (props) => {
             <Form.Input
               type="text"
               name="email"
-              onChange={e => setEmail(e.target.value)}
+              onChange={e => {setEmail(e.target.value); setChanged(true)}}
               error={emailError}
               value={email}
               disabled={isEditing}
@@ -205,7 +209,7 @@ const UserForm = (props) => {
             <Form.Input
               type="text"
               name="screenName"
-              onChange={e => setScreenName(e.target.value)}
+              onChange={e => {setScreenName(e.target.value); setChanged(true)}}
               error={screenNameError}
               value={screenName}
               label="Screen Name"
@@ -221,7 +225,7 @@ const UserForm = (props) => {
             <Form.Input
               type="text"
               name="location"
-              onChange={e => setLocation(e.target.value)}
+              onChange={e => {setLocation(e.target.value); setChanged(true)}}
               error={locationError}
               value={location}
               label="General Location"
@@ -235,7 +239,8 @@ const UserForm = (props) => {
               <Form.Input
                 name="password"
                 type="password"
-                onChange={e => setPassword(e.target.value)}
+                onChange={e => {setPassword(e.target.value); setChanged(true)}}
+                value={password}
                 error={passwordError}
                 disabled={isEditing}
                 label="Password"
@@ -246,7 +251,8 @@ const UserForm = (props) => {
               <Form.Input
                 name="confirmPassword"
                 type="password"
-                onChange={e => setConfirmPassword(e.target.value)}
+                onChange={e => {setConfirmPassword(e.target.value); setChanged(true)}}
+                value={confirmPassword}
                 error={confirmPasswordError}
                 disabled={isEditing}
                 label="Confirm Password"
@@ -256,7 +262,7 @@ const UserForm = (props) => {
           </Form.Group>
         )}
         <div style={floatStyle}>
-          <Button type="submit" size="large" floated="right" value="Login" color='blue'>
+          <Button type="submit" size="large" floated="right" value="Login" color='blue' disabled={!changed}>
             {isEditing !== true ? 'Register' : 'Update'}
           </Button>
         </div>

account/src/features/user/userSlice.js

@@ -90,6 +90,22 @@ export const logoutUser = createAsyncThunk(
     }
 )
 
+
+export const confirmEmail = createAsyncThunk(
+    'user/confirmEmail',
+    async ({userId, token}) => {
+        const url = process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/confirm/" + token;
+        const res = await fetch(url, {
+            method: 'POST'
+        }).then(
+            (data) => data.json()
+        )
+        return res;
+    }
+)
+
+
+
 export const sendConfirmEmail = createAsyncThunk(
     'user/sendConfirmEmail',
     async (userId) => {
@@ -111,7 +127,7 @@ export const resetPassword = createAsyncThunk(
     'user/resetPassword',
     async (data) => {
         const {userId, token, password} = data;
-        const url = process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/confirm/" + token
+        const url = process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/reset-password/" + token
         const res = await fetch(url, {
             method: 'POST',
             credentials: "include",
@@ -192,18 +208,10 @@ export const userSlice = createSlice({
         [updateProfile.fulfilled]: (state, data) => {
             const {payload} = data;
             if (payload.success) {
-                state.authenticated = true;
-                state.hasAuthenticated = true;
-                state.userId = payload.user.userId;
-                state.admin = payload.user.admin;
-                state.email = payload.user.email;
                 state.firstName = payload.user.firstName;
                 state.lastName = payload.user.lastName;
                 state.location = payload.user.location;
                 state.screenName = payload.user.screenName;
-            } else {
-                state.authenticated = false;
-                state.hasAuthenticated = true;
             } 
         },
         [loginUser.rejected]: (state, { payload }) => {