Refactor logger usage and add userRepository module

Replaces custom logger instantiation with a shared logger import across modules and routes. Moves player property and privilege management from authRepository to a new userRepository, expanding userRepository with additional user management functions (ban, unban, preferences, privileges, bans). Updates service and route files to use userRepository where appropriate. Adds new session join route and schema, and utility for UUID formatting.
This commit is contained in:
2025-12-24 04:22:43 +01:00
parent 80bca31d9a
commit 2519d8078a
18 changed files with 438 additions and 76 deletions

View File

@@ -1,11 +1,9 @@
const path = require("path")
const express = require("express")
const router = express.Router()
const { YggdrasilError } = require("../../errors/errors")
const rateLimit = require("express-rate-limit")
const authService = require("../../services/authService")
const Logger = require("../../modules/logger")
const logger = Logger.createLogger(path.join(__dirname, "..", ".."))
const logger = require("../../modules/logger")
const limiter = rateLimit({
windowMs: 15 * 60 * 1000,

View File

@@ -1,9 +1,7 @@
const path = require("node:path")
const express = require("express")
const router = express.Router()
const authService = require("../../services/authService")
const Logger = require("../../modules/logger")
const logger = Logger.createLogger(path.join(__dirname, "..", ".."))
const logger = require("../../modules/logger")
const { DefaultError, YggdrasilError } = require("../../errors/errors")
router.post("/", async (req, res) => {

View File

@@ -1,9 +1,7 @@
const path = require("node:path")
const express = require("express")
const router = express.Router()
const authService = require("../../services/authService")
const Logger = require("../../modules/logger")
const logger = Logger.createLogger(path.join(__dirname, "..", ".."))
const logger = require("../../modules/logger")
const { DefaultError, YggdrasilError } = require("../../errors/errors")
router.post("/", async (req, res) => {

View File

@@ -1,8 +1,6 @@
const path = require("node:path")
const express = require("express")
const router = express.Router()
const Logger = require("../modules/logger")
const logger = Logger.createLogger(path.join(__dirname, ".."))
const logger = require("../modules/logger")
const authService = require("../services/authService")
router.post("/", async (req, res) => {

View File

@@ -1,10 +1,8 @@
const path = require("path")
const express = require("express")
const router = express.Router()
const sessionsService = require("../../../../services/sessionsService")
const Logger = require("../../../../modules/logger")
const logger = require("../../../../modules/logger")
const { YggdrasilError, DefaultError } = require("../../../../errors/errors")
const logger = Logger.createLogger(path.join(__dirname, "..", "..", "..", ".."))
router.get("/", async (req, res) => {
const { username, serverId, ip } = req.query

View File

@@ -0,0 +1,66 @@
const path = require("path")
const express = require("express")
const router = express.Router()
const utils = require("../../../../modules/utils")
const authService = require("../../../../services/authService")
const sessionsService = require("../../../../services/sessionsService")
const userRepository = require("../../../../repositories/userRepository")
const logger = require("../../../../modules/logger")
const { SessionError, DefaultError } = require("../../../../errors/errors")
router.post("/", async (req, res) => {
const { accessToken, selectedProfile, serverId } = req.body
try {
const verificationResult = await authService.verifyAccessToken({ accessToken })
const tokenUuid = verificationResult.user.uuid
const requestedProfile = utils.addDashesToUUID(selectedProfile)
if (tokenUuid !== requestedProfile) {
throw new SessionError(403, "Forbidden", "You cannot join with a profile that is not yours.", req.originalUrl)
}
const bansResult = await userRepository.getPlayerBans(tokenUuid)
if (bansResult.code === 200 && bansResult.bans && bansResult.bans.length > 0) {
const activeBan = bansResult.bans[0]
throw new SessionError(
403,
"UserBannedException",
activeBan.reasonMessage || "You are banned from multiplayer.",
req.originalUrl
)
}
try {
const privsResult = await userRepository.getPlayerPrivileges(tokenUuid)
if (privsResult.code === 200 && privsResult.data) {
if (!privsResult.data.multiplayerServer) {
throw new SessionError(403, "InsufficientPrivilegesException", "Multiplayer is disabled for your account.", req.originalUrl)
}
}
} catch (privError) {
if (privError instanceof DefaultError && privError.code !== 404) throw privError
}
const ip = req.headers["x-forwarded-for"] || req.socket.remoteAddress
await sessionsService.joinServer({
clientToken: verificationResult.session.clientToken,
accessToken,
selectedProfile: requestedProfile,
serverId,
ip
})
logger.log(`Server join success: ${verificationResult.user.username}`, ["SESSION", "green"])
return res.status(204).end()
} catch (err) {
console.log(err)
if (err instanceof SessionError) throw err
if (err instanceof DefaultError) {
const statusCode = err.code === 401 ? 403 : (err.code || 500)
const errorName = "Forbidden"
throw new SessionError(statusCode, errorName, err.message, req.originalUrl)
}
throw new SessionError(500, "Forbidden", "Internal Server Error", req.originalUrl)
}
})
module.exports = router

View File

@@ -17,12 +17,12 @@ router.get("", async (req, res) => {
return res.status(200).json(result.data)
}
if (result.code === 204) {
throw new SessionError(404, "Not a valid UUID", req.originalUrl)
throw new SessionError(404, undefined, "Not a valid UUID", req.originalUrl)
}
throw new DefaultError(500, "Unknown error")
throw new DefaultError(500, undefined, "Unknown error", req.originalUrl)
} catch (err) {
const errorMessage = err.message || "Not a valid UUID"
throw new SessionError(400, errorMessage, req.originalUrl)
throw new SessionError(400, undefined, errorMessage, req.originalUrl)
}
})