Skip to content

Commit 40e079a

Browse files
jrasm91jrasm91
authored
chore: move controllers and middleware (#8119)
1 parent 81f0265 commit 40e079a

28 files changed

+55
-60
lines changed

Diff for: ‎server/e2e/jobs/specs/library.e2e-spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { api } from 'e2e/client';
22
import fs from 'node:fs';
3+
import { LibraryController } from 'src/controllers/library.controller';
34
import { LoginResponseDto } from 'src/domain/auth/auth.dto';
4-
import { LibraryController } from 'src/immich/controllers/library.controller';
55
import { LibraryType } from 'src/infra/entities/library.entity';
66
import { IMMICH_TEST_ASSET_PATH, IMMICH_TEST_ASSET_TEMP_PATH, restoreTempFolder, testApp } from 'src/test-utils/utils';
77
import request from 'supertest';

Diff for: ‎server/src/immich/controllers/activity.controller.ts renamed to ‎server/src/controllers/activity.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from 'src/domain/activity/activity.dto';
1111
import { ActivityService } from 'src/domain/activity/activity.service';
1212
import { AuthDto } from 'src/domain/auth/auth.dto';
13-
import { Auth, Authenticated } from 'src/immich/app.guard';
13+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
1414
import { UUIDParamDto } from 'src/validation';
1515

1616
@ApiTags('Activity')

Diff for: ‎server/src/immich/controllers/album.controller.ts renamed to ‎server/src/controllers/album.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { AlbumInfoDto } from 'src/domain/album/dto/album.dto';
99
import { GetAlbumsDto } from 'src/domain/album/dto/get-albums.dto';
1010
import { BulkIdResponseDto, BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
1111
import { AuthDto } from 'src/domain/auth/auth.dto';
12-
import { Auth, Authenticated, SharedLinkRoute } from 'src/immich/app.guard';
12+
import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
1313
import { ParseMeUUIDPipe, UUIDParamDto } from 'src/validation';
1414

1515
@ApiTags('Album')

Diff for: ‎server/src/immich/controllers/api-key.controller.ts renamed to ‎server/src/controllers/api-key.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
} from 'src/domain/api-key/api-key.dto';
99
import { APIKeyService } from 'src/domain/api-key/api-key.service';
1010
import { AuthDto } from 'src/domain/auth/auth.dto';
11-
import { Auth, Authenticated } from 'src/immich/app.guard';
11+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
1212
import { UUIDParamDto } from 'src/validation';
1313

1414
@ApiTags('API Key')

Diff for: ‎server/src/immich/controllers/app.controller.ts renamed to ‎server/src/controllers/app.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Controller, Get, Header } from '@nestjs/common';
22
import { ApiExcludeEndpoint } from '@nestjs/swagger';
33
import { SystemConfigService } from 'src/domain/system-config/system-config.service';
4-
import { PublicRoute } from 'src/immich/app.guard';
4+
import { PublicRoute } from 'src/middleware/auth.guard';
55

66
@Controller()
77
export class AppController {

Diff for: ‎server/src/immich/controllers/asset.controller.ts renamed to ‎server/src/controllers/asset.controller.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import { TimeBucketResponseDto } from 'src/domain/asset/response-dto/time-bucket
2020
import { AuthDto } from 'src/domain/auth/auth.dto';
2121
import { MetadataSearchDto } from 'src/domain/search/dto/search.dto';
2222
import { SearchService } from 'src/domain/search/search.service';
23-
import { Auth, Authenticated, SharedLinkRoute } from 'src/immich/app.guard';
24-
import { Route } from 'src/immich/interceptors/file-upload.interceptor';
23+
import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
24+
import { Route } from 'src/middleware/file-upload.interceptor';
2525
import { UUIDParamDto } from 'src/validation';
2626

2727
@ApiTags('Asset')

Diff for: ‎server/src/immich/controllers/audit.controller.ts renamed to ‎server/src/controllers/audit.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from 'src/domain/audit/audit.dto';
1111
import { AuditService } from 'src/domain/audit/audit.service';
1212
import { AuthDto } from 'src/domain/auth/auth.dto';
13-
import { AdminRoute, Auth, Authenticated } from 'src/immich/app.guard';
13+
import { AdminRoute, Auth, Authenticated } from 'src/middleware/auth.guard';
1414

1515
@ApiTags('Audit')
1616
@Controller('audit')

Diff for: ‎server/src/immich/controllers/auth.controller.ts renamed to ‎server/src/controllers/auth.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
} from 'src/domain/auth/auth.dto';
1515
import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
1616
import { UserResponseDto, mapUser } from 'src/domain/user/response-dto/user-response.dto';
17-
import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/immich/app.guard';
17+
import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
1818
import { UUIDParamDto } from 'src/validation';
1919

2020
@ApiTags('Authentication')

Diff for: ‎server/src/immich/controllers/download.controller.ts renamed to ‎server/src/controllers/download.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ import { AssetIdsDto } from 'src/domain/asset/dto/asset-ids.dto';
55
import { AuthDto } from 'src/domain/auth/auth.dto';
66
import { DownloadInfoDto, DownloadResponseDto } from 'src/domain/download/download.dto';
77
import { DownloadService } from 'src/domain/download/download.service';
8-
import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/immich/app.guard';
98
import { asStreamableFile, sendFile } from 'src/immich/app.utils';
9+
import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/middleware/auth.guard';
1010
import { UUIDParamDto } from 'src/validation';
1111

1212
@ApiTags('Download')

Diff for: ‎server/src/immich/controllers/face.controller.ts renamed to ‎server/src/controllers/face.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ApiTags } from '@nestjs/swagger';
33
import { AuthDto } from 'src/domain/auth/auth.dto';
44
import { AssetFaceResponseDto, FaceDto, PersonResponseDto } from 'src/domain/person/person.dto';
55
import { PersonService } from 'src/domain/person/person.service';
6-
import { Auth, Authenticated } from 'src/immich/app.guard';
6+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
77
import { UUIDParamDto } from 'src/validation';
88

99
@ApiTags('Face')

Diff for: ‎server/src/immich/controllers/job.controller.ts renamed to ‎server/src/controllers/job.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Body, Controller, Get, Param, Put } from '@nestjs/common';
22
import { ApiTags } from '@nestjs/swagger';
33
import { AllJobStatusResponseDto, JobCommandDto, JobIdParamDto, JobStatusDto } from 'src/domain/job/job.dto';
44
import { JobService } from 'src/domain/job/job.service';
5-
import { Authenticated } from 'src/immich/app.guard';
5+
import { Authenticated } from 'src/middleware/auth.guard';
66

77
@ApiTags('Job')
88
@Controller('jobs')

Diff for: ‎server/src/immich/controllers/library.controller.ts renamed to ‎server/src/controllers/library.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
ValidateLibraryResponseDto,
1212
} from 'src/domain/library/library.dto';
1313
import { LibraryService } from 'src/domain/library/library.service';
14-
import { AdminRoute, Authenticated } from 'src/immich/app.guard';
14+
import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
1515
import { UUIDParamDto } from 'src/validation';
1616

1717
@ApiTags('Library')

Diff for: ‎server/src/immich/controllers/oauth.controller.ts renamed to ‎server/src/controllers/oauth.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
} from 'src/domain/auth/auth.dto';
1111
import { AuthService, LoginDetails } from 'src/domain/auth/auth.service';
1212
import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
13-
import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/immich/app.guard';
13+
import { Auth, Authenticated, GetLoginDetails, PublicRoute } from 'src/middleware/auth.guard';
1414

1515
@ApiTags('OAuth')
1616
@Controller('oauth')

Diff for: ‎server/src/immich/controllers/partner.controller.ts renamed to ‎server/src/controllers/partner.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { AuthDto } from 'src/domain/auth/auth.dto';
44
import { PartnerResponseDto, UpdatePartnerDto } from 'src/domain/partner/partner.dto';
55
import { PartnerService } from 'src/domain/partner/partner.service';
66
import { PartnerDirection } from 'src/domain/repositories/partner.repository';
7-
import { Auth, Authenticated } from 'src/immich/app.guard';
7+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
88
import { UUIDParamDto } from 'src/validation';
99

1010
@ApiTags('Partner')

Diff for: ‎server/src/immich/controllers/person.controller.ts renamed to ‎server/src/controllers/person.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import {
1616
PersonUpdateDto,
1717
} from 'src/domain/person/person.dto';
1818
import { PersonService } from 'src/domain/person/person.service';
19-
import { Auth, Authenticated, FileResponse } from 'src/immich/app.guard';
2019
import { sendFile } from 'src/immich/app.utils';
20+
import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
2121
import { UUIDParamDto } from 'src/validation';
2222

2323
@ApiTags('Person')

Diff for: ‎server/src/immich/controllers/search.controller.ts renamed to ‎server/src/controllers/search.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import {
1515
import { SearchExploreResponseDto } from 'src/domain/search/response-dto/search-explore.response.dto';
1616
import { SearchResponseDto } from 'src/domain/search/response-dto/search-response.dto';
1717
import { SearchService } from 'src/domain/search/search.service';
18-
import { Auth, Authenticated } from 'src/immich/app.guard';
18+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
1919

2020
@ApiTags('Search')
2121
@Controller('search')

Diff for: ‎server/src/immich/controllers/server-info.controller.ts renamed to ‎server/src/controllers/server-info.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
ServerVersionResponseDto,
1212
} from 'src/domain/server-info/server-info.dto';
1313
import { ServerInfoService } from 'src/domain/server-info/server-info.service';
14-
import { AdminRoute, Authenticated, PublicRoute } from 'src/immich/app.guard';
14+
import { AdminRoute, Authenticated, PublicRoute } from 'src/middleware/auth.guard';
1515

1616
@ApiTags('Server Info')
1717
@Controller('server-info')

Diff for: ‎server/src/immich/controllers/shared-link.controller.ts renamed to ‎server/src/controllers/shared-link.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { AuthDto } from 'src/domain/auth/auth.dto';
88
import { SharedLinkResponseDto } from 'src/domain/shared-link/shared-link-response.dto';
99
import { SharedLinkCreateDto, SharedLinkEditDto, SharedLinkPasswordDto } from 'src/domain/shared-link/shared-link.dto';
1010
import { SharedLinkService } from 'src/domain/shared-link/shared-link.service';
11-
import { Auth, Authenticated, SharedLinkRoute } from 'src/immich/app.guard';
11+
import { Auth, Authenticated, SharedLinkRoute } from 'src/middleware/auth.guard';
1212
import { UUIDParamDto } from 'src/validation';
1313

1414
@ApiTags('Shared Link')

Diff for: ‎server/src/immich/controllers/system-config.controller.ts renamed to ‎server/src/controllers/system-config.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { SystemConfigDto } from 'src/domain/system-config/dto/system-config.dto'
44
import { SystemConfigTemplateStorageOptionDto } from 'src/domain/system-config/response-dto/system-config-template-storage-option.dto';
55
import { MapThemeDto } from 'src/domain/system-config/system-config-map-theme.dto';
66
import { SystemConfigService } from 'src/domain/system-config/system-config.service';
7-
import { AdminRoute, Authenticated } from 'src/immich/app.guard';
7+
import { AdminRoute, Authenticated } from 'src/middleware/auth.guard';
88

99
@ApiTags('System Config')
1010
@Controller('system-config')

Diff for: ‎server/src/immich/controllers/tag.controller.ts renamed to ‎server/src/controllers/tag.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { AuthDto } from 'src/domain/auth/auth.dto';
77
import { TagResponseDto } from 'src/domain/tag/tag-response.dto';
88
import { CreateTagDto, UpdateTagDto } from 'src/domain/tag/tag.dto';
99
import { TagService } from 'src/domain/tag/tag.service';
10-
import { Auth, Authenticated } from 'src/immich/app.guard';
10+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
1111
import { UUIDParamDto } from 'src/validation';
1212

1313
@ApiTags('Tag')

Diff for: ‎server/src/immich/controllers/trash.controller.ts renamed to ‎server/src/controllers/trash.controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ApiTags } from '@nestjs/swagger';
33
import { BulkIdsDto } from 'src/domain/asset/response-dto/asset-ids-response.dto';
44
import { AuthDto } from 'src/domain/auth/auth.dto';
55
import { TrashService } from 'src/domain/trash/trash.service';
6-
import { Auth, Authenticated } from 'src/immich/app.guard';
6+
import { Auth, Authenticated } from 'src/middleware/auth.guard';
77

88
@ApiTags('Trash')
99
@Controller('trash')

Diff for: ‎server/src/immich/controllers/user.controller.ts renamed to ‎server/src/controllers/user.controller.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ import { UpdateUserDto } from 'src/domain/user/dto/update-user.dto';
2424
import { CreateProfileImageResponseDto } from 'src/domain/user/response-dto/create-profile-image-response.dto';
2525
import { UserResponseDto } from 'src/domain/user/response-dto/user-response.dto';
2626
import { UserService } from 'src/domain/user/user.service';
27-
import { AdminRoute, Auth, Authenticated, FileResponse } from 'src/immich/app.guard';
2827
import { sendFile } from 'src/immich/app.utils';
29-
import { FileUploadInterceptor, Route } from 'src/immich/interceptors/file-upload.interceptor';
28+
import { AdminRoute, Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
29+
import { FileUploadInterceptor, Route } from 'src/middleware/file-upload.interceptor';
3030
import { UUIDParamDto } from 'src/validation';
3131

3232
@ApiTags('User')

Diff for: ‎server/src/immich/api-v1/asset/asset.controller.ts

+2-7
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,9 @@ import { AssetFileUploadResponseDto } from 'src/immich/api-v1/asset/response-dto
2929
import { CheckExistingAssetsResponseDto } from 'src/immich/api-v1/asset/response-dto/check-existing-assets-response.dto';
3030
import { CuratedLocationsResponseDto } from 'src/immich/api-v1/asset/response-dto/curated-locations-response.dto';
3131
import { CuratedObjectsResponseDto } from 'src/immich/api-v1/asset/response-dto/curated-objects-response.dto';
32-
import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/immich/app.guard';
3332
import { sendFile } from 'src/immich/app.utils';
34-
import {
35-
FileUploadInterceptor,
36-
ImmichFile,
37-
Route,
38-
mapToUploadFile,
39-
} from 'src/immich/interceptors/file-upload.interceptor';
33+
import { Auth, Authenticated, FileResponse, SharedLinkRoute } from 'src/middleware/auth.guard';
34+
import { FileUploadInterceptor, ImmichFile, Route, mapToUploadFile } from 'src/middleware/file-upload.interceptor';
4035
import { FileNotEmptyValidator, UUIDParamDto } from 'src/validation';
4136

4237
interface UploadFiles {

Diff for: ‎server/src/immich/app.module.ts

+25-25
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,38 @@ import { Module, OnModuleInit, ValidationPipe } from '@nestjs/common';
22
import { APP_GUARD, APP_INTERCEPTOR, APP_PIPE } from '@nestjs/core';
33
import { ScheduleModule } from '@nestjs/schedule';
44
import { TypeOrmModule } from '@nestjs/typeorm';
5+
import { ActivityController } from 'src/controllers/activity.controller';
6+
import { AlbumController } from 'src/controllers/album.controller';
7+
import { APIKeyController } from 'src/controllers/api-key.controller';
8+
import { AppController } from 'src/controllers/app.controller';
9+
import { AssetController, AssetsController } from 'src/controllers/asset.controller';
10+
import { AuditController } from 'src/controllers/audit.controller';
11+
import { AuthController } from 'src/controllers/auth.controller';
12+
import { DownloadController } from 'src/controllers/download.controller';
13+
import { FaceController } from 'src/controllers/face.controller';
14+
import { JobController } from 'src/controllers/job.controller';
15+
import { LibraryController } from 'src/controllers/library.controller';
16+
import { OAuthController } from 'src/controllers/oauth.controller';
17+
import { PartnerController } from 'src/controllers/partner.controller';
18+
import { PersonController } from 'src/controllers/person.controller';
19+
import { SearchController } from 'src/controllers/search.controller';
20+
import { ServerInfoController } from 'src/controllers/server-info.controller';
21+
import { SharedLinkController } from 'src/controllers/shared-link.controller';
22+
import { SystemConfigController } from 'src/controllers/system-config.controller';
23+
import { TagController } from 'src/controllers/tag.controller';
24+
import { TrashController } from 'src/controllers/trash.controller';
25+
import { UserController } from 'src/controllers/user.controller';
526
import { DomainModule } from 'src/domain/domain.module';
627
import { AssetRepositoryV1, IAssetRepositoryV1 } from 'src/immich/api-v1/asset/asset-repository';
728
import { AssetController as AssetControllerV1 } from 'src/immich/api-v1/asset/asset.controller';
829
import { AssetService as AssetServiceV1 } from 'src/immich/api-v1/asset/asset.service';
9-
import { AppGuard } from 'src/immich/app.guard';
1030
import { AppService } from 'src/immich/app.service';
11-
import { ActivityController } from 'src/immich/controllers/activity.controller';
12-
import { AlbumController } from 'src/immich/controllers/album.controller';
13-
import { APIKeyController } from 'src/immich/controllers/api-key.controller';
14-
import { AppController } from 'src/immich/controllers/app.controller';
15-
import { AssetController, AssetsController } from 'src/immich/controllers/asset.controller';
16-
import { AuditController } from 'src/immich/controllers/audit.controller';
17-
import { AuthController } from 'src/immich/controllers/auth.controller';
18-
import { DownloadController } from 'src/immich/controllers/download.controller';
19-
import { FaceController } from 'src/immich/controllers/face.controller';
20-
import { JobController } from 'src/immich/controllers/job.controller';
21-
import { LibraryController } from 'src/immich/controllers/library.controller';
22-
import { OAuthController } from 'src/immich/controllers/oauth.controller';
23-
import { PartnerController } from 'src/immich/controllers/partner.controller';
24-
import { PersonController } from 'src/immich/controllers/person.controller';
25-
import { SearchController } from 'src/immich/controllers/search.controller';
26-
import { ServerInfoController } from 'src/immich/controllers/server-info.controller';
27-
import { SharedLinkController } from 'src/immich/controllers/shared-link.controller';
28-
import { SystemConfigController } from 'src/immich/controllers/system-config.controller';
29-
import { TagController } from 'src/immich/controllers/tag.controller';
30-
import { TrashController } from 'src/immich/controllers/trash.controller';
31-
import { UserController } from 'src/immich/controllers/user.controller';
32-
import { ErrorInterceptor } from 'src/immich/interceptors/error.interceptor';
33-
import { FileUploadInterceptor } from 'src/immich/interceptors/file-upload.interceptor';
3431
import { AssetEntity } from 'src/infra/entities/asset.entity';
3532
import { ExifEntity } from 'src/infra/entities/exif.entity';
3633
import { InfraModule } from 'src/infra/infra.module';
34+
import { AuthGuard } from 'src/middleware/auth.guard';
35+
import { ErrorInterceptor } from 'src/middleware/error.interceptor';
36+
import { FileUploadInterceptor } from 'src/middleware/file-upload.interceptor';
3737

3838
@Module({
3939
imports: [
@@ -71,7 +71,7 @@ import { InfraModule } from 'src/infra/infra.module';
7171
providers: [
7272
{ provide: APP_PIPE, useValue: new ValidationPipe({ transform: true, whitelist: true }) },
7373
{ provide: APP_INTERCEPTOR, useClass: ErrorInterceptor },
74-
{ provide: APP_GUARD, useClass: AppGuard },
74+
{ provide: APP_GUARD, useClass: AuthGuard },
7575
{ provide: IAssetRepositoryV1, useClass: AssetRepositoryV1 },
7676
AppService,
7777
AssetServiceV1,

Diff for: ‎server/src/immich/app.utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import { promisify } from 'node:util';
1616
import { IMMICH_ACCESS_COOKIE, IMMICH_API_KEY_HEADER, IMMICH_API_KEY_NAME } from 'src/domain/auth/auth.constant';
1717
import { serverVersion } from 'src/domain/domain.constant';
1818
import { ImmichReadStream } from 'src/domain/repositories/storage.repository';
19-
import { Metadata } from 'src/immich/app.guard';
2019
import { ImmichLogger } from 'src/infra/logger';
20+
import { Metadata } from 'src/middleware/auth.guard';
2121
import { CacheControl, ImmichFileResponse, isConnectionAborted } from 'src/utils';
2222

2323
type SendFile = Parameters<Response['sendFile']>;

Diff for: ‎server/src/immich/app.guard.ts renamed to ‎server/src/middleware/auth.guard.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ export interface AuthRequest extends Request {
7878
}
7979

8080
@Injectable()
81-
export class AppGuard implements CanActivate {
82-
private logger = new ImmichLogger(AppGuard.name);
81+
export class AuthGuard implements CanActivate {
82+
private logger = new ImmichLogger(AuthGuard.name);
8383

8484
constructor(
8585
private reflector: Reflector,

Diff for: ‎server/src/immich/interceptors/error.interceptor.ts renamed to ‎server/src/middleware/error.interceptor.ts

File renamed without changes.

Diff for: ‎server/src/immich/interceptors/file-upload.interceptor.ts renamed to ‎server/src/middleware/file-upload.interceptor.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import multer, { StorageEngine, diskStorage } from 'multer';
77
import { createHash, randomUUID } from 'node:crypto';
88
import { Observable } from 'rxjs';
99
import { AssetService, UploadFieldName, UploadFile } from 'src/domain/asset/asset.service';
10-
import { AuthRequest } from 'src/immich/app.guard';
1110
import { ImmichLogger } from 'src/infra/logger';
11+
import { AuthRequest } from 'src/middleware/auth.guard';
1212

1313
export enum Route {
1414
ASSET = 'asset',

0 commit comments

Comments
 (0)