cotugno/immich
2
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-15 18:08:48 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix 500 error on login with email not in DB (#212)

Browse Source 
* Fix 500 error on login with email not in DB

* Fix type declarations in ServerInfoDto
This commit is contained in:
Jaime Baez 2022-06-13 01:29:10 +02:00 committed by GitHub
parent a8e723d722
commit e3449f9c8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/apps/immich/src/api-v1/auth/auth.service.ts
View File

@ -17,7 +17,7 @@ export class AuthService {
private immichJwtService: ImmichJwtService,
) {}
private async validateUser(loginCredential: LoginCredentialDto): Promise<UserEntity> {
private async validateUser(loginCredential: LoginCredentialDto): Promise<UserEntity | null> {
const user = await this.userRepository.findOne(
{ email: loginCredential.email },
{
@ -35,9 +35,13 @@ export class AuthService {
},
);
if (!user) {
return null;
}
const isAuthenticated = await this.validatePassword(user.password, loginCredential.password, user.salt);
if (user && isAuthenticated) {
if (isAuthenticated) {
return user;
}

6
server/apps/immich/src/api-v1/server-info/dto/server-info.dto.ts
View File

@ -1,7 +1,7 @@
export class ServerInfoDto {
diskSize: String;
diskUse: String;
diskAvailable: String;
diskSize: string;
diskUse: string;
diskAvailable: string;
diskSizeRaw: number;
diskUseRaw: number;
diskAvailableRaw: number;