Ratstail91/kingdombattles
Archived
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed CSS and request URLs

Browse Source
This commit is contained in:
Kayne Ruse
2019-05-26 03:02:48 +10:00
parent 862abbdb31
commit f949617284
12 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/accounts.js
+15 -15
View File
@@ -10,7 +10,7 @@ let sendmail = require('sendmail')();
let { log, validateEmail } = require('../common/utilities.js');
let { throttle, isThrottled } = require('../common/throttle.js');
const signup = (connection) => (req, res) => {
const signupRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -66,7 +66,7 @@ const signup = (connection) => (req, res) => {
if (err) throw err;
//build the verification email
let addr = `http://${process.env.WEB_ADDRESS}/verify?email=${fields.email}&verify=${rand}`;
let addr = `http://${process.env.WEB_ADDRESS}/verifyrequest?email=${fields.email}&verify=${rand}`;
let msg = 'Hello! Please visit the following address to verify your account: ';
let msgHtml = `<html><body><p>${msg}<a href='${addr}'>${addr}</a></p></body></html>`;
@@ -95,7 +95,7 @@ const signup = (connection) => (req, res) => {
});
}
const verify = (connection) => (req, res) => {
const verifyRequest = (connection) => (req, res) => {
//get the saved data
let query = 'SELECT email, username, salt, hash, verify FROM signups WHERE email = ?;';
@@ -133,7 +133,7 @@ const verify = (connection) => (req, res) => {
});
}
const login = (connection) => (req, res) => {
const loginRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -193,7 +193,7 @@ const login = (connection) => (req, res) => {
});
}
const logout = (connection) => (req, res) => {
const logoutRequest = (connection) => (req, res) => {
let query = 'DELETE FROM sessions WHERE sessions.accountId IN (SELECT accounts.id FROM accounts WHERE email = ?) AND token = ?;';
connection.query(query, [req.body.email, req.body.token], (err) => {
if (err) throw err;
@@ -203,7 +203,7 @@ const logout = (connection) => (req, res) => {
res.end();
}
const passwordChange = (connection) => (req, res) => {
const passwordChangeRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -269,7 +269,7 @@ const passwordChange = (connection) => (req, res) => {
});
}
const passwordRecover = (connection) => (req, res) => {
const passwordRecoverRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -339,7 +339,7 @@ const passwordRecover = (connection) => (req, res) => {
});
}
const passwordReset = (connection) => (req, res) => {
const passwordResetRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -394,11 +394,11 @@ const passwordReset = (connection) => (req, res) => {
}
module.exports = {
signup: signup,
verify: verify,
login: login,
logout: logout,
passwordChange: passwordChange,
passwordRecover: passwordRecover,
passwordReset: passwordReset
signupRequest: signupRequest,
verifyRequest: verifyRequest,
loginRequest: loginRequest,
logoutRequest: logoutRequest,
passwordChangeRequest: passwordChangeRequest,
passwordRecoverRequest: passwordRecoverRequest,
passwordResetRequest: passwordResetRequest
};
server/index.js
+10 -10
View File
@@ -23,20 +23,20 @@ let connection = connectToDatabase(); //uses .env
//handle accounts
let accounts = require('./accounts.js');
app.post('/signup', accounts.signup(connection));
app.get('/verify', accounts.verify(connection));
app.post('/login', accounts.login(connection));
app.post('/logout', accounts.logout(connection));
app.post('/passwordchange', accounts.passwordChange(connection));
app.post('/passwordrecover', accounts.passwordRecover(connection));
app.post('/passwordreset', accounts.passwordReset(connection));
app.post('/signuprequest', accounts.signupRequest(connection));
app.get('/verifyrequest', accounts.verifyRequest(connection));
app.post('/loginrequest', accounts.loginRequest(connection));
app.post('/logoutrequest', accounts.logoutRequest(connection));
app.post('/passwordchangerequest', accounts.passwordChangeRequest(connection));
app.post('/passwordrecoverrequest', accounts.passwordRecoverRequest(connection));
app.post('/passwordresetrequest', accounts.passwordResetRequest(connection));
//handle profiles
let profiles = require('./profiles.js');
app.post('/profilerequest', profiles.profileRequest(connection));
app.post('/recruit', profiles.recruit(connection));
app.post('/train', profiles.train(connection));
app.post('/untrain', profiles.untrain(connection));
app.post('/recruitrequest', profiles.recruitRequest(connection));
app.post('/trainrequest', profiles.trainRequest(connection));
app.post('/untrainrequest', profiles.untrainRequest(connection));
app.post('/ladderrequest', profiles.ladderRequest(connection));
profiles.runGoldTick(connection);
server/profiles.js
+12 -12
View File
@@ -9,7 +9,7 @@ let CronJob = require('cron').CronJob;
let { log } = require('../common/utilities.js');
//profile creation & requesting
const profileCreate = (connection) => (req, res) => {
const profileCreateRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -18,11 +18,11 @@ const profileCreate = (connection) => (req, res) => {
if (err) throw err;
//separate this section so it can be used elsewhere too
return profileCreateInner(connection, req, res, fields);
return profileCreateRequestInner(connection, req, res, fields);
});
}
function profileCreateInner(connection, req, res, fields) {
function profileCreateRequestInner(connection, req, res, fields) {
let query = 'SELECT accountId FROM profiles WHERE accountId IN (SELECT accounts.id FROM accounts WHERE username = ?);';
connection.query(query, [fields.username], (err, results) => {
if (err) throw err;
@@ -81,7 +81,7 @@ function profileRequestInner(connection, req, res, fields) {
if (err) throw err;
if (results.length === 1) {
return profileCreateInner(connection, req, res, fields);
return profileCreateRequestInner(connection, req, res, fields);
} else {
res.status(400).write(log('Profile not found', fields.username, fields.id, fields.token));
res.end();
@@ -104,7 +104,7 @@ function profileRequestInner(connection, req, res, fields) {
}
//actual actions to be taken
const recruit = (connection) => (req, res) => {
const recruitRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -178,7 +178,7 @@ const recruit = (connection) => (req, res) => {
});
}
const train = (connection) => (req, res) => {
const trainRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -272,7 +272,7 @@ const train = (connection) => (req, res) => {
});
}
const untrain = (connection) => (req, res) => {
const untrainRequest = (connection) => (req, res) => {
//formidable handles forms
let form = formidable.IncomingForm();
@@ -382,9 +382,9 @@ const runGoldTick = (connection) => {
module.exports = {
// profileCreate: profileCreate, //NOTE: Not actually used
profileRequest: profileRequest,
recruit: recruit,
train: train,
untrain: untrain,
runGoldTick: runGoldTick,
ladderRequest: ladderRequest
recruitRequest: recruitRequest,
trainRequest: trainRequest,
untrainRequest: untrainRequest,
ladderRequest: ladderRequest,
runGoldTick: runGoldTick
}