✨ Improve readability by reformatting conditional expressions and code structure in authentication middleware
This commit is contained in:
@@ -18,7 +18,7 @@ import { verifyToken } from '../utils/jwt-utils.js';
|
|||||||
export function authMiddleware({ secret, optional = false } = {}) {
|
export function authMiddleware({ secret, optional = false } = {}) {
|
||||||
return (req, res, next) => {
|
return (req, res, next) => {
|
||||||
const authHeader = req.headers.authorization;
|
const authHeader = req.headers.authorization;
|
||||||
|
|
||||||
if (!authHeader) {
|
if (!authHeader) {
|
||||||
if (optional) {
|
if (optional) {
|
||||||
req.user = null;
|
req.user = null;
|
||||||
@@ -46,7 +46,9 @@ export function authMiddleware({ secret, optional = false } = {}) {
|
|||||||
req.user = decoded;
|
req.user = decoded;
|
||||||
next();
|
next();
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
const code = err.message.includes('expired') ? 'TOKEN_EXPIRED' : 'INVALID_TOKEN';
|
const code = err.message.includes('expired')
|
||||||
|
? 'TOKEN_EXPIRED'
|
||||||
|
: 'INVALID_TOKEN';
|
||||||
return res.status(401).json({
|
return res.status(401).json({
|
||||||
error: err.message,
|
error: err.message,
|
||||||
code
|
code
|
||||||
@@ -75,7 +77,9 @@ export function requirePermission(requiredPermissions) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const userPermissions = req.user.permissions || [];
|
const userPermissions = req.user.permissions || [];
|
||||||
const hasPermission = permissions.some(perm => userPermissions.includes(perm));
|
const hasPermission = permissions.some(perm =>
|
||||||
|
userPermissions.includes(perm)
|
||||||
|
);
|
||||||
|
|
||||||
if (!hasPermission) {
|
if (!hasPermission) {
|
||||||
return res.status(403).json({
|
return res.status(403).json({
|
||||||
|
|||||||
Reference in New Issue
Block a user