generated from azures04/Base-REST-API
Add bans, user cache, auth routes & token changes
Introduce user bans and caching, extend schemas, and add auth/user endpoints. Adds bans DDL and banRepo plus adminService to manage bans; introduces modules/cache for in-memory user caching used by authService and userService. Updates users and credentials DDLs (role, isDisabled, shouldReset). Changes tokensService to include role in access tokens and store refresh tokens as SHA-256 hashes. Updates repos (credentials create RETURNING, usersRepo.updateProfile positional params), enhances authService with isLogged/isNotLogged middleware, ban checks, and refreshed token flow. Adds auth routes (login, logout, refresh, register) and user routes (/me).
This commit is contained in:
+45
-6
@@ -1,5 +1,7 @@
|
||||
const cache = require("../modules/cache")
|
||||
const bcrypt = require("bcryptjs")
|
||||
const usersRepo = require("../repositories/usersRepo")
|
||||
const adminService = require("./adminService")
|
||||
const tokensService = require("./tokensService")
|
||||
const identitiesRepo = require("../repositories/identitiesRepo")
|
||||
const credentialsRepo = require("../repositories/credentialsRepo")
|
||||
@@ -10,7 +12,7 @@ async function registerLocal({ identifier, password, profile = { displayName, av
|
||||
const user = await usersRepo.create(identifier, process.env.SERVER_UUID, null, profile.displayName, profile.avatarURL)
|
||||
const hashedPassword = await bcrypt.hash(password, Number(process.env.BCRYPT_SALT))
|
||||
const credentials = await credentialsRepo.create(user.id, hashedPassword)
|
||||
if (Array.isArray(credentials)) {
|
||||
if (credentials.length == 0) {
|
||||
throw new DefaultError(500, "Internal Server Error", "UserRegistration")
|
||||
}
|
||||
return user
|
||||
@@ -41,13 +43,13 @@ async function loginLocal({ identifier, password }) {
|
||||
}
|
||||
}
|
||||
|
||||
async function refreshAccessToken({ userId, refreshToken }) {
|
||||
async function refreshAccessToken({ refreshToken }) {
|
||||
try {
|
||||
await tokensService.verifyRefreshToken(refreshToken)
|
||||
const payload = await tokensService.verifyRefreshToken(refreshToken)
|
||||
await tokensService.revokeRefreshToken(refreshToken)
|
||||
const user = await usersRepo.findById(userId)
|
||||
const user = await usersRepo.findById(payload.userId)
|
||||
const newAccessToken = await tokensService.signToken(user)
|
||||
const newRefreshToken = await tokensService.signRefreshToken(userId)
|
||||
const newRefreshToken = await tokensService.signRefreshToken(user.id)
|
||||
return { accessToken: newAccessToken, refreshToken: newRefreshToken }
|
||||
} catch (error) {
|
||||
throw error
|
||||
@@ -74,10 +76,47 @@ async function resetPassword({ userId, newPassword }) {
|
||||
}
|
||||
}
|
||||
|
||||
async function isNotLogged(req, res, next) {
|
||||
if (req.headers.authorization && req.headers.authorization.startsWith("Bearer")) {
|
||||
throw new DefaultError(401, "You must be logged out to do this action", "Auth header")
|
||||
}
|
||||
|
||||
next()
|
||||
}
|
||||
|
||||
async function isLogged(req, res, next) {
|
||||
if (!req.headers.authorization) {
|
||||
throw new DefaultError(401, "You must be logged in to do this action", "Auth header")
|
||||
}
|
||||
if (!req.headers.authorization.startsWith("Bearer ")) {
|
||||
throw new DefaultError(422, "Wrong auth header format", "WhereIsBearer")
|
||||
}
|
||||
|
||||
const tokenVerified = await tokensService.verifyAccessToken(req.headers.authorization.replace("Bearer ", ""))
|
||||
const isBanned = await adminService.isUserBanned(tokenVerified.id)
|
||||
if (isBanned) {
|
||||
throw new DefaultError(403, "You're not allowed to do this action", "Banned")
|
||||
}
|
||||
|
||||
let user = cache.users.get(tokenVerified.id)
|
||||
if (!user) {
|
||||
user = await usersRepo.findById(tokenVerified.id)
|
||||
if (!user) {
|
||||
throw new DefaultError(404, "User not found", "UserNotFound")
|
||||
}
|
||||
cache.users.put(tokenVerified.id, user)
|
||||
}
|
||||
|
||||
req.user = user
|
||||
next()
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
isLogged,
|
||||
loginLocal,
|
||||
isNotLogged,
|
||||
resetPassword,
|
||||
registerLocal,
|
||||
changePassword,
|
||||
refreshAccessToken
|
||||
refreshAccessToken,
|
||||
}
|
||||
Reference in New Issue
Block a user