mirror of
https://github.com/immich-app/immich.git
synced 2025-03-11 15:09:45 +02:00
remove unecesarry changes
This commit is contained in:
parent
bb692c1a8e
commit
6050b7fed4
@ -116,20 +116,13 @@ export class UserCore {
|
||||
return createReadStream(user.profileImagePath);
|
||||
}
|
||||
|
||||
async getUserProfileImageHash(user: UserEntity): Promise<string> {
|
||||
if (!user.profileImageHash) {
|
||||
throw new NotFoundException('User does not have a profile image');
|
||||
}
|
||||
return user.profileImageHash;
|
||||
}
|
||||
|
||||
async getList(filter?: UserListFilter): Promise<UserEntity[]> {
|
||||
return this.userRepository.getList(filter);
|
||||
}
|
||||
|
||||
async createProfileImage(authUser: AuthUserDto, filePath: string, hash: string): Promise<UserEntity> {
|
||||
async createProfileImage(authUser: AuthUserDto, filePath: string): Promise<UserEntity> {
|
||||
try {
|
||||
return this.userRepository.update(authUser.id, { profileImagePath: filePath, profileImageHash: hash });
|
||||
return this.userRepository.update(authUser.id, { profileImagePath: filePath });
|
||||
} catch (e) {
|
||||
Logger.error(e, 'Create User Profile Image');
|
||||
throw new InternalServerErrorException('Failed to create new user profile image');
|
||||
|
@ -1,6 +1,6 @@
|
||||
import { UserEntity } from '@app/infra/entities';
|
||||
import { BadRequestException, Inject, Injectable, Logger, NotFoundException } from '@nestjs/common';
|
||||
import { createHash, randomBytes } from 'crypto';
|
||||
import { randomBytes } from 'crypto';
|
||||
import { ReadStream } from 'fs';
|
||||
import { IAlbumRepository } from '../album/album.repository';
|
||||
import { IAssetRepository } from '../asset/asset.repository';
|
||||
@ -108,8 +108,7 @@ export class UserService {
|
||||
authUser: AuthUserDto,
|
||||
fileInfo: Express.Multer.File,
|
||||
): Promise<CreateProfileImageResponseDto> {
|
||||
const hash = createHash('md5').update(fileInfo.buffer).digest('hex');
|
||||
const updatedUser = await this.userCore.createProfileImage(authUser, fileInfo.path, hash);
|
||||
const updatedUser = await this.userCore.createProfileImage(authUser, fileInfo.path);
|
||||
return mapCreateProfileImageResponse(updatedUser.id, updatedUser.profileImagePath);
|
||||
}
|
||||
|
||||
@ -121,14 +120,6 @@ export class UserService {
|
||||
return this.userCore.getUserProfileImage(user);
|
||||
}
|
||||
|
||||
async getUserProfileImageHash(userId: string): Promise<string> {
|
||||
const user = await this.userCore.get(userId);
|
||||
if (!user) {
|
||||
throw new NotFoundException('User not found');
|
||||
}
|
||||
return this.userCore.getUserProfileImageHash(user);
|
||||
}
|
||||
|
||||
async resetAdminPassword(ask: (admin: UserResponseDto) => Promise<string | undefined>) {
|
||||
const admin = await this.userCore.getAdmin();
|
||||
if (!admin) {
|
||||
|
@ -102,7 +102,6 @@ export class UserController {
|
||||
async getProfileImage(@Param() { userId }: UserIdDto, @Response({ passthrough: true }) res: Res): Promise<any> {
|
||||
const readableStream = await this.service.getUserProfileImage(userId);
|
||||
res.header('Content-Type', 'image/jpeg');
|
||||
res.header('ETag', await this.service.getUserProfileImageHash(userId));
|
||||
return new StreamableFile(readableStream);
|
||||
}
|
||||
}
|
||||
|
@ -42,9 +42,6 @@ export class UserEntity {
|
||||
@Column({ default: '' })
|
||||
profileImagePath!: string;
|
||||
|
||||
@Column({ default: '' })
|
||||
profileImageHash!: string;
|
||||
|
||||
@Column({ default: true })
|
||||
shouldChangePassword!: boolean;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user