c-l/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2024-12-29 15:11:58 +00:00
Code Releases Activity

Simplify control flow

Browse source
This commit is contained in:
Matthias Rupp 2022-12-01 17:28:26 +01:00
parent 38cfdea855
commit 7bc3cbf687
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/apps/immich/src/api-v1/asset/asset.service.ts
View file

@ -644,24 +644,30 @@ export class AssetService {
async checkAssetsAccess(authUser: AuthUserDto, assetIds: string[], mustBeOwner = false) { async checkAssetsAccess(authUser: AuthUserDto, assetIds: string[], mustBeOwner = false) {
for (const assetId of assetIds) { for (const assetId of assetIds) {
// Default: DENY
let accessAllowed = false;
// Step 1: Check if user owns asset // Step 1: Check if user owns asset
if ((await this._assetRepository.countByIdAndUser(assetId, authUser.id)) == 1) { if ((await this._assetRepository.countByIdAndUser(assetId, authUser.id)) == 1) {
continue; accessAllowed = true;
} }
// Avoid additional checks if ownership is required // Avoid additional checks if ownership is required
if (!mustBeOwner) { if (!mustBeOwner) {
// Step 2: Check if asset is part of an album shared with me // Step 2: Check if asset is part of an album shared with me
if ((await this._albumRepository.getSharedWithUserAlbumCount(authUser.id, assetId)) > 0) { if ((await this._albumRepository.getSharedWithUserAlbumCount(authUser.id, assetId)) > 0) {
continue; accessAllowed = true;
} }
//TODO: Step 3: Check if asset is part of a public album //TODO: Step 3: Check if asset is part of a public album
} }
if (!accessAllowed) {
throw new ForbiddenException(); throw new ForbiddenException();
} }
} }
} }
}
async function processETag(path: string, res: Res, headers: Record<string, string>): Promise<boolean> { async function processETag(path: string, res: Res, headers: Record<string, string>): Promise<boolean> {
const { size, mtimeNs } = await fs.stat(path, { bigint: true }); const { size, mtimeNs } = await fs.stat(path, { bigint: true });