Skip to content

Update users, keep track of tokens and a bugfix #8

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

Open
JIBSIL wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update users, keep track of tokens and a bugfix #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a6d295
Clarify NOAUTH error message
JIBSIL Aug 25, 2021
229b51c
Fix 500 error on line 114
JIBSIL Aug 25, 2021
c5e208f
Update v1.js
JIBSIL Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 120 additions & 2 deletions dist/v1.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ async function main() {
await client.connect();
const db = client.db(dbName);
const collection = db.collection("dev");
const tokens = db.collection("tokens");

// Character limit
const RegExpFilter = /^.{3,64}$/;
const RegExpFilterPassword = /^.{7,64}$/;
Expand Down Expand Up @@ -83,6 +85,11 @@ async function main() {
expiresIn: 86400
}
);
await tokens.insertOne({
username: req.body.username,
token,
isAdmin
});
res
.cookie("token", token, { httpOnly: true })
.status(200)
Expand All @@ -91,7 +98,7 @@ async function main() {
res.send("NOAUTH");
}
} else {
res.send("NOAUTH");
res.send("NOUSER");
}
} else {
res.send({ error: "ERR_BAD_CHARACTERS" });
Expand All @@ -111,13 +118,124 @@ async function main() {
});
} catch (error) {
if (error.message === "Cannot read property 'username' of undefined") {
res.status(500).send({ error: "NOAUTH_ERR_POSSIBLE_SPOOF" });
res.send({ error: "NOAUTH_ERR_POSSIBLE_SPOOF" });
} else {
res.status(500).send({ error: "NOAUTH_UNKNOWN_ERROR" });
}
}
});

app.put("/updateuser", async (req, res) => {
try {
const findUser = await collection.findOne({
username: req.body.currentUsername
});
if (findUser) {
jwt.verify(req.cookies.token, jwtsecret, async (error, decoded) => {
const isValid = error || decoded === undefined ? false : true;
if (isValid === true) {
if (
decoded.username === req.body.currentUsername ||
decoded.isAdmin === true
) {
if (!req.body.currentPassword) {
var comparePassword = false;
} else if (req.body.currentPassword) {
var comparePassword = await bcrypt.compare(
req.body.currentPassword,
findUser.password
);
}

if (comparePassword || decoded.isAdmin === true) {
if (
RegExpFilter.test(req.body.username) &&
RegExpFilterPassword.test(req.body.password) === true
) {
const newUsername =
req.body.username ?? req.body.currentUsername;
const newPassword =
req.body.password ?? req.body.currentPassword;
const hash = bcrypt.hashSync(
newPassword,
bcrypt.genSaltSync(10)
);
await collection.updateOne(
{ username: req.body.currentUsername },
{
$set: {
username: newUsername,
password: hash
}
}
);
res.send("Updated");
} else {
res.send("ERR_BAD_CHARACTERS");
}
}
} else {
res.send("ERR_UNAUTHORIZED");
}
} else {
res.send("NOAUTH_ERR_POSSIBLE_SPOOF");
}
});
} else {
res.send("NOUSER");
}
} catch (error) {
res.status(500).send({ error: "NOAUTH_UNKNOWN_ERR" });
}
});

app.delete("/deleteuser", async (req, res) => {
try {
if (
RegExpFilter.test(req.body.username) &&
RegExpFilterPassword.test(req.body.password) === true
) {
const findUser = await collection.findOne({
username: req.body.username
});
if (findUser) {
jwt.verify(req.cookies.token, jwtsecret, async (error, decoded) => {
const isValid = error || decoded === undefined ? false : true;
if (isValid === true) {
if (
decoded.username === req.body.username ||
decoded.isAdmin === true
) {
if (!req.body.password) {
var comparePasswordForDeletion = false;
} else if (req.body.password) {
var comparePasswordForDeletion = await bcrypt.compare(
req.body.password,
findUser.password
);
}
if (comparePasswordForDeletion || decoded.isAdmin === true) {
await collection.deleteOne({ username: req.body.username });
res.send("User Deleted");
}
} else {
res.send("ERR_UNAUTHORIZED");
}
} else {
res.send("NOAUTH_ERR_POSSIBLE_SPOOF");
}
});
} else {
res.send("NOUSER");
}
} else {
res.send("ERR_BAD_CHARACTERS");
}
} catch (error) {
res.status(500).send({ error: "NOAUTH_UNKNOWN_ERR" });
}
});

app.listen(port, () => {
console.log(`App listening at http://localhost:${port}`);
});
Expand Down