self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-11-24 08:52:28 +02:00
Code Issues Releases Activity

fix: parse quota claim as number (#14178)

Browse Source
This commit is contained in:
Daniel Dietzler 2024-11-19 22:40:56 +01:00 committed by GitHub
parent 34fae31fd4
commit a3712e40bd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/services/auth.service.spec.ts
View File

@ -53,7 +53,7 @@ const oauthUserWithDefaultQuota = {
email, email,
name: ' ', name: ' ',
oauthId: sub, oauthId: sub,
quotaSizeInBytes: 1_073_741_824, quotaSizeInBytes: '1073741824',
storageLabel: null, storageLabel: null,
}; };
@ -567,7 +567,7 @@ describe('AuthService', () => {
oauthResponse, oauthResponse,
); );
expect(userMock.create).toHaveBeenCalledWith(oauthUserWithDefaultQuota); expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
}); });
it('should ignore an invalid storage quota', async () => { it('should ignore an invalid storage quota', async () => {
@ -581,7 +581,7 @@ describe('AuthService', () => {
oauthResponse, oauthResponse,
); );
expect(userMock.create).toHaveBeenCalledWith(oauthUserWithDefaultQuota); expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
}); });
it('should ignore a negative quota', async () => { it('should ignore a negative quota', async () => {
@ -595,7 +595,7 @@ describe('AuthService', () => {
oauthResponse, oauthResponse,
); );
expect(userMock.create).toHaveBeenCalledWith(oauthUserWithDefaultQuota); expect(userMock.create).toHaveBeenCalledWith({ ...oauthUserWithDefaultQuota, quotaSizeInBytes: 1_073_741_824 });
}); });
it('should not set quota for 0 quota', async () => { it('should not set quota for 0 quota', async () => {

4
server/src/services/auth.service.ts
View File

@ -1,5 +1,5 @@
import { BadRequestException, ForbiddenException, Injectable, UnauthorizedException } from '@nestjs/common'; import { BadRequestException, ForbiddenException, Injectable, UnauthorizedException } from '@nestjs/common';
import { isNumber, isString } from 'class-validator'; import { isString } from 'class-validator';
import cookieParser from 'cookie'; import cookieParser from 'cookie';
import { DateTime } from 'luxon'; import { DateTime } from 'luxon';
import { IncomingHttpHeaders } from 'node:http'; import { IncomingHttpHeaders } from 'node:http';
@ -226,7 +226,7 @@ export class AuthService extends BaseService {
const storageQuota = this.getClaim(profile, { const storageQuota = this.getClaim(profile, {
key: storageQuotaClaim, key: storageQuotaClaim,
default: defaultStorageQuota, default: defaultStorageQuota,
isValid: (value: unknown) => isNumber(value) && value >= 0, isValid: (value: unknown) => Number(value) >= 0,
}); });
const userName = profile.name ?? `${profile.given_name || ''} ${profile.family_name || ''}`; const userName = profile.name ?? `${profile.given_name || ''} ${profile.family_name || ''}`;