Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 353be4662b | |||
| cc655cd988 | |||
| ec3b14e32b | |||
| b188c46efd | |||
| ece3b0253f | |||
| 062bc43f5a |
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "auth-server",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.9",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "auth-server",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.9",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"bcryptjs": "^2.4.3",
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "auth-server",
|
||||
"version": "1.4.7",
|
||||
"version": "1.4.9",
|
||||
"description": "An API centric auth server. Uses Sequelize and mariaDB by default.",
|
||||
"main": "server/server.js",
|
||||
"scripts": {
|
||||
|
||||
@@ -52,9 +52,6 @@ const validateDetails = async (body) => {
|
||||
return 'Invalid username';
|
||||
}
|
||||
|
||||
//check for existing (banned)
|
||||
//TODO: re-add banned email checks
|
||||
|
||||
//check for existing email
|
||||
const emailRecord = await accounts.findOne({
|
||||
where: {
|
||||
@@ -107,12 +104,12 @@ const registerPendingSignup = async (body, hash, token) => {
|
||||
|
||||
const sendValidationEmail = async (email, username, token) => {
|
||||
const addr = `${process.env.WEB_PROTOCOL}://${process.env.WEB_ADDRESS}/auth/validation?username=${username}&token=${token}`;
|
||||
const msg = `Hello ${username}!
|
||||
|
||||
Please visit the following link to validate your account: ${addr}
|
||||
|
||||
You can contact us directly at our physical mailing address here: ${process.env.MAIL_PHYSICAL}
|
||||
`;
|
||||
const msg =
|
||||
`Hello ${username}!\n\n` +
|
||||
`Please visit the following link to validate your account: ${addr}\n` +
|
||||
(process.env.MAIL_PHYSICAL
|
||||
? `\nYou can contact us directly at our physical mailing address here: ${process.env.MAIL_PHYSICAL}\n`
|
||||
: ``);
|
||||
|
||||
let transporter, info;
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ const route = async (req, res) => {
|
||||
}
|
||||
|
||||
//move data to the accounts table
|
||||
const [account] = await accounts.upsert({
|
||||
const account = await accounts.create({
|
||||
email: info.email,
|
||||
username: info.username,
|
||||
hash: info.hash,
|
||||
@@ -30,7 +30,7 @@ const route = async (req, res) => {
|
||||
//delete the pending signup
|
||||
pendingSignups.destroy({
|
||||
where: {
|
||||
username: req.query.username || ''
|
||||
username: info.username || ''
|
||||
}
|
||||
});
|
||||
|
||||
@@ -43,13 +43,9 @@ const route = async (req, res) => {
|
||||
|
||||
if (!probe.ok) {
|
||||
console.error('Could not probe the post validation hook');
|
||||
} else {
|
||||
console.log('Validation hook probe successful'); //TODO: remove this
|
||||
}
|
||||
|
||||
//discard the result
|
||||
} else {
|
||||
console.log('No validation hook'); //TODO: remove this
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user