Skip to content
This repository was archived by the owner on Apr 5, 2023. It is now read-only.

Commit 1712f70

Browse files
committed
fix lint
1 parent 7d24cad commit 1712f70

File tree

10 files changed

+43
-40
lines changed

10 files changed

+43
-40
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,4 @@ typings/
8282

8383
# DynamoDB Local files
8484
.dynamodb/
85+
.DS_Store

bin/migrate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ new Promise((resolve, reject) => {
2222
reject(new Error('Command is not a function'));
2323
}
2424

25-
set[command](err => {
25+
set[command]((err) => {
2626
if (err) reject(err);
2727
resolve();
2828
});
@@ -34,7 +34,7 @@ new Promise((resolve, reject) => {
3434
// eslint-disable-next-line unicorn/no-process-exit
3535
process.exit(0);
3636
})
37-
.catch(error => {
37+
.catch((error) => {
3838
console.error(error.stack);
3939
// eslint-disable-next-line unicorn/no-process-exit
4040
process.exit(1);

server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const {SESSION_SECRET} = require('./config');
99
const app = express();
1010
const api = require('./src/api');
1111

12-
app.get('/', (req, res) => res.sendStatus(200));
13-
app.get('/health', (req, res) => res.sendStatus(200));
12+
app.get('/', (request, response) => response.sendStatus(200));
13+
app.get('/health', (request, response) => response.sendStatus(200));
1414

1515
app.use(morgan('short'));
1616
app.use(express.json());

src/api/session.js

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,40 +8,41 @@ const sessionMiddleware = require('../middleware/session-middleware');
88

99
const router = new Router();
1010

11-
router.post('/', async (req, res) => {
11+
router.post('/', async (request, response) => {
1212
try {
13-
const {email, password} = req.body;
13+
const {email, password} = request.body;
14+
// eslint-disable-next-line unicorn/no-fn-reference-in-iterator
1415
const user = await User.find(email);
1516
if (!user || !(await bcrypt.compare(password, user.password))) {
16-
return res.status(403).json({});
17+
return response.status(403).json({});
1718
}
1819

1920
const sessionId = await Session.create(user.id);
20-
req.session.id = sessionId;
21-
res.status(201).json();
21+
request.session.id = sessionId;
22+
response.status(201).json();
2223
} catch (error) {
2324
console.error(
24-
`POST session ({ email: ${req.body.email} }) >> ${error.stack})`
25+
`POST session ({ email: ${request.body.email} }) >> ${error.stack})`
2526
);
26-
res.status(500).json();
27+
response.status(500).json();
2728
}
2829
});
2930

30-
router.get('/', sessionMiddleware, (req, res) => {
31-
res.json({userId: req.userId});
31+
router.get('/', sessionMiddleware, (request, response) => {
32+
response.json({userId: request.userId});
3233
});
3334

34-
router.delete('/', async (req, res) => {
35+
router.delete('/', async (request, response) => {
3536
try {
36-
if (req.session.id) {
37-
await Session.delete(req.session.id);
37+
if (request.session.id) {
38+
await Session.delete(request.session.id);
3839
}
3940

40-
req.session.id = null;
41-
res.status(200).json();
41+
request.session.id = null;
42+
response.status(200).json();
4243
} catch (error) {
4344
console.error(`DELETE session >> ${error.stack}`);
44-
res.status(500).json();
45+
response.status(500).json();
4546
}
4647
});
4748

src/api/user.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ const User = require('../persistence/users');
33

44
const router = new Router();
55

6-
router.post('/', async (req, res) => {
6+
router.post('/', async (request, response) => {
77
try {
8-
const {email, password} = req.body;
8+
const {email, password} = request.body;
99
if (!email || !password) {
10-
return res
10+
return response
1111
.status(400)
1212
.json({message: 'email and password must be provided'});
1313
}
1414

1515
const user = await User.create(email, password);
1616
if (!user) {
17-
return res.status(400).json({message: 'User already exists'});
17+
return response.status(400).json({message: 'User already exists'});
1818
}
1919

20-
return res.status(200).json(user);
20+
return response.status(200).json(user);
2121
} catch (error) {
2222
console.error(
23-
`createUser({ email: ${req.body.email} }) >> Error: ${error.stack}`
23+
`createUser({ email: ${request.body.email} }) >> Error: ${error.stack}`
2424
);
25-
res.status(500).json();
25+
response.status(500).json();
2626
}
2727
});
2828

src/middleware/session-middleware.js

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
const Session = require('../persistence/sessions');
22

3-
const sessionMiddleware = async (req, res, next) => {
4-
if (!req.session.id) {
5-
return res.sendStatus(401);
3+
const sessionMiddleware = async (request, response, next) => {
4+
if (!request.session.id) {
5+
return response.sendStatus(401);
66
}
77

88
try {
9-
const session = await Session.find(req.session.id);
9+
// eslint-disable-next-line unicorn/no-fn-reference-in-iterator
10+
const session = await Session.find(request.session.id);
1011
if (!session) {
11-
req.session.id = null;
12-
return res.sendStatus(401);
12+
request.session.id = null;
13+
return response.sendStatus(401);
1314
}
1415

15-
req.userId = session.userId;
16+
request.userId = session.userId;
1617
next();
1718
} catch (error) {
1819
console.error(
19-
`SessionMiddleware(${req.session.id}) >> Error: ${error.stack}`
20+
`SessionMiddleware(${request.session.id}) >> Error: ${error.stack}`
2021
);
21-
return res.sendStatus(500);
22+
return response.sendStatus(500);
2223
}
2324
};
2425

src/migrations/1550969025172-authentication.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const db = require('../persistence/db');
22

3-
module.exports.up = async function(next) {
3+
module.exports.up = async function (next) {
44
const client = await db.connect();
55

66
await client.query(`
@@ -26,7 +26,7 @@ module.exports.up = async function(next) {
2626
next();
2727
};
2828

29-
module.exports.down = async function(next) {
29+
module.exports.down = async function (next) {
3030
const client = await db.connect();
3131

3232
await client.query(`

src/persistence/postgres-state-storage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const sql = require('sql-template-strings');
22
const db = require('./db');
33

4-
const ensureMigrationsTable = db =>
4+
const ensureMigrationsTable = (db) =>
55
db.query(
66
'CREATE TABLE IF NOT EXISTS migrations (id integer PRIMARY KEY, data jsonb NOT NULL)'
77
);

src/persistence/sessions.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const sql = require('sql-template-strings');
2-
const { v4: uuidv4 } = require('uuid');
2+
const {v4: uuidv4} = require('uuid');
33
const db = require('./db');
44

55
module.exports = {

src/persistence/users.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const sql = require('sql-template-strings');
2-
const { v4: uuidv4 } = require('uuid');
2+
const {v4: uuidv4} = require('uuid');
33
const bcrypt = require('bcrypt');
44
const db = require('./db');
55

0 commit comments

Comments
 (0)