fix see asset E-admin

esek · Feb 18, 2025 · a823d8d · a823d8d
1 parent 49c362e
commit a823d8d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/server/src/interfaces/asset.interface.ts b/server/src/interfaces/asset.interface.ts
@@ -49,6 +49,7 @@ export interface AssetBuilderOptions {
   isFavorite?: boolean;
   isTrashed?: boolean;
   isDuplicate?: boolean;
+  isEAdmin?: boolean;
   albumId?: string;
   tagId?: string;
   personId?: string;

diff --git a/server/src/repositories/asset.repository.ts b/server/src/repositories/asset.repository.ts
@@ -695,7 +695,7 @@ export class AssetRepository implements IAssetRepository {
       builder.leftJoin('asset.albums', 'album').andWhere('album.id = :albumId', { albumId: options.albumId });
     }
 
-    if (options.userIds) {
+    if (options.userIds && !options.isEAdmin) {
       builder.andWhere('asset.ownerId IN (:...userIds )', { userIds: options.userIds });
     }
 

diff --git a/server/src/services/timeline.service.ts b/server/src/services/timeline.service.ts
@@ -19,14 +19,14 @@ export class TimelineService extends BaseService {
     dto: TimeBucketAssetDto,
   ): Promise<AssetResponseDto[] | SanitizedAssetResponseDto[]> {
     await this.timeBucketChecks(auth, dto);
-    const timeBucketOptions = await this.buildTimeBucketOptions(auth, dto);
+    const timeBucketOptions = await this.buildTimeBucketOptions(auth, dto, true);
     const assets = await this.assetRepository.getTimeBucket(dto.timeBucket, timeBucketOptions);
     return !auth.sharedLink || auth.sharedLink?.showExif
       ? assets.map((asset) => mapAsset(asset, { withStack: true, auth }))
       : assets.map((asset) => mapAsset(asset, { stripMetadata: true, auth }));
   }
 
-  private async buildTimeBucketOptions(auth: AuthDto, dto: TimeBucketDto): Promise<TimeBucketOptions> {
+  private async buildTimeBucketOptions(auth: AuthDto, dto: TimeBucketDto, allowEAdminBypass: boolean = false): Promise<TimeBucketOptions> {
     const { userId, ...options } = dto;
     let userIds: string[] | undefined = undefined;
 
@@ -42,7 +42,9 @@ export class TimelineService extends BaseService {
       }
     }
 
-    return { ...options, userIds };
+    const isEAdmin = allowEAdminBypass && (auth.features.includes('superadmin') || auth.features.includes('emmech_admin') || auth.user.isAdmin)
+
+    return { ...options, userIds, isEAdmin };
   }
 
   private async timeBucketChecks(auth: AuthDto, dto: TimeBucketDto) {