Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions api/routes/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const bcrypt = require('bcrypt')
const User = require('../models/user')
const { decodeToken, generateToken } = require('../lib/token')


router.get('/profile', async (req, res, next) => {
try {
const payload = decodeToken(req.token)
const user = await User.findOne({ _id: payload.id }).select('-__v -password')

const status = 200
res.json({ status, user })
} catch (e) {
Expand All @@ -21,14 +21,14 @@ router.get('/profile', async (req, res, next) => {
router.post('/login', async (req, res, next) => {
const { username, password } = req.body
const user = await User.findOne({ username })
if (user) {
if (user) {
const valid = await bcrypt.compare(password, user.password)
if (valid) {
const status = 200
const response = 'You have successful logged in.'
const token = generateToken(user._id)
return res.status(status).json({ status, response, token })
}
}
}

const message = `Username or password incorrect. Please check credentials and try again.`
Expand Down
49 changes: 49 additions & 0 deletions api/routes/posts.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
const router = require('express').Router({ mergeParams: true })
const User = require('../models/user')
const { isLoggedIn, isSameUser } = require('../middleware/auth')

router.post('/', isLoggedIn, isSameUser, async (req, res, next) => {
const status = 201

const { userId } = req.params
const query = { _id: userId }
const user = await User.findOne(query)

user.posts.push(req.body)
await user.save()

post = user.posts[user.posts.length - 1]

res.status(status).json({ status, response: post })
})

router.put('/:postId', isLoggedIn, isSameUser, async (req, res, next) => {
const status = 200

const { postId, userId } = req.params
const query = { _id: userId }
const user = await User.findOne(query)
const post = user.posts.id(postId)

const { content, emotion } = req.body
post.content = content
post.emotion = emotion
await user.save()

res.status(status).json({ status, response: post })
})

router.delete('/:postId', isLoggedIn, isSameUser, async (req, res, next) => {
const status = 200

const { postId, userId } = req.params
const query = { _id: userId }
const user = await User.findOne(query)

user.posts = user.posts.filter(post => post.id !== postId)
await user.save()

res.json({ status, response: user })
})

module.exports = router
7 changes: 7 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@ const { NODE_ENV, PORT } = process.env
const express = require('express')
const app = express()

// Enable requests from localhost
app.use(require('cors')({
origin: 'http://localhost:3000',
optionsSuccessStatus: 200
}))

// Database Connection
require('./db/connection')()

Expand All @@ -15,6 +21,7 @@ app.use(require('./api/middleware/set-token'))
// Routes
app.use('/api', require('./api/routes/auth'))
app.use('/api/users', require('./api/routes/users'))
app.use('/api/users/:userId/posts', require('./api/routes/posts'))

// Not Found Handler
app.use((req, res, next) => {
Expand Down
2 changes: 1 addition & 1 deletion nodemon.sample.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"env": {
"MONGO_DB_CONNECTION": "",
"MONGO_DB_CONNECTION": "mongodb+srv://jt-user1:KeRHniXmgkUBZx4l@cluster0-g3oii.mongodb.net/test?retryWrites=true&w=majority",
"NODE_ENV": "development",
"PORT": 5000,
"SECRET_KEY": "MYSECRETKEY"
Expand Down
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"dependencies": {
"bcrypt": "^3.0.6",
"body-parser": "^1.19.0",
"cors": "^2.8.5",
"express": "^4.17.1",
"jsonwebtoken": "^8.5.1",
"mongoose": "^5.6.5"
Expand Down
2 changes: 1 addition & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ This repository contains the backend for the `w6-frontend` repository.

## Installation

1. Fork & Clone this repository
1. Clone this repository

1. `cp nodemon.sample.json nodemon.json`

Expand Down