everything switched over, time to test

This commit is contained in:
Luke Berndt
2023-03-30 22:31:15 -04:00
parent 5875364502
commit b8e60ab926
14 changed files with 1214 additions and 1024 deletions

View File

@@ -11,8 +11,9 @@ const User = require("../../models/user");
*/ */
const local = new LocalStrategy({ const local = new LocalStrategy({
usernameField: "email" usernameField: "email"
}, (email, password, done) => { }, async (email, password, done) => {
User.findOne({ console.log(`${email} ${password}`);
const user = await User.findOne({
$or: [{ $or: [{
email email
}, { }, {
@@ -20,7 +21,7 @@ const local = new LocalStrategy({
email email
} }
}] }]
}, (err, user) => { });
if (!user) { if (!user) {
console.error("Auth Error - user not found: " + email); console.error("Auth Error - user not found: " + email);
return done(null, false, { message: `Invalid email or password` }) return done(null, false, { message: `Invalid email or password` })
@@ -34,5 +35,4 @@ const local = new LocalStrategy({
} }
}) })
}) })
})
module.exports = local; module.exports = local;

View File

@@ -62,9 +62,11 @@ exports.authenticated = function(req, res, next) {
exports.login = function (req, res, next) { exports.login = function (req, res, next) {
// Do email and password validation for the server // Do email and password validation for the server
passport.authenticate("local", function (err, user, info) { passport.authenticate("local", function (err, user, info) {
if (err) return next(err); if (err) return next(err);
if (!user) { if (!user) {
console.log("No user");
return res.json({ return res.json({
success: false, success: false,
message: info.message message: info.message
@@ -81,6 +83,7 @@ exports.login = function(req, res, next) {
req.login(user, loginErr => { req.login(user, loginErr => {
if (loginErr) { if (loginErr) {
console.log("error")
return res.json({ return res.json({
success: false, success: false,
message: loginErr message: loginErr
@@ -124,21 +127,32 @@ exports.login = function(req, res, next) {
})(req, res, next); })(req, res, next);
}; };
exports.confirmEmail = function(req, res, next) { exports.confirmEmail = async function (req, res, next) {
const userId = req.params["userId"]; const userId = req.params["userId"];
const token = req.params["token"]; const token = req.params["token"];
User.findById(userId, (err, user) => { let user = await User.findById(userId).catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(404);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
});
if (!user) {
console.error("User not found: " + userId);
res.status(404);
res.json({
success: false,
message: "User not found"
});
return;
} }
if (user.confirmEmail) { if (user.confirmEmail) {
console.log("User already confirmed email: " + userId); console.log("User already confirmed email: " + userId);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: "already confirmed email" message: "already confirmed email"
@@ -147,6 +161,8 @@ exports.confirmEmail = function(req, res, next) {
} }
const today = new Date(); const today = new Date();
if (user.confirmEmailTTL < today) { if (user.confirmEmailTTL < today) {
res.status(500);
console.error("Expired token for confirming email: " + userId);
res.json({ res.json({
success: false, success: false,
message: "token expired" message: "token expired"
@@ -154,7 +170,7 @@ exports.confirmEmail = function(req, res, next) {
return; return;
} }
if (user.confirmEmailToken != token) { if (user.confirmEmailToken != token) {
console.log( console.error(
"Token Mismatch DB: " + user.confirmEmailToken + " submitted: " + token "Token Mismatch DB: " + user.confirmEmailToken + " submitted: " + token
); );
res.json({ res.json({
@@ -165,41 +181,49 @@ exports.confirmEmail = function(req, res, next) {
} }
user.confirmEmail = true; user.confirmEmail = true;
user.confirmEmailToken = ""; user.confirmEmailToken = "";
user.save(err => { await user.save().catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
console.log("User: " + user.email + " confirmed email address"); console.log("User: " + user.email + " confirmed email address");
res.json({ res.json({
success: true success: true
}); });
return;
});
});
}; };
exports.resetPassword = function(req, res, next) { exports.resetPassword = async function (req, res, next) {
const userId = req.params["userId"]; const userId = req.params["userId"];
const token = req.params["token"]; const token = req.params["token"];
User.findById(userId, (err, user) => { let user = await User.findById(userId).catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
if (!user) {
console.error("User not found: " + userId);
res.status(404);
res.json({
success: false,
message: "User not found"
});
return;
}
const today = new Date(); const today = new Date();
if (user.resetPasswordTTL < today) { if (user.resetPasswordTTL < today) {
res.status(500);
res.json({ res.json({
success: false, success: false,
message: "token expired" message: "token expired"
@@ -210,6 +234,7 @@ exports.resetPassword = function(req, res, next) {
console.log( console.log(
"Token Mismatch DB: " + user.resetPasswordToken + " submitted: " + token "Token Mismatch DB: " + user.resetPasswordToken + " submitted: " + token
); );
res.status(500);
res.json({ res.json({
success: false, success: false,
message: "token mismatch" message: "token mismatch"
@@ -221,39 +246,37 @@ exports.resetPassword = function(req, res, next) {
user.confirmEmail = true; user.confirmEmail = true;
user.confirmEmailToken = ""; user.confirmEmailToken = "";
user.resetPasswordToken = ""; user.resetPasswordToken = "";
user.save(err => { await user.save().catch(err => {
if (err) {
console.error(err); console.error(err);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
res.json({ res.json({
success: true success: true
}); });
return; return;
});
});
}; };
// ------------------------------------------- // -------------------------------------------
exports.sendResetPassword = function(req, res, next) { exports.sendResetPassword = async function (req, res, next) {
User.findOne({ let user = await User.findOne({
email: req.body.email email: req.body.email
}, (err, user) => { }).catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
if (!user) { if (!user) {
console.error("Reset password failed. No user: " + req.body.email); console.error("Reset password failed. No user: " + req.body.email);
res.status(404);
res.json({ res.json({
success: false, success: false,
message: "No account register for " + req.body.email message: "No account register for " + req.body.email
@@ -266,15 +289,15 @@ exports.sendResetPassword = function(req, res, next) {
tomorrow.setDate(tomorrow.getDate() + 1); tomorrow.setDate(tomorrow.getDate() + 1);
user.resetPasswordToken = token; user.resetPasswordToken = token;
user.resetPasswordTTL = tomorrow; user.resetPasswordTTL = tomorrow;
user.save(err => { await user.save().catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
const request = mailjet.post("send", { const request = mailjet.post("send", {
version: "v3.1" version: "v3.1"
@@ -310,13 +333,11 @@ exports.sendResetPassword = function(req, res, next) {
success: true success: true
}); });
return; return;
});
});
}; };
function handleSendConfirmEmail(user) { function handleSendConfirmEmail(user) {
return new Promise((resolve, reject) => { return new Promise(async (resolve, reject) => {
if (user.confirmEmail) { if (user.confirmEmail) {
console.log("Error - Send Confirm Email - User already confirmed email: " + user.email); console.log("Error - Send Confirm Email - User already confirmed email: " + user.email);
reject({ reject({
@@ -332,8 +353,8 @@ function handleSendConfirmEmail(user) {
tomorrow.setDate(tomorrow.getDate() + 1); tomorrow.setDate(tomorrow.getDate() + 1);
user.confirmEmailToken = token; user.confirmEmailToken = token;
user.confirmEmailTTL = tomorrow; user.confirmEmailTTL = tomorrow;
user.save().then(function(user) { await user.save();
return mailjet.post("send", { mailjet.post("send", {
version: "v3.1" version: "v3.1"
}).request({ }).request({
Messages: [{ Messages: [{
@@ -359,28 +380,30 @@ function handleSendConfirmEmail(user) {
}).catch(err => { }).catch(err => {
console.error("Admin Email: " + admin_email + " User Email: " + user.email); console.error("Admin Email: " + admin_email + " User Email: " + user.email);
console.error("Error - Send Confirm Email - caught: " + err); console.error("Error - Send Confirm Email - caught: " + err);
res.status(500);
reject({ reject({
success: false, success: false,
message: err message: err
}); });
}); });
}); }
};
// ------------------------------------------- // -------------------------------------------
exports.sendConfirmEmail = function(req, res, next) { exports.sendConfirmEmail = async function (req, res, next) {
const userId = req.params["userId"]; const userId = req.params["userId"];
User.findById(userId, (err, user) => { let user = await User.findById(userId).catch(err => {
if (err) {
console.error("Error - Send Confirm Email: " + err); console.error("Error - Send Confirm Email: " + err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
if (!user) { if (!user) {
console.error("Error - Send Confirm Email: User not found " + userId); console.error("Error - Send Confirm Email: User not found " + userId);
res.status(404);
res.json({ res.json({
success: false, success: false,
message: "user not found" message: "user not found"
@@ -394,9 +417,9 @@ exports.sendConfirmEmail = function(req, res, next) {
res.json(error); res.json(error);
return; return;
}); });
}); }
};
// ------------------------------------------- // -------------------------------------------
@@ -409,17 +432,18 @@ exports.logout = function(req, res, next) {
}); });
}; };
exports.terms = function(req, res, next) { exports.terms = async function (req, res, next) {
const userId = req.params["userId"]; const userId = req.params["userId"];
User.findById(userId, (err, user) => { let user = await User.findById(userId).catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
if (req.user.id != userId) { if (req.user.id != userId) {
console.log( console.log(
"Logged in user's ID: " + "Logged in user's ID: " +
@@ -427,6 +451,7 @@ exports.terms = function(req, res, next) {
" does not match Param: " + " does not match Param: " +
userId userId
); );
res.status(500);
res.json({ res.json({
success: false, success: false,
message: "UserID incorrect" message: "UserID incorrect"
@@ -435,22 +460,21 @@ exports.terms = function(req, res, next) {
} }
user.terms = 1.1; //User.termsVer; user.terms = 1.1; //User.termsVer;
user.save(err => { await user.save().catch(err => {
if (err) {
console.error(err); console.error(err);
res.status(500);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
res.json({ res.json({
success: true success: true
}); });
return; return;
}); }
});
};
// ------------------------------------------- // -------------------------------------------
@@ -492,11 +516,19 @@ exports.validateProfile = function(req, res, next) {
next(); next();
} }
exports.updateProfile = function(req, res, next) { exports.updateProfile = async function (req, res, next) {
const userId = req.params["userId"]; const userId = req.params["userId"];
User.findById(userId, (err, user) => { user = await User.findById(userId).catch(err => {
// is email address already in use? console.error(err);
res.status(500);
res.json({
success: false,
message: err
});
return;
});
if (req.user.id != userId) { if (req.user.id != userId) {
console.log( console.log(
"ERROR: Logged in user's ID: " + "ERROR: Logged in user's ID: " +
@@ -517,15 +549,14 @@ exports.updateProfile = function(req, res, next) {
user.location = res.locals.location user.location = res.locals.location
user.save(err => { await user.save().catch(err => {
if (err) {
console.error(err); console.error(err);
res.json({ res.json({
success: false, success: false,
message: err message: err
}); });
return; return;
} });
var clientUser = (({ var clientUser = (({
firstName, firstName,
lastName, lastName,
@@ -545,15 +576,13 @@ exports.updateProfile = function(req, res, next) {
user: clientUser user: clientUser
}); });
return; return;
});
});
}; };
// ------------------------------------------- // -------------------------------------------
exports.register = function(req, res, next) { exports.register = async function (req, res, next) {
console.log("Registration request for: " + req.body.email); console.log("Registration request for: " + req.body.email);
User.findOne({ let user = await User.findOne({
$or: [{ $or: [{
email: req.body.email email: req.body.email
}, { }, {
@@ -561,9 +590,18 @@ exports.register = function(req, res, next) {
email: req.body.email email: req.body.email
} }
}] }]
}, (err, user) => { }).catch(err => {
console.error(err);
res.status(500);
res.json({
success: false,
message: err
});
return;
});
// is email address already in use? // is email address already in use?
if (user) { if (user) {
res.status(500);
res.json({ res.json({
success: false, success: false,
message: "Email already in use" message: "Email already in use"
@@ -571,7 +609,7 @@ exports.register = function(req, res, next) {
return; return;
} }
// go ahead and create the new user // go ahead and create the new user
var user = (({ user = (({
firstName, firstName,
lastName, lastName,
screenName, screenName,
@@ -590,11 +628,11 @@ exports.register = function(req, res, next) {
user.password = req.body.password; user.password = req.body.password;
user.email = req.body.email; user.email = req.body.email;
User.create(user).then(function(dbUser) { await User.create(user)
console.log("Successfully registered: " + dbUser.email + ", now sending confirmation email.");
console.log("Successfully registered: " + user.email + ", now sending confirmation email.");
// Since regiestration worked, send a confirmation email. // Since regiestration worked, send a confirmation email.
return handleSendConfirmEmail(dbUser); handleSendConfirmEmail(user).then(function (result) {
}).then(function(result) {
res.json(result); res.json(result);
return; return;
}).catch(function (err) { }).catch(function (err) {
@@ -605,5 +643,4 @@ exports.register = function(req, res, next) {
}); });
return; return;
}); });
}); }
};

View File

@@ -15,7 +15,7 @@ const app = express()
// ------------------------------------------- // -------------------------------------------
async function connect() { const connect = async () => {
// Demonstrate the readyState and on event emitters // Demonstrate the readyState and on event emitters
console.log(mongoose.connection.readyState); //logs 0 console.log(mongoose.connection.readyState); //logs 0
@@ -34,16 +34,16 @@ async function connect() {
// Connect to a MongoDB server running on 'localhost:27017' and use the // Connect to a MongoDB server running on 'localhost:27017' and use the
// 'test' database. // 'test' database.
await mongoose.connect(secrets.db, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true }, (err, res) => { await mongoose.connect(secrets.db, { useNewUrlParser: true, useUnifiedTopology: true }).catch(err => {
if (err) {
console.log(`Mongoose - Error connecting to ${secrets.db}. ${err}`) console.error(`Mongoose - Error connecting to ${secrets.db}. ${err}`)
} else {
console.log(`Mongoose Successfully connected to ${secrets.db}.`) });
}
})
console.log("All Done"); console.log("All Done");
} }
connect(); connect();
mongoose.connection.on('error', err => { mongoose.connection.on('error', err => {
console.error("Mongoose Error!") console.error("Mongoose Error!")
console.error(err); console.error(err);

View File

@@ -2,7 +2,7 @@
import React, { useEffect, useState, } from "react"; import React, { useEffect, useState, } from "react";
import { useNavigate, useSearchParams, Link } from 'react-router-dom'; import { useNavigate, useSearchParams, Link } from 'react-router-dom';
import { loginUser } from "../features/user/userSlice"; import { loginUser } from "../features/user/userSlice";
import { useSelector, useDispatch } from 'react-redux'
import { import {
Container, Container,
Header, Header,
@@ -35,66 +35,52 @@ const Login = (props) => {
const navigate = useNavigate(); const navigate = useNavigate();
let [searchParams, setSearchParams] = useSearchParams(); let [searchParams, setSearchParams] = useSearchParams();
const nextLocation = searchParams.get("nextLocation"); const nextLocation = searchParams.get("nextLocation");
const dispatch = useDispatch();
const loginSubmit = async (event) => {
const handleInputChange = (e, { name, value }) => this.setState({ [name]: value });
const loginSubmit = (event) => {
event.preventDefault(); event.preventDefault();
/* const result = await dispatch(loginUser({email,password})).unwrap();
var success = { type: "path", nextPathname: "/" }; if (result.success) {
if (nextLocation) { if (nextLocation) {
success.type = "location";
switch (this.props.nextLocation) { switch (this.props.nextLocation) {
case "frontend": case "frontend":
success.nextLocation = process.env.REACT_APP_FRONTEND_SERVER; window.location = process.env.REACT_APP_FRONTEND_SERVER;
break; break;
default: default:
case "admin": case "admin":
success.nextLocation = process.env.REACT_APP_ADMIN_SERVER; window.location = process.env.REACT_APP_ADMIN_SERVER;
break; break;
} }
} else {
navigate("/");
}
console.log(result)
} else {
console.error(result);
setLoginMessage(result.message);
if (result.message === "unconfirmed email") {
/*data.userId = response.data.userId;
dispatch(loginEmailError(data));*/
navigate("/wait-confirm-email");
}
}
} }
// Passed in via react-redux. Returns a promise. let loginMessageDisplay =(<></>)
this.props
.manualLogin(
{
// this function is passed in via react-redux
email,
password
},
success
) // holds the path to redirect to after login (if any)
.then(loginMessage => {
if (loginMessage) { if (loginMessage) {
// report to the user is there was a problem during login loginMessageDisplay = (
this.setState({
loginMessage
});
}
});*/
}
/*
if (this.state.loginMessage) {
loginMessage = (
<Message icon> <Message icon>
<Icon name="lemon" /> <Icon name="lemon" />
<Message.Content> <Message.Content>
<Message.Header>Problems...</Message.Header> <Message.Header>Problems...</Message.Header>
{this.state.loginMessage} {loginMessage}
</Message.Content> </Message.Content>
</Message> </Message>
); );
} }
*/
return ( return (
<Container> <Container>
<Header as="h1">{process.env.REACT_APP_SITE_NAME}</Header> <Header as="h1">{process.env.REACT_APP_SITE_NAME}</Header>
@@ -176,7 +162,7 @@ const Login = (props) => {
<Button type="submit" size="large" value="Login" fluid> <Button type="submit" size="large" value="Login" fluid>
Login Login
</Button> </Button>
{loginMessage} {loginMessageDisplay}
</Segment> </Segment>
</Form> </Form>
<div style={forgotStyle} > <div style={forgotStyle} >

View File

@@ -1,45 +1,37 @@
import React, { Component } from "react" import React, { useEffect, useState, } from "react";
import { useSelector, useDispatch } from 'react-redux'
import { useNavigate, useSearchParams, Link } from 'react-router-dom';
import UserForm from "./UserForm"; import UserForm from "./UserForm";
import { import {
Container, Container,
Header Header
} from "semantic-ui-react"; } from "semantic-ui-react";
import { updateProfile } from "../features/user/userSlice";
class Profile extends Component { const Profile = (props) => {
constructor(props) { const [message, setMessage] = useState("");
super(props); const user = useSelector((state) => state.user);
this.handleProfileSubmit = this.handleProfileSubmit.bind(this); const dispatch = useDispatch();
const handleProfileSubmit = async (updatedUser) => {
updatedUser.userId = user.userId
const result = await dispatch(updateProfile(updatedUser)).unwrap();
if (result.success) {
console.log(result)
} else {
setMessage = result.message;
} }
state = {
requestMessage: ""
} }
handleProfileSubmit(user) {
user.userId = this.props.user.userId
this.props
.updateProfile(user)
.then(requestMessage => {
if (requestMessage) {
// report to the user is there was a problem during registration
this.setState({
requestMessage
});
}
});
}
render() {
// The Key on UserForm get updated when the user is loaded. This forces the Component to be completely redrawn, otherwise the changes in the Prop are not copied to State. // The Key on UserForm get updated when the user is loaded. This forces the Component to be completely redrawn, otherwise the changes in the Prop are not copied to State.
return( return(
<Container text> <Container text>
<Header as="h1">Update Profile</Header> <Header as="h1">Update Profile</Header>
<UserForm onSubmit={this.handleProfileSubmit} user={this.props.user} isEditing={true} requestMessage={this.state.requestMessage} isWaiting={this.props.isWaiting} key={this.props.user.userId}/> <UserForm onSubmit={handleProfileSubmit} user={user} isEditing={true} requestMessage={message} isWaiting={props.isWaiting} key={user.userId}/>
</Container> </Container>
) )
} }
}
export default Profile export default Profile

View File

@@ -1,4 +1,7 @@
import React, { Component } from "react"; import React, { useState } from "react";
import { registerUser } from "../features/user/userSlice";
import { useNavigate, useSearchParams, Link } from 'react-router-dom';
import { useSelector, useDispatch } from 'react-redux'
import { import {
Container, Container,
Header, Header,
@@ -8,33 +11,20 @@ import {
import UserForm from "./UserForm"; import UserForm from "./UserForm";
// ---------------------------------------------------- function Register(props) {
class Register extends Component { const [requestMessage, setRequestMessage] = useState("");
constructor(props) { const dispatch = useDispatch();
super(props); const navigate = useNavigate();
this._onRegisterSubmit = this._onRegisterSubmit.bind(this); const onRegisterSubmit = async(user) => {
const result = await dispatch(registerUser(user)).unwrap();
if (result.success) {
navigate("/sent-confirm-email");
} else {
console.error(result);
setRequestMessage(result.message);
} }
};
state = {
requestMessage: ""
}
_onRegisterSubmit(user) {
this.props
.manualRegister(user)
.then(requestMessage => {
if (requestMessage) {
// report to the user is there was a problem during registration
this.setState({
requestMessage
});
}
});
}
render() {
return ( return (
<div> <div>
<Container text> <Container text>
@@ -50,11 +40,10 @@ class Register extends Component {
</Container> </Container>
<Container text> <Container text>
<Header style={{ paddingTop: '20px' }} as="h1">Register</Header> <Header style={{ paddingTop: '20px' }} as="h1">Register</Header>
<UserForm onSubmit={this._onRegisterSubmit} requestMessage={this.state.requestMessage} isWaiting={this.props.isWaiting}/> <UserForm onSubmit={onRegisterSubmit} requestMessage={requestMessage} isWaiting={props.isWaiting}/>
</Container> </Container>
</div> </div>
); );
} }
}
export default Register; export default Register;

View File

@@ -1,4 +1,7 @@
import React, { Component } from "react"; import React, { useState } from "react";
import { resetPassword } from "../features/user/userSlice";
import { useParams, useNavigate } from 'react-router-dom';
import { useDispatch } from 'react-redux'
import { import {
Container, Container,
Form, Form,
@@ -6,74 +9,65 @@ import {
Button, Button,
} from "semantic-ui-react"; } from "semantic-ui-react";
class ResetPassword extends Component { const ResetPassword = (props) => {
constructor(props) { const dispatch = useDispatch();
super(props); const navigate = useNavigate();
this.handleResetPassword = this.handleResetPassword.bind(this); const [password, setPassword] = useState("");
this.handleInputChange = this.handleInputChange.bind(this); const [confirmPassword, setConfirmPassword] = useState("");
const [passwordError, setPasswordError] = useState(false);
const [confirmPasswordError, setConfirmPasswordError] = useState(false);
const [checkInputMessages, setCheckInputMessages] = useState([]);
const { userId, token } = useParams();
const handleResetPassword = async () => {
let error = false;
var inputMessages = [];
if (password === "") {
setPasswordError(true);
inputMessages.push("Password is required");
error = true;
} else if (password.length < 7) {
setPasswordError(true);
inputMessages.push("Password must be 7 characters or more");
error = true;
} else {
setPasswordError(false);
}
if (password !== confirmPassword) {
setConfirmPasswordError(true);
inputMessages.push("The passwords did not match");
error = true;
} else {
setConfirmPasswordError(false);
}
const { match: { params } } = props;
setCheckInputMessages(inputMessages);
if (!error) {
const result = await dispatch(resetPassword({ userId, token, password })).unwrap();
if (result.success) {
navigate("/login");
} else {
console.error(result);
}
} }
state = {
checkInputMessages: [],
password: "",
confirmPassword: "",
passwordError: false,
confirmPasswordError: false,
sentReset: false
}; };
handleInputChange = (e, { name, value }) => this.setState({ [name]: value });
handleResetPassword(event) {
let error = false;
var checkInputMessages = [];
if (this.state.password === "") {
this.setState({ passwordError: true });
checkInputMessages.push("Password is required");
error = true;
} if (this.state.password.length < 7) {
this.setState({ passwordError: true });
checkInputMessages.push("Password must be 7 charecters or more");
error = true;
}else {
this.setState({ passwordError: false });
}
if (this.state.password !== this.state.confirmPassword) {
this.setState({ confirmPasswordError: true });
checkInputMessages.push("The passwords did not match");
error = true;
} else {
this.setState({ confirmPasswordError: false });
}
const { match: { params } } = this.props;
this.setState({ checkInputMessages: checkInputMessages });
if (!error) {
this.props.resetPassword(params.userId, params.token, this.state.password).then(resetSent => {
this.setState({resetSent: true});
});
}
}
render() {
return ( return (
<div> <div>
<Container text> <Container text>
<Segment> <Segment>
<Form <Form className="raised padding segment">
className="raised padding segment"
onSubmit={this.handleSubmit}
>
<Form.Group widths="equal"> <Form.Group widths="equal">
<Form.Field> <Form.Field>
<Form.Input <Form.Input
name="password" name="password"
type="password" type="password"
onChange={this.handleInputChange} onChange={e => setPassword(e.target.value)}
error={this.state.passwordError} error={passwordError}
label="Password" label="Password"
placeholder="Password..." placeholder="Password..."
/> />
@@ -82,8 +76,8 @@ class ResetPassword extends Component {
<Form.Input <Form.Input
name="confirmPassword" name="confirmPassword"
type="password" type="password"
onChange={this.handleInputChange} onChange={e => setConfirmPassword(e.target.value)}
error={this.state.confirmPasswordError} error={confirmPasswordError}
label="Confirm Password" label="Confirm Password"
placeholder="Confirm Password..." placeholder="Confirm Password..."
/> />
@@ -92,15 +86,24 @@ class ResetPassword extends Component {
<Button <Button
size="large" size="large"
content="Reset Password" content="Reset Password"
onClick={this.handleResetPassword} onClick={handleResetPassword}
fluid fluid
/> />
{checkInputMessages.length > 0 && (
<div style={{ marginTop: "10px" }}>
{checkInputMessages.map((msg) => (
<p key={msg} style={{ color: "red" }}>
{msg}
</p>
))}
</div>
)}
</Form> </Form>
</Segment> </Segment>
</Container> </Container>
</div> </div>
); );
} };
}
export default ResetPassword; export default ResetPassword;

View File

@@ -1,4 +1,4 @@
import React, { Component } from "react"; import React, { useState } from "react";
import { import {
Form, Form,
Grid, Grid,
@@ -7,81 +7,70 @@ import {
Message, Message,
Icon Icon
} from "semantic-ui-react"; } from "semantic-ui-react";
import { sendResetPassword } from "../features/user/userSlice";
import { Link } from "react-router-dom"; import { Link } from "react-router-dom";
import { useParams, useNavigate } from 'react-router-dom';
import { useDispatch } from 'react-redux'
const SendResetPassword = (props) => {
const dispatch = useDispatch();
const navigate = useNavigate();
const [checkInputMessages, setCheckInputMessages] = useState("");
const [email, setEmail] = useState("");
const [emailError, setEmailError] = useState(false);
const [resetSent, setResetSent] = useState(false);
const returnStyle = { const returnStyle = {
marginTop: "30px" marginTop: "30px"
}; };
class SendResetPassword extends Component { const handleSendResetPassword = async () => {
if (email === "") {
constructor(props) { setEmailError(true);
super(props); setCheckInputMessages("Email is required");
this.handleSendResetPassword = this.handleSendResetPassword.bind(this); } else {
this.handleInputChange = this.handleInputChange.bind(this); const result = await dispatch(sendResetPassword({ email })).unwrap();
if (result.success) {
setResetSent(true);
setEmailError(true);
} else {
setCheckInputMessages(result.message);
console.error(result);
}
} }
state = {
checkInputMessages: "",
email: "",
emailError: false,
sentReset: false
}; };
handleInputChange = (e, { name, value }) => this.setState({ [name]: value });
handleSendResetPassword(event) {
if (this.state.email === "") {
this.setState({ emailError: true, checkInputMessages: "Email is required"});
} else {
this.setState({ emailError: false });
this.props.sendResetPassword({email: this.state.email}).then(resetMessage => {
if (resetMessage) {
// report to the user is there was a problem during login
this.setState({resetSent: false, checkInputMessages: resetMessage, emailError: true});
} else {
this.setState({resetSent: true});
}
});
}
}
render() {
var resetMessage = ""; var resetMessage = "";
if (this.state.checkInputMessages.length) { if (checkInputMessages.length) {
resetMessage = ( resetMessage = (
<Message compact warning icon> <Message compact warning icon>
<Icon name="lightning" /> <Icon name="lightning" />
<Message.Content> <Message.Content>
<Message.Header>Problems...</Message.Header> <Message.Header>Problems...</Message.Header>
{checkInputMessages}
{this.state.checkInputMessages}
</Message.Content> </Message.Content>
</Message> </Message>
); );
} }
return ( return (
<Grid verticalAlign="middle" centered>
<Grid verticalAlign='middle' centered>
<Grid.Row> <Grid.Row>
<Grid.Column width={6}>
<Grid.Column width="6"> {!resetSent ? (
{ !this.state.resetSent ? (
<div> <div>
<h2>Forgot your password?</h2> <h2>Forgot your password?</h2>
<Form className="raised padding segment" onSubmit={this.handleSubmit}> <Form className="raised padding segment">
Enter the email address for your account. Enter the email address for your account.
<Form.Field> <Form.Field>
<Form.Input <Form.Input
type="text" type="text"
name="email" name="email"
onChange={this.handleInputChange} onChange={e => setEmail(e.target.value)}
error={this.state.emailError} value={email}
error={emailError}
label="Email" label="Email"
placeholder="Email..." placeholder="Email..."
/> />
@@ -89,17 +78,22 @@ class SendResetPassword extends Component {
<Button <Button
size="large" size="large"
content="Reset Password" content="Reset Password"
onClick={this.handleSendResetPassword} onClick={handleSendResetPassword}
fluid fluid
/> />
</Form> </Form>
{resetMessage} {resetMessage}
</div> </div>
) ) : (
:( <Segment raised padded='very'> <Segment raised padded="very">
<h2>Reset Link Sent </h2> <h2>Reset Link Sent </h2>
<div>An email with a link to reset your password was sent to: {this.state.email}</div> <div>
<Link to="/" style={returnStyle}><Icon name="left arrow"/>Back to OpenMHz</Link> An email with a link to reset your password was sent to: {email}
</div>
<Link to="/" style={returnStyle}>
<Icon name="left arrow" />
Back to OpenMHz
</Link>
</Segment> </Segment>
)} )}
</Grid.Column> </Grid.Column>
@@ -107,6 +101,5 @@ class SendResetPassword extends Component {
</Grid> </Grid>
); );
} }
}
export default SendResetPassword; export default SendResetPassword;

View File

@@ -1,13 +1,9 @@
import React, { Component } from "react" import React from "react";
import { import { Container, Message, Icon } from "semantic-ui-react";
Container, import { useSelector } from 'react-redux'
Message,
Icon
} from "semantic-ui-react";
class SentConfirmEmail extends Component { const SentConfirmEmail = ({ user }) => {
const { email } = useSelector((state) => state.user);
render() {
return ( return (
<div> <div>
<Container text> <Container text>
@@ -15,14 +11,15 @@ class SentConfirmEmail extends Component {
<Icon name='envelope outline' /> <Icon name='envelope outline' />
<Message.Content> <Message.Content>
<Message.Header>Confirmation email sent!</Message.Header> <Message.Header>Confirmation email sent!</Message.Header>
<p>We sent an email to the address you gave us: {this.props.user.email}<br /> <p>
Please click on the link in the email to verify the email address.</p> We sent an email to the address you gave us: {email}<br />
Please click on the link in the email to verify the email address.
</p>
</Message.Content> </Message.Content>
</Message> </Message>
</Container> </Container>
</div> </div>
) );
} };
}
export default SentConfirmEmail export default SentConfirmEmail;

View File

@@ -1,4 +1,5 @@
import React, { Component } from "react";
import React, { useEffect, useState, } from "react";
import { import {
Form, Form,
Dimmer, Dimmer,
@@ -10,140 +11,130 @@ import {
// ---------------------------------------------------- // ----------------------------------------------------
class UserForm extends Component { const UserForm = (props) => {
constructor(props) { const [checkInputMessages, setCheckInputMessages] = useState([]);
super(props); const [firstName, setFirstName] = useState("");
this.handleInputChange = this.handleInputChange.bind(this); const [lastName, setLastName] = useState("");
this.handleSubmit = this.handleSubmit.bind(this); const [screenName, setScreenName] = useState("");
this.checkInputs = this.checkInputs.bind(this); const [email, setEmail] = useState("");
this.render = this.render.bind(this) const [location, setLocation] = useState("");
const [password, setPassword] = useState("");
const [confirmPassword, setConfirmPassword] = useState("");
const [firstNameError, setFirstNameError] = useState(false);
const [lastNameError, setLastNameError] = useState(false);
const [screenNameError, setScreenNameError] = useState(false);
const [emailError, setEmailError] = useState(false);
const [locationError, setLocationError] = useState(false);
const [passwordError, setPasswordError] = useState(false);
const [confirmPasswordError, setConfirmPasswordError] = useState(false);
const [isEditing, setIsEditing] = useState(props.isEditing);
const requestMessage = props.requestMessage;
this.state = { useEffect(() => {
checkInputMessages: [], if (props.isEditing) {
registerMessages: "", setFirstName(props.user.firstName);
firstName: "", setLastName(props.user.lastName);
lastName: "", setScreenName(props.user.screenName);
screenName: "", setEmail(props.user.email);
email: "", setLocation(props.user.location);
location: "",
password: "",
confirmPassword: "",
firstNameError: false,
lastNameError: false,
screenNameError: false,
emailError: false,
locationError: false,
passwordError: false,
confirmPasswordError: false,
isEditing: this.props.isEditing
};
if (this.props.isEditing) {
this.state.firstName = this.props.user.firstName;
this.state.lastName = this.props.user.lastName;
this.state.screenName = this.props.user.screenName;
this.state.email = this.props.user.email;
this.state.location = this.props.user.location;
}
} }
}, [props.isEditing, props.user]);
const checkInputs = () => {
checkInputs() {
let error = false; let error = false;
var checkInputMessages = []; let inputMessages = [];
if (this.state.firstName === "") { if (firstName === "") {
this.setState({ firstNameError: true }); setFirstNameError(true);
checkInputMessages.push("First Name is required"); inputMessages.push("First Name is required");
error = true; error = true;
} else { } else {
this.setState({ firstNameError: false }); setFirstNameError(false);
} }
if (this.state.lastName === "") { if (lastName === "") {
this.setState({ lastNameError: true }); setLastNameError(true);
checkInputMessages.push("Last Name is required"); inputMessages.push("Last Name is required");
error = true; error = true;
} else { } else {
this.setState({ lastNameError: false }); setLastNameError(false);
} }
if (this.state.email === "") { if (email === "") {
this.setState({ emailError: true }); setEmailError(true);
checkInputMessages.push("Email is required"); inputMessages.push("Email is required");
error = true; error = true;
} else { } else {
this.setState({ emailError: false }); setEmailError(false);
} }
if (this.state.location === "") { if (location === "") {
this.setState({ locationError: true }); setLocationError(true);
checkInputMessages.push("Location is required"); inputMessages.push("Location is required");
error = true; error = true;
} else { } else {
this.setState({ locationError: false }); setLocationError(false);
} }
if (this.state.screenName === "") { if (screenName === "") {
this.setState({ screenNameError: true }); setScreenNameError(true);
checkInputMessages.push("Screen Name is required"); inputMessages.push("Screen Name is required");
error = true; error = true;
} else { } else {
this.setState({ screenNameError: false }); setScreenNameError(false);
} }
if (this.props.isEditing) { if (props.isEditing) {
this.setState({ checkInputMessages: checkInputMessages }); setCheckInputMessages(checkInputMessages);
return error; return error;
} }
if (this.state.password === "") { if (password === "") {
this.setState({ passwordError: true }); setPasswordError(true);
checkInputMessages.push("Password is required"); inputMessages.push("Password is required");
error = true; error = true;
} if (this.state.password.length < 7) { } if (password.length < 7) {
this.setState({ passwordError: true }); setPasswordError(true);
checkInputMessages.push("Password must be 7 charecters or more"); inputMessages.push("Password must be 7 charecters or more");
error = true; error = true;
} else { } else {
this.setState({ passwordError: false }); setPasswordError(false);
} }
if (this.state.password !== this.state.confirmPassword) { if (password !== confirmPassword) {
this.setState({ confirmPasswordError: true }); setConfirmPasswordError(true);
checkInputMessages.push("The passwords did not match"); inputMessages.push("The passwords did not match");
error = true; error = true;
} else { } else {
this.setState({ confirmPasswordError: false }); setConfirmPasswordError(false);
} }
this.setState({ checkInputMessages: checkInputMessages }); setCheckInputMessages(inputMessages);
return error; return error;
} }
handleInputChange = (e, { name, value }) => this.setState({ [name]: value });
handleSubmit(event) { const handleSubmit = (event) => {
event.preventDefault(); event.preventDefault();
let inputError = this.checkInputs(); let inputError = checkInputs();
if (!inputError) { if (!inputError) {
const user = (({ firstName, lastName, screenName, location, email, password }) => ({ firstName, lastName, screenName, location, email, password }))(this.state); const user ={ firstName, lastName, screenName, location, email, password };
this.props.onSubmit(user); props.onSubmit(user);
} }
} }
render() {
var registerMessage = ""; var registerMessage = "";
var floatStyle = { var floatStyle = {
overflow: 'auto' overflow: 'auto'
} }
var dimmerProps = {}; var dimmerProps = {};
if (this.props.isWaiting) { if (props.isWaiting) {
dimmerProps["active"] = true; dimmerProps["active"] = true;
} }
const { isEditing } = this.props;
if (this.state.checkInputMessages.length || this.props.requestMessage.length) { if (checkInputMessages.length || requestMessage.length) {
var counter = 0; var counter = 0;
registerMessage = ( registerMessage = (
<Message compact warning icon> <Message compact warning icon>
@@ -151,11 +142,11 @@ class UserForm extends Component {
<Message.Content> <Message.Content>
<Message.Header>Problems...</Message.Header> <Message.Header>Problems...</Message.Header>
<ul> <ul>
{this.state.checkInputMessages.map(function (listValue) { {checkInputMessages.map(function (listValue) {
return <li key={`ListItem_${counter++}`}>{listValue}</li>; return <li key={`ListItem_${counter++}`}>{listValue}</li>;
})} })}
{this.props.requestMessage.length > 0 && {requestMessage.length > 0 &&
<li key="req-mess">{this.props.requestMessage}</li> <li key="req-mess">{requestMessage}</li>
} }
</ul> </ul>
</Message.Content> </Message.Content>
@@ -166,7 +157,7 @@ class UserForm extends Component {
<div> <div>
<Form <Form
className="raised padding segment" className="raised padding segment"
onSubmit={this.handleSubmit} onSubmit={handleSubmit}
> >
<Dimmer {...dimmerProps}> <Dimmer {...dimmerProps}>
<Loader indeterminate>Updating Profile</Loader> <Loader indeterminate>Updating Profile</Loader>
@@ -177,9 +168,9 @@ class UserForm extends Component {
<Form.Input <Form.Input
type="text" type="text"
name="firstName" name="firstName"
onChange={this.handleInputChange} onChange={e => setFirstName(e.target.value)}
error={this.state.firstNameError} error={firstNameError}
defaultValue={this.state.firstName} value={firstName}
label="First name" label="First name"
placeholder="First Name..." placeholder="First Name..."
/> />
@@ -188,9 +179,9 @@ class UserForm extends Component {
<Form.Input <Form.Input
type="text" type="text"
name="lastName" name="lastName"
onChange={this.handleInputChange} onChange={e => setLastName(e.target.value)}
error={this.state.lastNameError} error={lastNameError}
defaultValue={this.state.lastName} value={lastName}
label="Last name" label="Last name"
placeholder="Last Name..." placeholder="Last Name..."
/> />
@@ -201,9 +192,9 @@ class UserForm extends Component {
<Form.Input <Form.Input
type="text" type="text"
name="email" name="email"
onChange={this.handleInputChange} onChange={e => setEmail(e.target.value)}
error={this.state.emailError} error={emailError}
defaultValue={this.state.email} value={email}
disabled={isEditing} disabled={isEditing}
label="Email" label="Email"
placeholder="Email..." placeholder="Email..."
@@ -214,9 +205,9 @@ class UserForm extends Component {
<Form.Input <Form.Input
type="text" type="text"
name="screenName" name="screenName"
onChange={this.handleInputChange} onChange={e => setScreenName(e.target.value)}
error={this.state.screenNameError} error={screenNameError}
defaultValue={this.state.screenName} value={screenName}
label="Screen Name" label="Screen Name"
placeholder="Screen Name..." placeholder="Screen Name..."
/> />
@@ -230,9 +221,9 @@ class UserForm extends Component {
<Form.Input <Form.Input
type="text" type="text"
name="location" name="location"
onChange={this.handleInputChange} onChange={e => setLocation(e.target.value)}
error={this.state.locationError} error={locationError}
defaultValue={this.state.location} value={location}
label="General Location" label="General Location"
placeholder="City, State..." placeholder="City, State..."
/> />
@@ -244,8 +235,8 @@ class UserForm extends Component {
<Form.Input <Form.Input
name="password" name="password"
type="password" type="password"
onChange={this.handleInputChange} onChange={e => setPassword(e.target.value)}
error={this.state.passwordError} error={passwordError}
disabled={isEditing} disabled={isEditing}
label="Password" label="Password"
placeholder="Password..." placeholder="Password..."
@@ -255,8 +246,8 @@ class UserForm extends Component {
<Form.Input <Form.Input
name="confirmPassword" name="confirmPassword"
type="password" type="password"
onChange={this.handleInputChange} onChange={e => setConfirmPassword(e.target.value)}
error={this.state.confirmPasswordError} error={confirmPasswordError}
disabled={isEditing} disabled={isEditing}
label="Confirm Password" label="Confirm Password"
placeholder="Confirm Password..." placeholder="Confirm Password..."
@@ -274,6 +265,6 @@ class UserForm extends Component {
</div> </div>
); );
} }
}
export default UserForm; export default UserForm;

View File

@@ -1,52 +1,43 @@
import React, { Component } from "react" import React, { useState } from "react";
import { import { sendConfirmEmail } from "../features/user/userSlice";
Container, import { useNavigate } from 'react-router-dom';
Header, import { useSelector, useDispatch } from 'react-redux'
Button, import { Container, Header, Button, Message, Icon } from "semantic-ui-react";
Message,
Icon
} from "semantic-ui-react";
class WaitConfirmEmail extends Component {
constructor(props) {
super(props);
this.handleSendConfirmEmail = this.handleSendConfirmEmail.bind(this);
} const WaitConfirmEmail = () => {
handleSendConfirmEmail(event) { const dispatch = useDispatch();
this.props.sendConfirmEmail(this.props.user.userId).then(loginMessage => { const navigate = useNavigate();
if (loginMessage) { const { email, userId } = useSelector((state) => state.user);
// report to the user is there was a problem during login
this.setState({ const handleSendConfirmEmail = async (event) => {
loginMessage const message = await dispatch(sendConfirmEmail(userId)).unwrap();
}); navigate("/sent-confirm-email")
}
});
}; };
render() {
return ( return (
<Container text> <Container text>
<Message icon> <Message icon>
<Icon name='envelope outline'/> <Icon name="envelope outline" />
<Message.Content> <Message.Content>
<Message.Header>Confirm your email address</Message.Header> <Message.Header>Confirm your email address</Message.Header>
<p>We sent an email to the address you gave us: {this.props.user.email}<br/> <p>
Please click on the link in the email to verify the email address.</p> We sent an email to the address you gave us: {email}
<Header as='h3'>Didn't get an email?</Header> <br />
Please click on the link in the email to verify the email address.
</p>
<Header as="h3">Didn't get an email?</Header>
<p>So, you have waited a bit and haven't gotten anything?</p> <p>So, you have waited a bit and haven't gotten anything?</p>
<p>...and you checked your spam folder?</p> <p>...and you checked your spam folder?</p>
<p>Well, click below.</p> <p>Well, click below.</p>
<Button <Button
size="large" size="large"
content="Resend Email Confirmation" content="Resend Email Confirmation"
onClick={this.handleSendConfirmEmail} onClick={handleSendConfirmEmail}
/> />
</Message.Content> </Message.Content>
</Message> </Message>
</Container> </Container>
) );
} };
}
export default WaitConfirmEmail export default WaitConfirmEmail;

View File

@@ -22,11 +22,33 @@ export const authenticateUser = createAsyncThunk(
export const loginUser = createAsyncThunk( export const loginUser = createAsyncThunk(
'user/login', 'user/login',
async ({ getState }) => { async (data) => {
const url = process.env.REACT_APP_ACCOUNT_SERVER + "/login" const url = process.env.REACT_APP_ACCOUNT_SERVER + "/login"
const res = await fetch(url, { const res = await fetch(url, {
method: 'POST', method: 'POST',
credentials: "include" credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(data)
}).then(
(data) => data.json()
)
return res;
}
)
export const registerUser = createAsyncThunk(
'user/register',
async (data) => {
const url = process.env.REACT_APP_ACCOUNT_SERVER + "/register"
const res = await fetch(url, {
method: 'POST',
credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(data)
}).then( }).then(
(data) => data.json() (data) => data.json()
) )
@@ -36,6 +58,24 @@ export const loginUser = createAsyncThunk(
export const updateProfile = createAsyncThunk(
'user/updateProfile',
async (user) => {
const url = process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + user.userId;
const res = await fetch(url, {
method: 'POST',
credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(user)
}).then(
(data) => data.json()
)
return res;
}
)
export const logoutUser = createAsyncThunk( export const logoutUser = createAsyncThunk(
'user/logout', 'user/logout',
async ({ getState }) => { async ({ getState }) => {
@@ -50,6 +90,63 @@ export const logoutUser = createAsyncThunk(
} }
) )
export const sendConfirmEmail = createAsyncThunk(
'user/sendConfirmEmail',
async (userId) => {
const url = process.env.REACT_APP_ACCOUNT_SERVER + "/users/" + userId + "/send-confirm";
const res = await fetch(url, {
method: 'POST',
credentials: "include",
headers: {
"Content-Type": "application/json",
}
}).then(
(data) => data.json()
)
return res;
}
)
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 res = await fetch(url, {
method: 'POST',
credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({password})
}).then(
(data) => data.json()
)
return res;
}
)
export const sendResetPassword = createAsyncThunk(
'user/sendResetPassword',
async (data) => {
const {userId, token, password} = data;
const url = process.env.REACT_APP_ACCOUNT_SERVER + "/api/send-reset-password"
const res = await fetch(url, {
method: 'POST',
credentials: "include",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify(data)
}).then(
(data) => data.json()
)
return res;
}
)
export const userSlice = createSlice({ export const userSlice = createSlice({
name: 'user', name: 'user',
initialState: { initialState: {
@@ -59,7 +156,12 @@ export const userSlice = createSlice({
userId: "", userId: "",
admin: false, admin: false,
email: "", email: "",
firstName: "",
lastName: "",
location: "",
screenName: ""
}, },
reducers: { reducers: {
increment: (state) => { increment: (state) => {
// Redux Toolkit allows us to write "mutating" logic in reducers. It // Redux Toolkit allows us to write "mutating" logic in reducers. It
@@ -70,6 +172,44 @@ export const userSlice = createSlice({
}, },
}, },
extraReducers: { extraReducers: {
[loginUser.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;
}
},
[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 }) => {
state.authenticated = false;
state.hasAuthenticated = true;
},
[authenticateUser.fulfilled]: (state, data) => { [authenticateUser.fulfilled]: (state, data) => {
const {payload} = data; const {payload} = data;
if (payload.success) { if (payload.success) {
@@ -78,6 +218,10 @@ export const userSlice = createSlice({
state.userId = payload.user.userId; state.userId = payload.user.userId;
state.admin = payload.user.admin; state.admin = payload.user.admin;
state.email = payload.user.email; 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 { } else {
state.authenticated = false; state.authenticated = false;
state.hasAuthenticated = true; state.hasAuthenticated = true;

View File

@@ -8,7 +8,7 @@ const configureExpress = require("./config/express");
const systems = require("./controllers/systems"); const systems = require("./controllers/systems");
const groups = require("./controllers/groups"); const groups = require("./controllers/groups");
const talkgroups = require("./controllers/talkgroups"); const talkgroups = require("./controllers/talkgroups");
const Permission = require("./models/permission");
require("./models/user"); require("./models/user");
const multer = require('multer'); const multer = require('multer');
@@ -60,26 +60,6 @@ mongoose.connection.on('disconnected', () => {
const isDev = process.env.NODE_ENV === "development" const isDev = process.env.NODE_ENV === "development"
/*
async function getRole(req) {
let promise = new Promise((resolve, reject) => {
if (req.params.shortName && req.user) {
var short_name = req.params.shortName.toLowerCase();
var userId = req.user._id;
Permission.findOne({'userId': userId, 'shortName': short_name}, function(err, permission) {
if (err) {
console.error('Error - getRole userId: ' + userId + ' shortName: ' + short_name + ' error: ' + err);
reject(-1);
}
console.log('Found - getRole userId: ' + userId + ' shortName: ' + short_name + ' role: ' + permission.role);
resolve(permission.role);
});
} else {
reject(-1);
}});
return promise;
}*/

View File

@@ -0,0 +1,87 @@
// Defining a User Model in mongoose
// Code modified from https://github.com/sahat/hackathon-starter
const bcrypt = require("bcrypt");
const mongoose = require("mongoose");
const UserSchema = new mongoose.Schema({
local: {
name: String,
email: String,
password: String
},
email: {
type: String,
unique: true,
lowercase: true
},
password: String,
screenName: {
type: String,
unique: true,
lowercase: true
},
firstName: String,
lastName: String,
location: String,
email: String,
resetPasswordToken: String,
resetPasswordTTL: Date,
confirmEmail: {
type: Boolean,
default: false
},
confirmEmailToken: String,
confirmEmailTTL: Date,
admin: {
type: Boolean,
default: false
},
terms: {
type: Number,
default: 0
},
ver: {
type: Number,
default: 1.1
},
sysCount: Number,
lastLogin: { type : Date, default: Date.now }
})
/**
* Password hash middleware.
*/
UserSchema.pre("save", function(next) {
var user = this
if (!user.isModified("password")) return next()
bcrypt.genSalt(8, (err, salt) => {
if (err) return next(err)
bcrypt.hash(user.password, salt, null, (err, hash) => {
if (err) return next(err)
user.password = hash;
user.local.password = hash;
next()
})
})
})
/*
Defining our own custom document instance method
*/
UserSchema.methods = {
comparePassword: function(candidatePassword, cb) {
bcrypt.compare(candidatePassword, this.local.password, (err, isMatch) => {
if (err) return cb(err)
cb(null, isMatch)
})
}
}
/**
* Statics
*/
UserSchema.statics = {}
module.exports = mongoose.model("User", UserSchema)