Skip to content

Commit d77e047

Browse files
committed
updated to return early and simplify req.username
1 parent 2b7086f commit d77e047

2 files changed

Lines changed: 7 additions & 10 deletions

File tree

custom-written-middleware/server.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ app.use(express.text({ type: "application/x-www-form-urlencoded" }));
77

88
const checkUsernameHeader = (req, res, next) => {
99
const usernameHeader = req.get("X-Username");
10-
usernameHeader ? (req.username = usernameHeader) : (req.username = null);
10+
req.username = usernameHeader || null;
1111
next();
1212
};
1313

@@ -39,18 +39,15 @@ const validateJsonArrayBody = (req, res, next) => {
3939

4040
app.post("/", checkUsernameHeader, validateJsonArrayBody, (req, res) => {
4141
const { username, parsedBody } = req;
42+
43+
if (!username) return res.status(401).send("You are not authenticated.");
44+
4245
const count = parsedBody.length;
4346

4447
const subjectWord = count === 1 ? "subject" : "subjects";
4548
const subjectsList = count > 0 ? `: ${parsedBody.join(", ")}` : "";
46-
47-
let responseMessage = "";
48-
49-
if (username) {
50-
responseMessage += `You are authenticated as ${username}.\n\n`;
51-
} else {
52-
responseMessage += `You are not authenticated.\n\n`;
53-
}
49+
50+
let responseMessage = `You are authenticated as ${username}.\n\n`;
5451

5552
responseMessage += `You have requested information about ${count} ${subjectWord}${subjectsList}`;
5653

off-the-shelf-middleware/server.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ app.use(express.json());
88

99
const checkUsernameHeader = (req, res, next) => {
1010
const usernameHeader = req.get("X-Username");
11-
req.username = usernameHeader? usernameHeader : null;
11+
req.username = usernameHeader || null;
1212
next();
1313
}
1414

0 commit comments

Comments
 (0)