t1meshift
/
expressCart
mirror of https://github.com/t1meshift/expressCart.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Started route separation

react_convert
Mark Moffat 2018-02-03 14:26:09 +01:00
parent d506969cbf
commit 01ce33a642
4 changed files with 220 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -55,21 +55,20 @@ Set this value to a full 2 decimal value with no commas or currency symbols.
##### Permalink
A permalink is a nice link to your product which is normally shown in search engine rankings. By default, if you Permalink value is set when adding a product,
one will be generated using the Product title with spaces replaced by dashes.
A permalink is a nice link to your product which is normally shown in search engine rankings. By default, a no Permalink value is set when adding a product one will be generated using the Product title with spaces replaced by dashes.
##### Options
You may want to set product options such as 'Size', 'Color' etc.
You may want to set product options such as `Size`, `Color` etc.
Below is an explanation of the fields and what they do
`Name` = Something easy to recognize to administer
`Label` = This will be shown to the customer (eg: 'Select size')
`Type` = You can set the option to a 'Select' (drop down menu), 'Radio' (An optional button) or a 'Checkbox' for an on/off or true/false option
`Options` = Available options are added using a comma separated list. For size options you may set: 'Small,Medium,Large' or 'S,M,Link
`Label` = This will be shown to the customer (eg: `Select size`, `Select color` etc)
`Type` = You can set the option to a `Select` (drop down menu), `Radio` (An optional button) or a `Checkbox` for an on/off or true/false option
`Options` = Available options are added using a comma separated list. For size options you may set: `Small,Medium,Large` or `S,M,L`
Note: An `Options` value is not required when `Type` is set to 'Checkbox'.
Note: An `Options` value is not required when `Type` is set to `Checkbox`.
##### Product tag words

2
app.js
View File

@ -48,6 +48,7 @@ if(config.paymentGateway === 'stripe'){
// require the routes
const index = require('./routes/index');
const admin = require('./routes/admin');
const customer = require('./routes/customer');
const paypal = require('./routes/payments/paypal');
const stripe = require('./routes/payments/stripe');
@ -221,6 +222,7 @@ app.use((req, res, next) => {
// setup the routes
app.use('/', index);
app.use('/', customer);
app.use('/admin', admin);
app.use('/paypal', paypal);
app.use('/stripe', stripe);

212
routes/customer.js Normal file
View File

@ -0,0 +1,212 @@
const express = require('express');
const router = express.Router();
const colors = require('colors');
const randtoken = require('rand-token');
const common = require('./common');
// insert a customer
router.post('/customer/create', (req, res) => {
const db = req.app.db;
const bcrypt = req.bcrypt;
let doc = {
email: req.body.email,
firstName: req.body.firstName,
lastName: req.body.lastName,
address1: req.body.address1,
address2: req.body.address2,
country: req.body.country,
state: req.body.state,
postcode: req.body.postcode,
phone: req.body.phone,
password: bcrypt.hashSync(req.body.password),
created: new Date()
};
// check for existing customer
db.customers.findOne({email: req.body.email}, (err, customer) => {
if(customer){
res.status(404).json({
err: 'A customer already exists with that email address'
});
return;
}
// email is ok to be used.
db.customers.insertOne(doc, (err, newCustomer) => {
if(err){
if(newCustomer){
console.error(colors.red('Failed to insert customer: ' + err));
res.status(400).json({
err: 'A customer already exists with that email address'
});
return;
}
console.error(colors.red('Failed to insert customer: ' + err));
res.status(400).json({
err: 'Customer creation failed.'
});
return;
}
// Customer creation successful
req.session.customer = newCustomer.ops[0];
res.status(200).json({
message: 'Successfully logged in',
customer: newCustomer
});
});
});
});
// login the customer and check the password
router.post('/customer/login_action', (req, res) => {
let db = req.app.db;
let bcrypt = req.bcrypt;
db.customers.findOne({email: req.body.loginEmail}, (err, customer) => {
if(err){
// An error accurred
return res.status(400).json({
err: 'Access denied. Check password and try again.'
});
}
// check if customer exists with that email
if(customer === undefined || customer === null){
return res.status(400).json({
err: 'A customer with that email does not exist.'
});
}
// we have a customer under that email so we compare the password
if(bcrypt.compareSync(req.body.loginPassword, customer.password) === false){
// password is not correct
return res.status(400).json({
err: 'Access denied. Check password and try again.'
});
}
// Customer login successful
req.session.customer = customer;
return res.status(200).json({
message: 'Successfully logged in',
customer: customer
});
});
});
// customer forgotten password
router.get('/customer/forgotten', (req, res) => {
res.render('forgotten', {
title: 'Forgotten',
route: 'customer',
forgotType: 'customer',
config: common.getConfig(),
helpers: req.handlebars.helpers,
message: common.clearSessionValue(req.session, 'message'),
messageType: common.clearSessionValue(req.session, 'messageType'),
showFooter: 'showFooter'
});
});
// forgotten password
router.post('/customer/forgotten_action', (req, res) => {
const db = req.app.db;
const config = common.getConfig();
let passwordToken = randtoken.generate(30);
// find the user
db.customers.findOne({email: req.body.email}, (err, customer) => {
// if we have a customer, set a token, expiry and email it
if(customer){
let tokenExpiry = Date.now() + 3600000;
db.customers.update({email: req.body.email}, {$set: {resetToken: passwordToken, resetTokenExpiry: tokenExpiry}}, {multi: false}, (err, numReplaced) => {
// send forgotten password email
let mailOpts = {
to: req.body.email,
subject: 'Forgotten password request',
body: `You are receiving this because you (or someone else) have requested the reset of the password for your user account.\n\n
Please click on the following link, or paste this into your browser to complete the process:\n\n
${config.baseUrl}/customer/reset/${passwordToken}\n\n
If you did not request this, please ignore this email and your password will remain unchanged.\n`
};
// send the email with token to the user
// TODO: Should fix this to properly handle result
common.sendEmail(mailOpts.to, mailOpts.subject, mailOpts.body);
req.session.message = 'An email has been sent to ' + req.body.email + ' with further instructions';
req.session.message_type = 'success';
return res.redirect('/customer/forgotten');
});
}else{
req.session.message = 'Account does not exist';
res.redirect('/customer/forgotten');
}
});
});
// reset password form
router.get('/customer/reset/:token', (req, res) => {
const db = req.app.db;
// Find the customer using the token
db.customers.findOne({resetToken: req.params.token, resetTokenExpiry: {$gt: Date.now()}}, (err, customer) => {
if(!customer){
req.session.message = 'Password reset token is invalid or has expired';
req.session.message_type = 'danger';
res.redirect('/forgot');
return;
}
// show the password reset form
res.render('reset', {
title: 'Reset password',
token: req.params.token,
route: 'customer',
config: common.getConfig(),
message: common.clearSessionValue(req.session, 'message'),
message_type: common.clearSessionValue(req.session, 'message_type'),
show_footer: 'show_footer',
helpers: req.handlebars.helpers
});
});
});
// reset password action
router.post('/customer/reset/:token', (req, res) => {
const db = req.app.db;
let bcrypt = req.bcrypt;
// get the customer
db.customers.findOne({resetToken: req.params.token, resetTokenExpiry: {$gt: Date.now()}}, (err, customer) => {
if(!customer){
req.session.message = 'Password reset token is invalid or has expired';
req.session.message_type = 'danger';
return res.redirect('/forgot');
}
// update the password and remove the token
let newPassword = bcrypt.hashSync(req.body.password);
db.customers.update({email: customer.email}, {$set: {password: newPassword, resetToken: undefined, resetTokenExpiry: undefined}}, {multi: false}, (err, numReplaced) => {
let mailOpts = {
to: customer.email,
subject: 'Password successfully reset',
body: 'This is a confirmation that the password for your account ' + customer.email + ' has just been changed successfully.\n'
};
// TODO: Should fix this to properly handle result
common.sendEmail(mailOpts.to, mailOpts.subject, mailOpts.body);
req.session.message = 'Password successfully updated';
req.session.message_type = 'success';
return res.redirect('/pay');
});
return'';
});
});
// logout the customer
router.post('/customer/logout', (req, res) => {
req.session.customer = null;
res.status(200).json({});
});
module.exports = router;

206
routes/index.js
View File

@ -2,7 +2,6 @@ const express = require('express');
const router = express.Router();
const colors = require('colors');
const _ = require('lodash');
const randtoken = require('rand-token');
const common = require('./common');
router.get('/payment/:orderId', async (req, res, next) => {
@ -237,211 +236,6 @@ router.post('/login_action', (req, res) => {
});
});
// insert a customer
router.post('/customer/create', (req, res) => {
const db = req.app.db;
const bcrypt = req.bcrypt;
let doc = {
email: req.body.email,
firstName: req.body.firstName,
lastName: req.body.lastName,
address1: req.body.address1,
address2: req.body.address2,
country: req.body.country,
state: req.body.state,
postcode: req.body.postcode,
phone: req.body.phone,
password: bcrypt.hashSync(req.body.password),
created: new Date()
};
// check for existing customer
db.customers.findOne({email: req.body.email}, (err, customer) => {
if(customer){
res.status(404).json({
err: 'A customer already exists with that email address'
});
return;
}
// email is ok to be used.
db.customers.insertOne(doc, (err, newCustomer) => {
if(err){
if(newCustomer){
console.error(colors.red('Failed to insert customer: ' + err));
res.status(400).json({
err: 'A customer already exists with that email address'
});
return;
}
console.error(colors.red('Failed to insert customer: ' + err));
res.status(400).json({
err: 'Customer creation failed.'
});
return;
}
// Customer creation successful
req.session.customer = newCustomer.ops[0];
res.status(200).json({
message: 'Successfully logged in',
customer: newCustomer
});
});
});
});
// login the customer and check the password
router.post('/customer/login_action', (req, res) => {
let db = req.app.db;
let bcrypt = req.bcrypt;
db.customers.findOne({email: req.body.loginEmail}, (err, customer) => {
if(err){
// An error accurred
return res.status(400).json({
err: 'Access denied. Check password and try again.'
});
}
// check if customer exists with that email
if(customer === undefined || customer === null){
return res.status(400).json({
err: 'A customer with that email does not exist.'
});
}
// we have a customer under that email so we compare the password
if(bcrypt.compareSync(req.body.loginPassword, customer.password) === false){
// password is not correct
return res.status(400).json({
err: 'Access denied. Check password and try again.'
});
}
// Customer login successful
req.session.customer = customer;
return res.status(200).json({
message: 'Successfully logged in',
customer: customer
});
});
});
// customer forgotten password
router.get('/customer/forgotten', (req, res) => {
res.render('forgotten', {
title: 'Forgotten',
route: 'customer',
forgotType: 'customer',
config: common.getConfig(),
helpers: req.handlebars.helpers,
message: common.clearSessionValue(req.session, 'message'),
messageType: common.clearSessionValue(req.session, 'messageType'),
showFooter: 'showFooter'
});
});
// forgotten password
router.post('/customer/forgotten_action', (req, res) => {
const db = req.app.db;
const config = common.getConfig();
let passwordToken = randtoken.generate(30);
// find the user
db.customers.findOne({email: req.body.email}, (err, customer) => {
// if we have a customer, set a token, expiry and email it
if(customer){
let tokenExpiry = Date.now() + 3600000;
db.customers.update({email: req.body.email}, {$set: {resetToken: passwordToken, resetTokenExpiry: tokenExpiry}}, {multi: false}, (err, numReplaced) => {
// send forgotten password email
let mailOpts = {
to: req.body.email,
subject: 'Forgotten password request',
body: `You are receiving this because you (or someone else) have requested the reset of the password for your user account.\n\n
Please click on the following link, or paste this into your browser to complete the process:\n\n
${config.baseUrl}/customer/reset/${passwordToken}\n\n
If you did not request this, please ignore this email and your password will remain unchanged.\n`
};
// send the email with token to the user
// TODO: Should fix this to properly handle result
common.sendEmail(mailOpts.to, mailOpts.subject, mailOpts.body);
req.session.message = 'An email has been sent to ' + req.body.email + ' with further instructions';
req.session.message_type = 'success';
return res.redirect('/customer/forgotten');
});
}else{
req.session.message = 'Account does not exist';
res.redirect('/customer/forgotten');
}
});
});
// reset password form
router.get('/customer/reset/:token', (req, res) => {
const db = req.app.db;
// Find the customer using the token
db.customers.findOne({resetToken: req.params.token, resetTokenExpiry: {$gt: Date.now()}}, (err, customer) => {
if(!customer){
req.session.message = 'Password reset token is invalid or has expired';
req.session.message_type = 'danger';
res.redirect('/forgot');
return;
}
// show the password reset form
res.render('reset', {
title: 'Reset password',
token: req.params.token,
route: 'customer',
config: common.getConfig(),
message: common.clearSessionValue(req.session, 'message'),
message_type: common.clearSessionValue(req.session, 'message_type'),
show_footer: 'show_footer',
helpers: req.handlebars.helpers
});
});
});
// reset password action
router.post('/customer/reset/:token', (req, res) => {
const db = req.app.db;
let bcrypt = req.bcrypt;
// get the customer
db.customers.findOne({resetToken: req.params.token, resetTokenExpiry: {$gt: Date.now()}}, (err, customer) => {
if(!customer){
req.session.message = 'Password reset token is invalid or has expired';
req.session.message_type = 'danger';
return res.redirect('/forgot');
}
// update the password and remove the token
let newPassword = bcrypt.hashSync(req.body.password);
db.customers.update({email: customer.email}, {$set: {password: newPassword, resetToken: undefined, resetTokenExpiry: undefined}}, {multi: false}, (err, numReplaced) => {
let mailOpts = {
to: customer.email,
subject: 'Password successfully reset',
body: 'This is a confirmation that the password for your account ' + customer.email + ' has just been changed successfully.\n'
};
// TODO: Should fix this to properly handle result
common.sendEmail(mailOpts.to, mailOpts.subject, mailOpts.body);
req.session.message = 'Password successfully updated';
req.session.message_type = 'success';
return res.redirect('/pay');
});
return'';
});
});
// logout the customer
router.post('/customer/logout', (req, res) => {
req.session.customer = null;
res.status(200).json({});
});
// search products
router.get('/search/:searchTerm/:pageNum?', (req, res) => {
let db = req.app.db;