Skip to content
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.

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

Dev #96

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Dev #96

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
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,16 @@
"dotenv": "^16.0.3",
"express": "^4.18.2",
"jose": "^4.13.1",
"morgan": "^1.10.0"
"morgan": "^1.10.0",
"multer": "^1.4.5-lts.1"
},
"devDependencies": {
"nodemon": "^2.0.21",
"prisma": "^4.11.0"
},
"scripts": {
"dev": "nodemon src/app",
"start": "node src/app",
"start": "node src/app",
"generate": "prisma generate",
"format": "prisma format",
"migrate:dev": "prisma migrate dev",
Expand Down
2 changes: 2 additions & 0 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ app.use(errorHelper)
app.listen(port, () => {
console.log('server: Server listening on port', port)
})

export default app
26 changes: 25 additions & 1 deletion src/controllers/userController.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { comparePasswords, hashPassword } from "../lib/bcrypt/password.js"
import { generateJWT } from "../lib/jose/jwt.js"
import { createUser, getUserByEmail, getUserById, userExists } from "../repository/user.js"
import { createUser, getListOfMembers, getUserByEmail, getUserById, updateProfileById, userExists } from "../repository/user.js"

export const createUserController = async (req, res, next) => {
try {
Expand Down Expand Up @@ -57,3 +57,27 @@ export const getUserInfoController = async (req, res, next) => {
return res.sendStatus(500)
}
}

export const getAllMembersController = async (req, res, next) => {
try {
const allMembers = await getListOfMembers()
if(!allMembers) return res.sendStatus(404)
return res.ok(allMembers)
}
catch(err) {
return res.sendStatus(500)
}
}

export const updatedProfileController = async (req, res, next) => {
try {
let data = req.body
let { userId } = req.locals
const updatedProfile = await updateProfileById(userId, data)
if(!updatedProfile) return res.sendStatusResponse(500, 'Could not update profile.')
return res.ok(updatedProfile)
}
catch(err) {
return res.sendStatus(500)
}
}
22 changes: 21 additions & 1 deletion src/helpers/authHelper.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,27 @@ export const authorizeAdmin = async (req, res, next) => {
next()
}
catch(err) {
console.log(err)
// console.log(err)
return res.sendStatusResponse(403, 'You need to be an admin to perform this action.')
}
}

export const authorizeSelf = async (req, res, next) => {
try {
let { userId } = req.params
let token = req.headers.authorization
let payload = await verifyJWT(token)
// console.log(payload)
if(payload.userId != userId) throw Error('Only the user can access this resource.')
req.locals = {
userId: payload.userId,
profileId: payload.profileId,
role: payload.role
}
next()
}
catch(err) {
// console.log(err)
return res.sendStatusResponse(403, err.message)
}
}
50 changes: 50 additions & 0 deletions src/repository/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,53 @@ export const getUserById = async (id) => {
return null
}
}

export const getListOfMembers = async () => {
try {
const allMembers = await prisma.user.findMany({
select: {
id: true,
email: true,
role: true,
profile: {
select: {
avatar: true,
graduation_year: true,
linkedin_url: true,
name: true,
twitter_username: true,
username: true
}
}
}
})
return allMembers
}
catch(err) {
return null
}
}

export const updateProfileById = async (userId, data) => {
try {
let updatedProfile = await prisma.profile.update({
where: {
userId: userId
},
data: data,
select: {
name: true,
username: true,
avatar: true,
graduation_year: true,
linkedin_url: true,
twitter_username: true
}
})
return updatedProfile
}
catch(err) {
console.error(err)
return null
}
}
6 changes: 4 additions & 2 deletions src/routes/user.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { Router } from "express";
import { createUserController, getUserInfoController, loginUserController } from "../controllers/userController.js";
import { authorizeUser } from "../helpers/authHelper.js";
import { createUserController, getAllMembersController, getUserInfoController, loginUserController, updatedProfileController } from "../controllers/userController.js";
import { authorizeSelf, authorizeUser } from "../helpers/authHelper.js";

const userRouter = Router()

userRouter.post('/create', createUserController)
userRouter.post('/login', loginUserController)
userRouter.get('/', authorizeUser, getUserInfoController)
userRouter.get('/all', authorizeUser, getAllMembersController)
userRouter.put('/profile', authorizeUser, updatedProfileController)

export default userRouter
15 changes: 15 additions & 0 deletions vercel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"version": 2,
"builds": [
{
"src": "src/app.js",
"use": "@now/node"
}
],
"routes": [
{
"src": "/(.*)",
"dest": "src/app.js"
}
]
}
Loading