Skip to content

Have utility methods in a seperated folder #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 27, 2018
Merged

Have utility methods in a seperated folder #6

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a9e9d03
Add utilManager
y21 Jun 27, 2018
9daed7c
Moved displayError to ./utils/displayError.js
y21 Jun 27, 2018
7ca0fa4
Take io parameter in displayError
y21 Jun 27, 2018
7494341
displayError requires io object
y21 Jun 27, 2018
e8c3709
Fix displayError
y21 Jun 27, 2018
acf1709
Add displayError utility
y21 Jun 27, 2018
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
displayError requires io object
  • Loading branch information
@y21
y21 authored Jun 27, 2018
commit 7494341bba0b53da7068d1d3e4e33ed311de21d7
8 changes: 4 additions & 4 deletions backend/events/register.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ registerEvent.run = (...args) => {
message: "Password needs to be at least 5 characters long and must not be longer than 32 characters."
});

if (/[^\w ]+/.test(res.username)) return displayError("Username should only contain A-Za-z_ ", data, "register", 400);
if (/[^\w ]+/.test(res.username)) return displayError("Username should only contain A-Za-z_ ", data, "register", 400, io);

if (!captchas.find(val => val.captcha === res.captcha)) return displayError("Captcha is not correct", data, "register", 400);
if (!captchas.find(val => val.captcha === res.captcha)) return displayError("Captcha is not correct", data, "register", 400, io);

const hash = bcrypt.hashSync(res.password, 10);

sqlite.prepare("SELECT * FROM accounts WHERE username = ?").then(prepare => {
prepare.get([res.username]).then(result => {
if (result) return displayError("Username is already taken.", data, "register", 400);
if (result) return displayError("Username is already taken.", data, "register", 400, io);
sqlite.prepare("INSERT INTO accounts VALUES (?, ?, 0)").then(prepare2 => {
prepare2.run([res.username, hash]).then(() => {
io.to(data.id).emit("register", {
Expand All @@ -50,7 +50,7 @@ registerEvent.run = (...args) => {
});
}).catch(err => {
if (err.toString().includes("no such table: accounts")) {
displayError("A problem occured on the server-side.", data, "register", 500);
displayError("A problem occured on the server-side.", data, "register", 500, io);
sqlite.run("CREATE TABLE accounts (`username` TEXT, `password` TEXT, `br` INTEGER)").catch(console.log);
}
});
Expand Down