" + account_server + "/reset-password/" + user.id + "/" + token + "
" + }] + }); + request + .then(result => { + console.log(`Password reset sent to: ${user.email}`) + }) + .catch(err => { + console.error(err.statusCode); console.error(err); res.json({ success: false, message: err }); return; - } - if (!user) { - console.error("Reset password failed. No user: " + req.body.email); - res.json({ - success: false, - message: "No account register for " + req.body.email - }); - return; - } - const buffer = crypto.randomBytes(20); - const token = buffer.toString("hex"); - var tomorrow = new Date(); - tomorrow.setDate(tomorrow.getDate() + 1); - user.resetPasswordToken = token; - user.resetPasswordTTL = tomorrow; - user.save(err => { - if (err) { - console.error(err); - res.json({ - success: false, - message: err - }); - return; - } - - const request = mailjet.post("send", { - version: "v3.1" - }).request({ - Messages: [{ - From: { - Email: admin_email, - Name: site_name + " Admin" - }, - To: [{ - Email: user.email, - Name: user.firstName + " " + user.lastName - }], - Subject: site_name + " - Password Reset", - TextPart: "It looks like you may have forgot your password. Copy this link to your browser to reset your password. Let us know if you are receiving this but did not request a password reset. /r" + account_server + "/reset-password/" + user.id + "/" + token, - HTMLPart: "" + account_server + "/reset-password/" + user.id + "/" + token + "
" - }] - }); - request - .then(result => { - console.log(`Password reset sent to: ${user.email}`) - }) - .catch(err => { - console.error(err.statusCode); - console.error(err); - res.json({ - success: false, - message: err - }); - return; - }); - res.json({ - success: true - }); - return; }); + res.json({ + success: true }); + return; }; function handleSendConfirmEmail(user) { - return new Promise((resolve, reject) => { + return new Promise(async (resolve, reject) => { if (user.confirmEmail) { console.log("Error - Send Confirm Email - User already confirmed email: " + user.email); reject({ @@ -332,130 +353,133 @@ function handleSendConfirmEmail(user) { tomorrow.setDate(tomorrow.getDate() + 1); user.confirmEmailToken = token; user.confirmEmailTTL = tomorrow; - user.save().then(function(user) { - return mailjet.post("send", { - version: "v3.1" - }).request({ - Messages: [{ - From: { - Email: admin_email, - Name: site_name + " Admin" - }, - To: [{ - Email: user.email, - Name: user.firstName + " " + user.lastName - }], - Subject: "Confirm " + site_name + " Account", - 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: "" + account_server + "/confirm-email/" + user._id + "/" + token + "
" - }] - }); - }).then(result => { - console.log("Confirm email sent to: " + user.email); - resolve({ - success: true, - userId: user._id - }); - }).catch(err => { - console.error("Admin Email: " + admin_email + " User Email: " + user.email); - console.error("Error - Send Confirm Email - caught: " + err); - reject({ - success: false, - message: err - }); + await user.save(); + mailjet.post("send", { + version: "v3.1" + }).request({ + Messages: [{ + From: { + Email: admin_email, + Name: site_name + " Admin" + }, + To: [{ + Email: user.email, + Name: user.firstName + " " + user.lastName + }], + Subject: "Confirm " + site_name + " Account", + 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: "" + account_server + "/confirm-email/" + user._id + "/" + token + "
" + }] + }); + }).then(result => { + console.log("Confirm email sent to: " + user.email); + resolve({ + success: true, + userId: user._id + }); + }).catch(err => { + console.error("Admin Email: " + admin_email + " User Email: " + user.email); + console.error("Error - Send Confirm Email - caught: " + err); + res.status(500); + reject({ + success: false, + message: err }); }); -}; +} // ------------------------------------------- -exports.sendConfirmEmail = function(req, res, next) { +exports.sendConfirmEmail = async function (req, res, next) { const userId = req.params["userId"]; - User.findById(userId, (err, user) => { - if (err) { - console.error("Error - Send Confirm Email: " + err); - res.json({ - success: false, - message: err - }); - return; - } - if (!user) { - console.error("Error - Send Confirm Email: User not found " + userId); - res.json({ - success: false, - message: "user not found" - }); - return; - } - handleSendConfirmEmail(user).then(function(result) { - res.json(result); - return; - }).catch(function(error) { - res.json(error); - return; - }); - }); + let user = await User.findById(userId).catch(err => { + + console.error("Error - Send Confirm Email: " + err); + res.status(500); + res.json({ + success: false, + message: err + }); + return; + }); + if (!user) { + console.error("Error - Send Confirm Email: User not found " + userId); + res.status(404); + res.json({ + success: false, + message: "user not found" + }); + return; + } + handleSendConfirmEmail(user).then(function (result) { + res.json(result); + return; + }).catch(function (error) { + res.json(error); + return; + }); +} + -}; // ------------------------------------------- -exports.logout = function(req, res, next) { +exports.logout = function (req, res, next) { // the logout method is added to the request object automatically by Passport req.logout(); - res.clearCookie('sessionId', {domain: cookie_domain, path:'/'}); + res.clearCookie('sessionId', { domain: cookie_domain, path: '/' }); return res.json({ success: true }); }; -exports.terms = function(req, res, next) { +exports.terms = async function (req, res, next) { const userId = req.params["userId"]; - User.findById(userId, (err, user) => { - if (err) { - console.error(err); - res.json({ - success: false, - message: err - }); - return; - } - if (req.user.id != userId) { - console.log( - "Logged in user's ID: " + - req.user.id + - " does not match Param: " + - userId - ); - res.json({ - success: false, - message: "UserID incorrect" - }); - return; - } - - user.terms = 1.1; //User.termsVer; - user.save(err => { - if (err) { - console.error(err); - res.json({ - success: false, - message: err - }); - return; - } - res.json({ - success: true - }); - return; + let user = await User.findById(userId).catch(err => { + console.error(err); + res.status(500); + res.json({ + success: false, + message: err }); + return; }); -}; + + if (req.user.id != userId) { + console.log( + "Logged in user's ID: " + + req.user.id + + " does not match Param: " + + userId + ); + res.status(500); + res.json({ + success: false, + message: "UserID incorrect" + }); + return; + } + + user.terms = 1.1; //User.termsVer; + await user.save().catch(err => { + + console.error(err); + res.status(500); + res.json({ + success: false, + message: err + }); + return; + }); + res.json({ + success: true + }); + return; +} // ------------------------------------------- -exports.validateProfile = function(req, res, next) { - console.log("Validating user profile: "+ req.body.email); +exports.validateProfile = function (req, res, next) { + console.log("Validating user profile: " + req.body.email); if (!req.body.firstName || (req.body.firstName.length < 2)) { console.error("ERROR: Validate System - req.body.firstName"); res.json({ @@ -492,68 +516,73 @@ exports.validateProfile = function(req, res, next) { next(); } -exports.updateProfile = function(req, res, next) { +exports.updateProfile = async function (req, res, next) { const userId = req.params["userId"]; - User.findById(userId, (err, user) => { - // is email address already in use? - if (req.user.id != userId) { - console.log( - "ERROR: Logged in user's ID: " + - req.user.id + - " does not match Param: " + - userId - ); - res.json({ - success: false, - message: "UserID incorrect" - }); - return; - } - // go ahead and create the new user - user.firstName = res.locals.firstName - user.lastName = res.locals.lastName - user.screenName = res.locals.screenName - user.location = res.locals.location - - - user.save(err => { - if (err) { - console.error(err); - res.json({ - success: false, - message: err - }); - return; - } - var clientUser = (({ - firstName, - lastName, - screenName, - location - }) => ({ - firstName, - lastName, - screenName, - location - }))( - user - ); - console.log("Updated Profile: " + userId) - res.json({ - success: true, - user: clientUser - }); - return; + user = await User.findById(userId).catch(err => { + console.error(err); + res.status(500); + res.json({ + success: false, + message: err }); + return; }); + + if (req.user.id != userId) { + console.log( + "ERROR: Logged in user's ID: " + + req.user.id + + " does not match Param: " + + userId + ); + res.json({ + success: false, + message: "UserID incorrect" + }); + return; + } + // go ahead and create the new user + user.firstName = res.locals.firstName + user.lastName = res.locals.lastName + user.screenName = res.locals.screenName + user.location = res.locals.location + + + await user.save().catch(err => { + console.error(err); + res.json({ + success: false, + message: err + }); + return; + }); + var clientUser = (({ + firstName, + lastName, + screenName, + location + }) => ({ + firstName, + lastName, + screenName, + location + }))( + user + ); + console.log("Updated Profile: " + userId) + res.json({ + success: true, + user: clientUser + }); + return; }; // ------------------------------------------- -exports.register = function(req, res, next) { +exports.register = async function (req, res, next) { console.log("Registration request for: " + req.body.email); - - User.findOne({ + + let user = await User.findOne({ $or: [{ email: req.body.email }, { @@ -561,49 +590,57 @@ exports.register = function(req, res, next) { email: req.body.email } }] - }, (err, user) => { - // is email address already in use? - if (user) { - res.json({ - success: false, - message: "Email already in use" - }); - return; - } - // go ahead and create the new user - var user = (({ - firstName, - lastName, - screenName, - location, - email, - password - }) => ({ - firstName, - lastName, - screenName, - location, - - }))( - res.locals - ); - user.password = req.body.password; - user.email = req.body.email; - - User.create(user).then(function(dbUser) { - console.log("Successfully registered: " + dbUser.email + ", now sending confirmation email."); - // Since regiestration worked, send a confirmation email. - return handleSendConfirmEmail(dbUser); - }).then(function(result) { - res.json(result); - return; - }).catch(function(err) { - console.error("Error creating user: " + user.email + " Error: " +err); - res.json({ - success: false, - message: err - }); - return; + }).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: "Email already in use" + }); + return; + } + // go ahead and create the new user + user = (({ + firstName, + lastName, + screenName, + location, + email, + password + }) => ({ + firstName, + lastName, + screenName, + location, + + }))( + res.locals + ); + user.password = req.body.password; + user.email = req.body.email; + + await User.create(user) + + console.log("Successfully registered: " + user.email + ", now sending confirmation email."); + // Since regiestration worked, send a confirmation email. + handleSendConfirmEmail(user).then(function (result) { + res.json(result); + return; + }).catch(function (err) { + console.error("Error creating user: " + user.email + " Error: " + err); + res.json({ + success: false, + message: err + }); + return; + }); +} \ No newline at end of file diff --git a/account/server/index.js b/account/server/index.js index 0ed2e58..a127c49 100644 --- a/account/server/index.js +++ b/account/server/index.js @@ -15,39 +15,39 @@ const app = express() // ------------------------------------------- -async function connect() { +const connect = async () => { // Demonstrate the readyState and on event emitters console.log(mongoose.connection.readyState); //logs 0 - mongoose.connection.on('connecting', () => { - console.log('Mongoose is connecting') - console.log(mongoose.connection.readyState); //logs 2 + mongoose.connection.on('connecting', () => { + console.log('Mongoose is connecting') + console.log(mongoose.connection.readyState); //logs 2 }); mongoose.connection.on('connected', () => { - console.log('Mongoose is connected'); - console.log(mongoose.connection.readyState); //logs 1 + console.log('Mongoose is connected'); + console.log(mongoose.connection.readyState); //logs 1 }); mongoose.connection.on('disconnecting', () => { - console.log('Mongoose is disconnecting'); - console.log(mongoose.connection.readyState); // logs 3 + console.log('Mongoose is disconnecting'); + console.log(mongoose.connection.readyState); // logs 3 }); // Connect to a MongoDB server running on 'localhost:27017' and use the // 'test' database. - await mongoose.connect(secrets.db, { useNewUrlParser: true, useUnifiedTopology: true, useCreateIndex: true }, (err, res) => { - if (err) { - console.log(`Mongoose - Error connecting to ${secrets.db}. ${err}`) - } else { - console.log(`Mongoose Successfully connected to ${secrets.db}.`) - } - }) + await mongoose.connect(secrets.db, { useNewUrlParser: true, useUnifiedTopology: true }).catch(err => { + + console.error(`Mongoose - Error connecting to ${secrets.db}. ${err}`) + + }); console.log("All Done"); } + connect(); + mongoose.connection.on('error', err => { console.error("Mongoose Error!") console.error(err); - }); +}); mongoose.connection.on('disconnected', () => { console.log('Mongoose disconnected'); console.log(mongoose.connection.readyState); //logs 0 @@ -72,16 +72,16 @@ configurePassport(app, passport) configureExpress(app, passport) -app.all('*', function(req, res, next) { - var allowedOrigins = [account_server, admin_server, frontend_server]; - var origin = req.headers.origin; - if(allowedOrigins.indexOf(origin) > -1){ - res.setHeader('Access-Control-Allow-Origin', origin); - } - res.header("Access-Control-Allow-Credentials", "true"); - res.header("Access-Control-Allow-Headers", "X-Requested-With"); - res.header('Access-Control-Allow-Headers', 'Content-Type'); - next(); +app.all('*', function (req, res, next) { + var allowedOrigins = [account_server, admin_server, frontend_server]; + var origin = req.headers.origin; + if (allowedOrigins.indexOf(origin) > -1) { + res.setHeader('Access-Control-Allow-Origin', origin); + } + res.header("Access-Control-Allow-Credentials", "true"); + res.header("Access-Control-Allow-Headers", "X-Requested-With"); + res.header('Access-Control-Allow-Headers', 'Content-Type'); + next(); }); // ------------------------------------------- @@ -94,8 +94,8 @@ app.post("/users/:userId/reset-password/:token", users.resetPassword) app.post("/api/send-reset-password", users.sendResetPassword) app.post("/users/:userId", users.isLoggedIn, users.validateProfile, users.updateProfile) app.post("/users/:userId/terms", users.isLoggedIn, users.terms) -app.post("/users/:userId/send-confirm", users.sendConfirmEmail) -app.post("/users/:userId/confirm/:token", users.confirmEmail) +app.post("/users/:userId/send-confirm", users.sendConfirmEmail) +app.post("/users/:userId/confirm/:token", users.confirmEmail) app.get("*", (req, res, next) => { res.sendFile(__dirname + '/public/index.html'); diff --git a/account/src/User/Login.js b/account/src/User/Login.js index fae8dda..993d76f 100644 --- a/account/src/User/Login.js +++ b/account/src/User/Login.js @@ -2,7 +2,7 @@ import React, { useEffect, useState, } from "react"; import { useNavigate, useSearchParams, Link } from 'react-router-dom'; import { loginUser } from "../features/user/userSlice"; - +import { useSelector, useDispatch } from 'react-redux' import { Container, Header, @@ -35,66 +35,52 @@ const Login = (props) => { const navigate = useNavigate(); let [searchParams, setSearchParams] = useSearchParams(); const nextLocation = searchParams.get("nextLocation"); + const dispatch = useDispatch(); - - - - - - const handleInputChange = (e, { name, value }) => this.setState({ [name]: value }); - - const loginSubmit = (event) => { + const loginSubmit = async (event) => { event.preventDefault(); - /* - var success = { type: "path", nextPathname: "/" }; - if (nextLocation) { - success.type = "location"; - switch (this.props.nextLocation) { - case "frontend": - success.nextLocation = process.env.REACT_APP_FRONTEND_SERVER; - break; - default: - case "admin": - success.nextLocation = process.env.REACT_APP_ADMIN_SERVER; - break; + const result = await dispatch(loginUser({email,password})).unwrap(); + if (result.success) { + + if (nextLocation) { + switch (this.props.nextLocation) { + case "frontend": + window.location = process.env.REACT_APP_FRONTEND_SERVER; + break; + default: + case "admin": + window.location = process.env.REACT_APP_ADMIN_SERVER; + 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. - 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) { - // report to the user is there was a problem during login - this.setState({ - loginMessage - }); - } - });*/ } -/* + let loginMessageDisplay =(<>) - if (this.state.loginMessage) { - loginMessage = ( + if (loginMessage) { + loginMessageDisplay = (Creating an account on OpenMHz is the first step in sharing radio system recordings using Trunk Recorder.
-After creating an account, head over here to learn more about Trunk Recorder
-- Luke
-Creating an account on OpenMHz is the first step in sharing radio system recordings using Trunk Recorder.
+After creating an account, head over here to learn more about Trunk Recorder
+- Luke
++ {msg} +
+ ))} +
+ We sent an email to the address you gave us: {email}
+ Please click on the link in the email to verify the email address.
+
We sent an email to the address you gave us: {this.props.user.email}
- Please click on the link in the email to verify the email address.
We sent an email to the address you gave us: {this.props.user.email}
- Please click on the link in the email to verify the email address.
So, you have waited a bit and haven't gotten anything?
+ + return ( +
+ We sent an email to the address you gave us: {email}
+
+ Please click on the link in the email to verify the email address.
+
So, you have waited a bit and haven't gotten anything?
...and you checked your spam folder?
Well, click below.
- -