remove unused utilities, fix delete profile image issue
This commit is contained in:
1 parent
ac16126e2e
commit
d53785b768
4 files changed
+3
-39
No files matched your search
@@ -54,24 +54,6 @@ export const optionalNumber = (value: unknown, fieldName: string): number | unde
|
|||||||
throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
|
throw new AppError({ message: `${fieldName} must be a number`, status: 400 });
|
||||||
};
|
};
|
||||||
|
|
||||||
export const optionalBoolean = (value: unknown, fieldName: string): boolean | undefined => {
|
|
||||||
if (value === undefined) {
|
|
||||||
return undefined;
|
|
||||||
}
|
|
||||||
if (typeof value === "boolean") {
|
|
||||||
return value;
|
|
||||||
}
|
|
||||||
if (typeof value === "string") {
|
|
||||||
if (value === "true") {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (value === "false") {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
throw new AppError({ message: `${fieldName} must be a boolean`, status: 400 });
|
|
||||||
};
|
|
||||||
|
|
||||||
export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
|
export const parseMonitorTypeFilter = (value: unknown): MonitorType | MonitorType[] | undefined => {
|
||||||
const parseSingle = (input: unknown): MonitorType => {
|
const parseSingle = (input: unknown): MonitorType => {
|
||||||
if (typeof input !== "string") {
|
if (typeof input !== "string") {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { z } from "zod";
|
import { z } from "zod";
|
||||||
import { UserRoles } from "@/domain/users/user.type.js";
|
import { UserRoles } from "@/domain/users/user.type.js";
|
||||||
import { nameValidation, lowercaseEmailValidation, passwordValidation } from "./shared.js";
|
import { nameValidation, lowercaseEmailValidation, passwordValidation, booleanCoercion } from "@/api/validation/shared.js";
|
||||||
|
|
||||||
//****************************************
|
//****************************************
|
||||||
// User Validations
|
// User Validations
|
||||||
@@ -46,6 +46,7 @@ export const editUserBodyValidation = z
|
|||||||
profilePicture: z.string().optional(),
|
profilePicture: z.string().optional(),
|
||||||
password: passwordValidation.optional(),
|
password: passwordValidation.optional(),
|
||||||
newPassword: passwordValidation.optional(),
|
newPassword: passwordValidation.optional(),
|
||||||
|
deleteProfileImage: booleanCoercion.optional(),
|
||||||
})
|
})
|
||||||
// Changing a password requires both the current password and the new one.
|
// Changing a password requires both the current password and the new one.
|
||||||
// The service only runs the change-password flow when both are present, so
|
// The service only runs the change-password flow when both are present, so
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ import { IUsersRepository } from "@/domain/users/user.repository.interface.js";
|
|||||||
import { UserModel, type UserDocument } from "@/domain/users/user.model.js";
|
import { UserModel, type UserDocument } from "@/domain/users/user.model.js";
|
||||||
import type { User, UserProfileImage } from "@/domain/users/user.type.js";
|
import type { User, UserProfileImage } from "@/domain/users/user.type.js";
|
||||||
import { GenerateAvatarImage } from "@/utils/imageProcessing.js";
|
import { GenerateAvatarImage } from "@/utils/imageProcessing.js";
|
||||||
import { ParseBoolean } from "@/utils/utils.js";
|
|
||||||
import { AppError } from "@/utils/AppError.js";
|
import { AppError } from "@/utils/AppError.js";
|
||||||
import { toStringId, toDateString } from "@/utils/mongoMappers.js";
|
import { toStringId, toDateString } from "@/utils/mongoMappers.js";
|
||||||
const SERVICE_NAME = "MongoUsersRepository";
|
const SERVICE_NAME = "MongoUsersRepository";
|
||||||
@@ -87,9 +86,8 @@ class MongoUsersRepository implements IUsersRepository {
|
|||||||
const candidateUser = { ...patch };
|
const candidateUser = { ...patch };
|
||||||
let unsetFields: Record<string, 1> | undefined;
|
let unsetFields: Record<string, 1> | undefined;
|
||||||
|
|
||||||
if (ParseBoolean(candidateUser.deleteProfileImage) === true) {
|
if (candidateUser.deleteProfileImage === true) {
|
||||||
unsetFields = { profileImage: 1, avatarImage: 1 };
|
unsetFields = { profileImage: 1, avatarImage: 1 };
|
||||||
delete candidateUser.deleteProfileImage;
|
|
||||||
} else if (file) {
|
} else if (file) {
|
||||||
// 1. Save the full size image
|
// 1. Save the full size image
|
||||||
candidateUser.profileImage = {
|
candidateUser.profileImage = {
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
export const ParseBoolean = (value: boolean | string | null | undefined) => {
|
|
||||||
if (value === true || value === "true") {
|
|
||||||
return true;
|
|
||||||
} else if (value === false || value === "false" || value === null || value === undefined) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
export const getTokenFromHeaders = (headers: Record<string, string>) => {
|
|
||||||
const authorizationHeader = headers.authorization;
|
|
||||||
if (!authorizationHeader) throw new Error("No auth headers");
|
|
||||||
|
|
||||||
const parts = authorizationHeader.split(" ");
|
|
||||||
if (parts.length !== 2 || parts[0] !== "Bearer") throw new Error("Invalid auth headers");
|
|
||||||
|
|
||||||
return parts[1];
|
|
||||||
};
|
|
||||||
Reference in new issue
Block a user