type authController correctly, update services accordingly
This commit is contained in:
1 parent
3e26387b9d
commit
2fdd5a72f0
4 files changed
+89
-78
No files matched your search
@@ -1,7 +1,6 @@
|
|||||||
import { Request, Response, NextFunction } from "express";
|
import { Request, Response, NextFunction } from "express";
|
||||||
import { AppError } from "@/utils/AppError.js";
|
import { AppError } from "@/utils/AppError.js";
|
||||||
import { requireTeamId, requireUserRoles } from "./controllerUtils.js";
|
import { requireTeamId, requireUserEmail, requireUserId, requireUserRoles } from "@/controllers/controllerUtils.js";
|
||||||
import type { UserRole } from "@/types/user.js";
|
|
||||||
|
|
||||||
import {
|
import {
|
||||||
registrationBodyValidation,
|
registrationBodyValidation,
|
||||||
@@ -20,15 +19,16 @@ import {
|
|||||||
editSuperadminUserByIdBodyValidation,
|
editSuperadminUserByIdBodyValidation,
|
||||||
editUserPasswordByIdBodyValidation,
|
editUserPasswordByIdBodyValidation,
|
||||||
} from "@/validation/userValidation.js";
|
} from "@/validation/userValidation.js";
|
||||||
|
import { IUserService } from "@/service/index.js";
|
||||||
|
|
||||||
const SERVICE_NAME = "authController";
|
const SERVICE_NAME = "authController";
|
||||||
|
|
||||||
class AuthController {
|
class AuthController {
|
||||||
static SERVICE_NAME = SERVICE_NAME;
|
static SERVICE_NAME = SERVICE_NAME;
|
||||||
|
|
||||||
private userService: any;
|
private userService: IUserService;
|
||||||
|
|
||||||
constructor(userService: any) {
|
constructor(userService: IUserService) {
|
||||||
this.userService = userService;
|
this.userService = userService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,11 +41,12 @@ class AuthController {
|
|||||||
const newUser = req.body.user;
|
const newUser = req.body.user;
|
||||||
const newUserToken = req.body.token;
|
const newUserToken = req.body.token;
|
||||||
if (newUser?.email) {
|
if (newUser?.email) {
|
||||||
newUser.email = newUser.email.toLowerCase();
|
const newUserEmail = requireUserEmail(newUser.email);
|
||||||
|
newUser.email = newUserEmail.toLowerCase();
|
||||||
}
|
}
|
||||||
registrationBodyValidation.parse(newUser);
|
registrationBodyValidation.parse(newUser);
|
||||||
|
|
||||||
const { user, token } = await this.userService.registerUser(newUser, newUserToken, req.file);
|
const { user, token } = await this.userService.registerUser(newUser, newUserToken, req?.file ?? null);
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
success: true,
|
success: true,
|
||||||
msg: "User registered successfully",
|
msg: "User registered successfully",
|
||||||
@@ -62,11 +63,11 @@ class AuthController {
|
|||||||
if (userData?.email) {
|
if (userData?.email) {
|
||||||
userData.email = userData.email.toLowerCase();
|
userData.email = userData.email.toLowerCase();
|
||||||
}
|
}
|
||||||
createUserBodyValidation.parse(userData);
|
const validatedBody = createUserBodyValidation.parse(userData);
|
||||||
|
|
||||||
const teamId = requireTeamId(req.user?.teamId);
|
const teamId = requireTeamId(req.user?.teamId);
|
||||||
const actorRoles = requireUserRoles(req.user?.role) as UserRole[];
|
const actorRoles = requireUserRoles(req.user?.role);
|
||||||
const newUser = await this.userService.createUser(userData, teamId, actorRoles, req.file);
|
const newUser = await this.userService.createUser(validatedBody, teamId, actorRoles, req?.file ?? null);
|
||||||
res.status(201).json({
|
res.status(201).json({
|
||||||
success: true,
|
success: true,
|
||||||
msg: "User created successfully",
|
msg: "User created successfully",
|
||||||
@@ -101,7 +102,9 @@ class AuthController {
|
|||||||
editUser = async (req: Request, res: Response, next: NextFunction) => {
|
editUser = async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
const validatedBody = editUserBodyValidation.parse(req.body);
|
const validatedBody = editUserBodyValidation.parse(req.body);
|
||||||
const updatedUser = await this.userService.editUser(validatedBody, req.file, req.user);
|
const userId = requireUserId(req.user?.id);
|
||||||
|
const userEmail = requireUserEmail(req.user?.email);
|
||||||
|
const updatedUser = await this.userService.editUser(validatedBody, req?.file ?? null, userId, userEmail);
|
||||||
|
|
||||||
res.status(200).json({
|
res.status(200).json({
|
||||||
success: true,
|
success: true,
|
||||||
@@ -170,7 +173,15 @@ class AuthController {
|
|||||||
|
|
||||||
deleteUser = async (req: Request, res: Response, next: NextFunction) => {
|
deleteUser = async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
await this.userService.deleteUser(req.user);
|
const userId = requireUserId(req.user?.id);
|
||||||
|
const teamId = requireTeamId(req.user?.teamId);
|
||||||
|
const roles = requireUserRoles(req.user?.role);
|
||||||
|
|
||||||
|
await this.userService.deleteUser({
|
||||||
|
userId,
|
||||||
|
teamId,
|
||||||
|
roles,
|
||||||
|
});
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
success: true,
|
success: true,
|
||||||
msg: "User deleted successfully",
|
msg: "User deleted successfully",
|
||||||
@@ -182,9 +193,12 @@ class AuthController {
|
|||||||
|
|
||||||
deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
|
deleteUserById = async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
getUserByIdParamValidation.parse(req.params);
|
const validatedParams = getUserByIdParamValidation.parse(req.params);
|
||||||
const targetUserId = req.params.userId;
|
const targetUserId = validatedParams.userId;
|
||||||
await this.userService.deleteUserById(req.user, targetUserId);
|
const actorId = requireUserId(req.user?.id);
|
||||||
|
const actorTeamId = requireTeamId(req.user?.teamId);
|
||||||
|
const actorRoles = requireUserRoles(req.user?.role);
|
||||||
|
await this.userService.deleteUserById({ actorId, actorTeamId, actorRoles, targetUserId });
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
success: true,
|
success: true,
|
||||||
msg: "User removed successfully",
|
msg: "User removed successfully",
|
||||||
@@ -231,24 +245,19 @@ class AuthController {
|
|||||||
|
|
||||||
editUserById = async (req: Request, res: Response, next: NextFunction) => {
|
editUserById = async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
const roles = req?.user?.role;
|
const roles = requireUserRoles(req.user?.role);
|
||||||
|
const actorId = requireUserId(req.user?.id);
|
||||||
|
|
||||||
if (!roles || !roles.includes("superadmin")) {
|
if (!roles || !roles.includes("superadmin")) {
|
||||||
throw new AppError({ message: "Unauthorized", status: 403 });
|
throw new AppError({ message: "Unauthorized", status: 403 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const userId = req.params.userId as string;
|
const validatedParams = editUserByIdParamValidation.parse(req.params);
|
||||||
const user = { ...req.body };
|
|
||||||
|
|
||||||
editUserByIdParamValidation.parse(req.params);
|
|
||||||
// If this is superadmin self edit, allow "superadmin" role
|
// If this is superadmin self edit, allow "superadmin" role
|
||||||
if (userId === req.user?.id) {
|
const validatedBody =
|
||||||
editSuperadminUserByIdBodyValidation.parse(req.body);
|
validatedParams.userId === actorId ? editSuperadminUserByIdBodyValidation.parse(req.body) : editUserByIdBodyValidation.parse(req.body);
|
||||||
} else {
|
|
||||||
editUserByIdBodyValidation.parse(req.body);
|
|
||||||
}
|
|
||||||
|
|
||||||
await this.userService.editUserById(userId, user);
|
await this.userService.editUserById(validatedParams.userId, validatedBody);
|
||||||
return res.status(200).json({ success: true, msg: "ok" });
|
return res.status(200).json({ success: true, msg: "ok" });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
next(error);
|
next(error);
|
||||||
@@ -257,16 +266,14 @@ class AuthController {
|
|||||||
|
|
||||||
editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
|
editUserPasswordById = async (req: Request, res: Response, next: NextFunction) => {
|
||||||
try {
|
try {
|
||||||
const roles = req?.user?.role;
|
const roles = requireUserRoles(req.user?.role);
|
||||||
if (!roles || !roles.includes("superadmin")) {
|
if (!roles || !roles.includes("superadmin")) {
|
||||||
throw new AppError({ message: "Unauthorized", status: 403 });
|
throw new AppError({ message: "Unauthorized", status: 403 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const userId = req.params.userId as string;
|
const validatedParams = editUserByIdParamValidation.parse(req.params);
|
||||||
editUserByIdParamValidation.parse(req.params);
|
const validatedBody = editUserPasswordByIdBodyValidation.parse(req.body);
|
||||||
editUserPasswordByIdBodyValidation.parse(req.body);
|
await this.userService.setPasswordByUserId(validatedParams.userId, validatedBody.password);
|
||||||
const updatedPassword = req.body.password;
|
|
||||||
await this.userService.setPasswordByUserId(userId, updatedPassword);
|
|
||||||
return res.status(200).json({ success: true, msg: "Password reset successfully" });
|
return res.status(200).json({ success: true, msg: "Password reset successfully" });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
next(error);
|
next(error);
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { AppError } from "@/utils/AppError.js";
|
import { AppError } from "@/utils/AppError.js";
|
||||||
import { type MonitorType, MonitorTypes } from "@/types/index.js";
|
import { type MonitorType, MonitorTypes, UserRole } from "@/types/index.js";
|
||||||
|
|
||||||
const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
|
const fetchMonitorCertificate = async (sslChecker: any, monitor: any): Promise<any> => {
|
||||||
const monitorUrl = new URL(monitor.url);
|
const monitorUrl = new URL(monitor.url);
|
||||||
@@ -112,7 +112,7 @@ const requireUserEmail = (userEmail?: string): string => {
|
|||||||
return userEmail;
|
return userEmail;
|
||||||
};
|
};
|
||||||
|
|
||||||
export const requireUserRoles = (userRoles?: string[]): string[] => {
|
export const requireUserRoles = (userRoles?: UserRole[]): UserRole[] => {
|
||||||
if (!userRoles || userRoles.length === 0) {
|
if (!userRoles || userRoles.length === 0) {
|
||||||
throw new AppError({ message: "User roles are required", status: 400 });
|
throw new AppError({ message: "User roles are required", status: 400 });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,24 +12,31 @@ import bcrypt from "bcryptjs";
|
|||||||
import { AppError } from "@/utils/AppError.js";
|
import { AppError } from "@/utils/AppError.js";
|
||||||
import { ISuperSimpleQueue } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
|
import { ISuperSimpleQueue } from "@/service/infrastructure/SuperSimpleQueue/SuperSimpleQueue.js";
|
||||||
import { IEmailService } from "@/service/infrastructure/emailService.js";
|
import { IEmailService } from "@/service/infrastructure/emailService.js";
|
||||||
import { ISettingsService } from "@/service/system/settingsService.js";
|
import { EnvConfig, ISettingsService } from "@/service/system/settingsService.js";
|
||||||
import { ILogger } from "@/utils/logger.js";
|
import { ILogger } from "@/utils/logger.js";
|
||||||
import jwt from "jsonwebtoken";
|
import jwt from "jsonwebtoken";
|
||||||
|
import crypto from "crypto";
|
||||||
|
type CryptoType = typeof crypto;
|
||||||
type JwtType = typeof jwt;
|
type JwtType = typeof jwt;
|
||||||
const SERVICE_NAME = "userService";
|
const SERVICE_NAME = "userService";
|
||||||
|
|
||||||
export interface IUserService {
|
export interface IUserService {
|
||||||
issueToken(payload: Partial<User>, appSettings: { jwtTTL?: string; jwtSecret?: string }): string;
|
issueToken(payload: Partial<User>, appSettings: EnvConfig): string;
|
||||||
registerUser(user: Partial<User>, inviteToken: string, file: unknown): Promise<{ user: User; token: string }>;
|
registerUser(user: Partial<User>, inviteToken: string, file: Express.Multer.File | null): Promise<{ user: User; token: string }>;
|
||||||
createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: unknown): Promise<User>;
|
createUser(userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null): Promise<User>;
|
||||||
loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
|
loginUser(email: string, password: string): Promise<{ user: User; token: string }>;
|
||||||
editUser(updates: Partial<User & { newPassword?: string }>, file: unknown, currentUser: User): Promise<User>;
|
editUser(
|
||||||
|
updates: Partial<User & { newPassword?: string }>,
|
||||||
|
file: Express.Multer.File | null,
|
||||||
|
currentUserId: string,
|
||||||
|
currentUserEmail: string
|
||||||
|
): Promise<User>;
|
||||||
checkSuperadminExists(): Promise<boolean>;
|
checkSuperadminExists(): Promise<boolean>;
|
||||||
requestRecovery(email: string): Promise<string | false | undefined>;
|
requestRecovery(email: string): Promise<string | false | undefined>;
|
||||||
validateRecovery(recoveryToken: string): Promise<void>;
|
validateRecovery(recoveryToken: string): Promise<void>;
|
||||||
resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
|
resetPassword(password: string, recoveryToken: string): Promise<{ user: User; token: string }>;
|
||||||
deleteUser(user: User): Promise<void>;
|
deleteUser(params: { userId: string; teamId: string; roles: UserRole[] }): Promise<void>;
|
||||||
deleteUserById(actor: User, targetUserId: string): Promise<void>;
|
deleteUserById(params: { actorId: string; actorTeamId: string; actorRoles: UserRole[]; targetUserId: string }): Promise<void>;
|
||||||
getAllUsers(): Promise<User[]>;
|
getAllUsers(): Promise<User[]>;
|
||||||
getUserById(roles: UserRole[], userId: string): Promise<User>;
|
getUserById(roles: UserRole[], userId: string): Promise<User>;
|
||||||
editUserById(userId: string, patch: Partial<User>): Promise<void>;
|
editUserById(userId: string, patch: Partial<User>): Promise<void>;
|
||||||
@@ -49,7 +56,7 @@ export class UserService implements IUserService {
|
|||||||
private logger: ILogger;
|
private logger: ILogger;
|
||||||
private jwt: JwtType;
|
private jwt: JwtType;
|
||||||
private jobQueue: ISuperSimpleQueue;
|
private jobQueue: ISuperSimpleQueue;
|
||||||
private crypto: any;
|
private crypto: CryptoType;
|
||||||
private monitorsRepository: IMonitorsRepository;
|
private monitorsRepository: IMonitorsRepository;
|
||||||
private usersRepository: IUsersRepository;
|
private usersRepository: IUsersRepository;
|
||||||
private invitesRepository: IInvitesRepository;
|
private invitesRepository: IInvitesRepository;
|
||||||
@@ -71,7 +78,7 @@ export class UserService implements IUserService {
|
|||||||
settingsRepository,
|
settingsRepository,
|
||||||
teamsRepository,
|
teamsRepository,
|
||||||
}: {
|
}: {
|
||||||
crypto: any;
|
crypto: CryptoType;
|
||||||
emailService: IEmailService;
|
emailService: IEmailService;
|
||||||
settingsService: ISettingsService;
|
settingsService: ISettingsService;
|
||||||
logger: ILogger;
|
logger: ILogger;
|
||||||
@@ -102,14 +109,14 @@ export class UserService implements IUserService {
|
|||||||
return UserService.SERVICE_NAME;
|
return UserService.SERVICE_NAME;
|
||||||
}
|
}
|
||||||
|
|
||||||
issueToken = (payload: any, appSettings: any) => {
|
issueToken = (payload: Partial<User>, appSettings: EnvConfig) => {
|
||||||
const tokenTTL = appSettings?.jwtTTL ?? "2h";
|
const tokenTTL = appSettings?.jwtTTL ?? "2h";
|
||||||
const tokenSecret = appSettings?.jwtSecret;
|
const tokenSecret = appSettings?.jwtSecret;
|
||||||
const payloadData = payload;
|
const payloadData = payload;
|
||||||
return this.jwt.sign(payloadData, tokenSecret, { expiresIn: tokenTTL });
|
return this.jwt.sign(payloadData, tokenSecret, { expiresIn: tokenTTL });
|
||||||
};
|
};
|
||||||
|
|
||||||
registerUser = async (user: Partial<User>, inviteToken: string, file: any) => {
|
registerUser = async (user: Partial<User>, inviteToken: string, file: Express.Multer.File | null) => {
|
||||||
// Create a new user
|
// Create a new user
|
||||||
// If superAdmin exists, a token should be attached to all further register requests
|
// If superAdmin exists, a token should be attached to all further register requests
|
||||||
const superAdminExists = await this.usersRepository.findSuperAdmin();
|
const superAdminExists = await this.usersRepository.findSuperAdmin();
|
||||||
@@ -179,7 +186,7 @@ export class UserService implements IUserService {
|
|||||||
return { user: newUser, token };
|
return { user: newUser, token };
|
||||||
};
|
};
|
||||||
|
|
||||||
createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: any) => {
|
createUser = async (userData: Partial<User>, teamId: string, actorRoles: UserRole[], file: Express.Multer.File | null) => {
|
||||||
// Validate that the creator can assign the requested roles
|
// Validate that the creator can assign the requested roles
|
||||||
const targetRoles = userData.role ?? [];
|
const targetRoles = userData.role ?? [];
|
||||||
for (const targetRole of targetRoles) {
|
for (const targetRole of targetRoles) {
|
||||||
@@ -239,14 +246,19 @@ export class UserService implements IUserService {
|
|||||||
return { user: userWithoutPassword, token };
|
return { user: userWithoutPassword, token };
|
||||||
};
|
};
|
||||||
|
|
||||||
editUser = async (updates: Partial<User & { newPassword?: string }>, file: any, currentUser: any) => {
|
editUser = async (
|
||||||
|
updates: Partial<User & { newPassword?: string }>,
|
||||||
|
file: Express.Multer.File | null,
|
||||||
|
currentUserId: string,
|
||||||
|
currentUserEmail: string
|
||||||
|
) => {
|
||||||
// Change Password check
|
// Change Password check
|
||||||
if (updates?.password && updates?.newPassword) {
|
if (updates?.password && updates?.newPassword) {
|
||||||
// Get user's email
|
// Get user's email
|
||||||
// Add user email to body for DB operation
|
// Add user email to body for DB operation
|
||||||
updates.email = currentUser.email;
|
updates.email = currentUserEmail;
|
||||||
// Get user
|
// Get user
|
||||||
const user = await this.usersRepository.findByEmail(currentUser.email);
|
const user = await this.usersRepository.findByEmail(currentUserEmail);
|
||||||
// Compare passwords
|
// Compare passwords
|
||||||
const match = await bcrypt.compare(updates?.password, user.password);
|
const match = await bcrypt.compare(updates?.password, user.password);
|
||||||
// If not a match, throw a 403
|
// If not a match, throw a 403
|
||||||
@@ -259,7 +271,7 @@ export class UserService implements IUserService {
|
|||||||
delete updates.newPassword;
|
delete updates.newPassword;
|
||||||
}
|
}
|
||||||
|
|
||||||
return await this.usersRepository.updateById(currentUser.id, updates, file);
|
return await this.usersRepository.updateById(currentUserId, updates, file);
|
||||||
};
|
};
|
||||||
|
|
||||||
checkSuperadminExists = async () => {
|
checkSuperadminExists = async () => {
|
||||||
@@ -319,24 +331,7 @@ export class UserService implements IUserService {
|
|||||||
return { user: existingUser, token };
|
return { user: existingUser, token };
|
||||||
};
|
};
|
||||||
|
|
||||||
deleteUser = async (user: User) => {
|
deleteUser = async ({ userId, teamId, roles }: { userId: string; teamId: string; roles: UserRole[] }) => {
|
||||||
const email = user?.email;
|
|
||||||
if (!email) {
|
|
||||||
throw new AppError({ message: "No email in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const teamId = user?.teamId;
|
|
||||||
const userId = user?.id;
|
|
||||||
|
|
||||||
if (!teamId) {
|
|
||||||
throw new AppError({ message: "No team ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!userId) {
|
|
||||||
throw new AppError({ message: "No user ID in request", service: SERVICE_NAME, method: "deleteUser", status: 400 });
|
|
||||||
}
|
|
||||||
|
|
||||||
const roles = user?.role;
|
|
||||||
if (roles.includes("demo")) {
|
if (roles.includes("demo")) {
|
||||||
throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUser", status: 400 });
|
throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUser", status: 400 });
|
||||||
}
|
}
|
||||||
@@ -358,14 +353,24 @@ export class UserService implements IUserService {
|
|||||||
await this.usersRepository.deleteById(userId);
|
await this.usersRepository.deleteById(userId);
|
||||||
};
|
};
|
||||||
|
|
||||||
deleteUserById = async (actor: User, targetUserId: string) => {
|
deleteUserById = async ({
|
||||||
if (actor.id === targetUserId) {
|
actorId,
|
||||||
|
actorRoles,
|
||||||
|
actorTeamId,
|
||||||
|
targetUserId,
|
||||||
|
}: {
|
||||||
|
actorId: string;
|
||||||
|
actorTeamId: string;
|
||||||
|
actorRoles: UserRole[];
|
||||||
|
targetUserId: string;
|
||||||
|
}) => {
|
||||||
|
if (actorId === targetUserId) {
|
||||||
throw new AppError({ message: "Cannot delete your own account from here", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
|
throw new AppError({ message: "Cannot delete your own account from here", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const targetUser = await this.usersRepository.findById(targetUserId);
|
const targetUser = await this.usersRepository.findById(targetUserId);
|
||||||
|
|
||||||
if (targetUser.teamId !== actor.teamId) {
|
if (targetUser.teamId !== actorTeamId) {
|
||||||
throw new AppError({ message: "User is not on your team", service: SERVICE_NAME, method: "deleteUserById", status: 403 });
|
throw new AppError({ message: "User is not on your team", service: SERVICE_NAME, method: "deleteUserById", status: 403 });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -373,7 +378,6 @@ export class UserService implements IUserService {
|
|||||||
throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
|
throw new AppError({ message: "Demo user cannot be deleted", service: SERVICE_NAME, method: "deleteUserById", status: 400 });
|
||||||
}
|
}
|
||||||
|
|
||||||
const actorRoles = actor.role;
|
|
||||||
const targetRoles = targetUser.role;
|
const targetRoles = targetUser.role;
|
||||||
|
|
||||||
// Check actor can manage all of target's roles
|
// Check actor can manage all of target's roles
|
||||||
@@ -392,7 +396,7 @@ export class UserService implements IUserService {
|
|||||||
await this.usersRepository.deleteById(targetUserId);
|
await this.usersRepository.deleteById(targetUserId);
|
||||||
|
|
||||||
this.logger.info({
|
this.logger.info({
|
||||||
message: `User ${targetUserId} deleted by ${actor.id}`,
|
message: `User ${targetUserId} deleted by ${actorId}`,
|
||||||
service: SERVICE_NAME,
|
service: SERVICE_NAME,
|
||||||
method: "deleteUserById",
|
method: "deleteUserById",
|
||||||
});
|
});
|
||||||
@@ -402,7 +406,7 @@ export class UserService implements IUserService {
|
|||||||
return await this.usersRepository.findAll();
|
return await this.usersRepository.findAll();
|
||||||
};
|
};
|
||||||
|
|
||||||
getUserById = async (roles: any, userId: any) => {
|
getUserById = async (roles: UserRole[], userId: string) => {
|
||||||
if (!roles.includes("superadmin") && !roles.includes("admin")) {
|
if (!roles.includes("superadmin") && !roles.includes("admin")) {
|
||||||
throw new AppError({ message: "Insufficient permissions", service: SERVICE_NAME, status: 403 });
|
throw new AppError({ message: "Insufficient permissions", service: SERVICE_NAME, status: 403 });
|
||||||
}
|
}
|
||||||
@@ -411,11 +415,11 @@ export class UserService implements IUserService {
|
|||||||
return user;
|
return user;
|
||||||
};
|
};
|
||||||
|
|
||||||
editUserById = async (userId: any, patch: Partial<User>) => {
|
editUserById = async (userId: string, patch: Partial<User>) => {
|
||||||
await this.usersRepository.updateById(userId, patch, null);
|
await this.usersRepository.updateById(userId, patch, null);
|
||||||
};
|
};
|
||||||
|
|
||||||
setPasswordByUserId = async (userId: any, password: string) => {
|
setPasswordByUserId = async (userId: string, password: string) => {
|
||||||
const hashedPassword = this.hashPassword(password);
|
const hashedPassword = this.hashPassword(password);
|
||||||
const updatedUser = await this.usersRepository.updateById(userId, { password: hashedPassword }, null);
|
const updatedUser = await this.usersRepository.updateById(userId, { password: hashedPassword }, null);
|
||||||
return updatedUser;
|
return updatedUser;
|
||||||
|
|||||||
@@ -2,12 +2,12 @@ import { ISettingsRepository } from "@/repositories/index.js";
|
|||||||
import { Settings } from "@/types/index.js";
|
import { Settings } from "@/types/index.js";
|
||||||
import { AppError } from "@/utils/AppError.js";
|
import { AppError } from "@/utils/AppError.js";
|
||||||
import { ValidatedEnv } from "@/validation/envValidation.js";
|
import { ValidatedEnv } from "@/validation/envValidation.js";
|
||||||
|
import type { StringValue } from "ms";
|
||||||
const SERVICE_NAME = "SettingsService";
|
const SERVICE_NAME = "SettingsService";
|
||||||
|
|
||||||
export type EnvConfig = {
|
export type EnvConfig = {
|
||||||
jwtSecret: string;
|
jwtSecret: string;
|
||||||
jwtTTL: string;
|
jwtTTL: StringValue;
|
||||||
nodeEnv: string;
|
nodeEnv: string;
|
||||||
logLevel: string;
|
logLevel: string;
|
||||||
clientHost: string;
|
clientHost: string;
|
||||||
@@ -30,7 +30,7 @@ export class SettingsService implements ISettingsService {
|
|||||||
this.settingsRepository = settingsRepository;
|
this.settingsRepository = settingsRepository;
|
||||||
this.settings = {
|
this.settings = {
|
||||||
jwtSecret: env.JWT_SECRET,
|
jwtSecret: env.JWT_SECRET,
|
||||||
jwtTTL: env.TOKEN_TTL,
|
jwtTTL: env.TOKEN_TTL as StringValue,
|
||||||
nodeEnv: env.NODE_ENV,
|
nodeEnv: env.NODE_ENV,
|
||||||
logLevel: env.LOG_LEVEL,
|
logLevel: env.LOG_LEVEL,
|
||||||
clientHost: env.CLIENT_HOST,
|
clientHost: env.CLIENT_HOST,
|
||||||
|
|||||||
Reference in new issue
Block a user