feat: add job ids

cli/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.49",
+  "version": "2.2.48",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/cli",
-      "version": "2.2.49",
+      "version": "2.2.48",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "fast-glob": "^3.3.2",
@@ -52,7 +52,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/cli",
-  "version": "2.2.49",
+  "version": "2.2.48",
   "description": "Command Line Interface (CLI) for Immich",
   "type": "module",
   "exports": "./dist/index.js",

docker/docker-compose.prod.yml

@@ -103,7 +103,7 @@ services:
     command: ['./run.sh', '-disable-reporting']
     ports:
       - 3000:3000
-    image: grafana/grafana:11.5.1-ubuntu@sha256:9a4ab78cec1a2ec7d1ca5dfd5aacec6412706a1bc9e971fc7184e2f6696a63f5
+    image: grafana/grafana:11.5.0-ubuntu@sha256:3c9e2b202eb933a22da5f2b5a22c98a665493f603b452263d9d6f242a87f60d7
     volumes:
       - grafana-data:/var/lib/grafana
 

docs/static/archived-versions.json

@@ -1,8 +1,4 @@
 [
-  {
-    "label": "v1.126.0",
-    "url": "https://v1.126.0.archive.immich.app"
-  },
   {
     "label": "v1.125.7",
     "url": "https://v1.125.7.archive.immich.app"

e2e/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich-e2e",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-e2e",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "license": "GNU Affero General Public License version 3",
       "devDependencies": {
         "@eslint/eslintrc": "^3.1.0",
@@ -45,7 +45,7 @@
     },
     "../cli": {
       "name": "@immich/cli",
-      "version": "2.2.49",
+      "version": "2.2.48",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
@@ -92,7 +92,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "dev": true,
       "license": "GNU Affero General Public License version 3",
       "dependencies": {

e2e/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-e2e",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "description": "",
   "main": "index.js",
   "type": "module",

e2e/src/api/specs/shared-link.e2e-spec.ts

@@ -150,30 +150,6 @@ describe('/shared-links', () => {
       );
     });
 
-    it('should filter on albumId', async () => {
-      const { status, body } = await request(app)
-        .get(`/shared-links?albumId=${album.id}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(2);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ id: linkWithAlbum.id }),
-          expect.objectContaining({ id: linkWithPassword.id }),
-        ]),
-      );
-    });
-
-    it('should find 0 albums', async () => {
-      const { status, body } = await request(app)
-        .get(`/shared-links?albumId=${uuidDto.notFound}`)
-        .set('Authorization', `Bearer ${user1.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(0);
-    });
-
     it('should not get shared links created by other users', async () => {
       const { status, body } = await request(app)
         .get('/shared-links')

machine-learning/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "machine-learning"
-version = "1.126.0"
+version = "1.125.7"
 description = ""
 authors = ["Hau Tran <alex.tran1502@gmail.com>"]
 readme = "README.md"

mobile/android/fastlane/Fastfile

@@ -35,8 +35,8 @@ platform :android do
       task: 'bundle', 
       build_type: 'Release',
       properties: {
-        "android.injected.version.code" => 183,
+        "android.injected.version.code" => 182,
-        "android.injected.version.name" => "1.126.0",
+        "android.injected.version.name" => "1.125.7",
       }
     )
     upload_to_play_store(skip_upload_apk: true, skip_upload_images: true, skip_upload_screenshots: true, aab: '../build/app/outputs/bundle/release/app-release.aab')

mobile/ios/fastlane/Fastfile

@@ -19,7 +19,7 @@ platform :ios do
   desc "iOS Release"
   lane :release do
     increment_version_number(
-      version_number: "1.126.0"
+      version_number: "1.125.7"
     )
     increment_build_number(
       build_number: latest_testflight_build_number + 1,

mobile/openapi/README.md

@@ -3,7 +3,7 @@ Immich API
 
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
-- API version: 1.126.0
+- API version: 1.125.7
 - Generator version: 7.8.0
 - Build package: org.openapitools.codegen.languages.DartClientCodegen
 

mobile/openapi/lib/api/shared_links_api.dart

@@ -127,10 +127,7 @@ class SharedLinksApi {
   }
 
   /// Performs an HTTP 'GET /shared-links' operation and returns the [Response].
-  /// Parameters:
+  Future<Response> getAllSharedLinksWithHttpInfo() async {
-  ///
-  /// * [String] albumId:
-  Future<Response> getAllSharedLinksWithHttpInfo({ String? albumId, }) async {
     // ignore: prefer_const_declarations
     final path = r'/shared-links';
 
@@ -141,10 +138,6 @@ class SharedLinksApi {
     final headerParams = <String, String>{};
     final formParams = <String, String>{};
 
-    if (albumId != null) {
-      queryParams.addAll(_queryParams('', 'albumId', albumId));
-    }
-
     const contentTypes = <String>[];
 
 
@@ -159,11 +152,8 @@ class SharedLinksApi {
     );
   }
 
-  /// Parameters:
+  Future<List<SharedLinkResponseDto>?> getAllSharedLinks() async {
-  ///
+    final response = await getAllSharedLinksWithHttpInfo();
-  /// * [String] albumId:
-  Future<List<SharedLinkResponseDto>?> getAllSharedLinks({ String? albumId, }) async {
-    final response = await getAllSharedLinksWithHttpInfo( albumId: albumId, );
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }

mobile/pubspec.yaml

@@ -2,7 +2,7 @@ name: immich_mobile
 description: Immich - selfhosted backup media file on mobile phone
 
 publish_to: 'none'
-version: 1.126.0+183
+version: 1.125.7+182
 
 environment:
   sdk: '>=3.3.0 <4.0.0'

open-api/immich-openapi-specs.json

@@ -5230,17 +5230,7 @@
     "/shared-links": {
       "get": {
         "operationId": "getAllSharedLinks",
-        "parameters": [
+        "parameters": [],
-          {
-            "name": "albumId",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          }
-        ],
         "responses": {
           "200": {
             "content": {
@@ -7468,7 +7458,7 @@
   "info": {
     "title": "Immich",
     "description": "Immich API",
-    "version": "1.126.0",
+    "version": "1.125.7",
     "contact": {}
   },
   "tags": [],

open-api/typescript-sdk/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@immich/sdk",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@immich/sdk",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"

open-api/typescript-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@immich/sdk",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "description": "Auto-generated TypeScript SDK for the Immich API",
   "type": "module",
   "main": "./build/index.js",

open-api/typescript-sdk/src/fetch-client.ts

@@ -1,6 +1,6 @@
 /**
  * Immich
- * 1.126.0
+ * 1.125.7
  * DO NOT MODIFY - This file has been generated using oazapfts.
  * See https://www.npmjs.com/package/oazapfts
  */
@@ -2762,15 +2762,11 @@ export function deleteSession({ id }: {
         method: "DELETE"
     }));
 }
-export function getAllSharedLinks({ albumId }: {
+export function getAllSharedLinks(opts?: Oazapfts.RequestOpts) {
-    albumId?: string;
-}, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
         data: SharedLinkResponseDto[];
-    }>(`/shared-links${QS.query(QS.explode({
+    }>("/shared-links", {
-        albumId
-    }))}`, {
         ...opts
     }));
 }

server/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@nestjs/bullmq": "^11.0.1",

server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "description": "",
   "author": "",
   "private": true,

server/src/controllers/shared-link.controller.ts

@@ -9,7 +9,6 @@ import {
   SharedLinkEditDto,
   SharedLinkPasswordDto,
   SharedLinkResponseDto,
-  SharedLinkSearchDto,
 } from 'src/dtos/shared-link.dto';
 import { ImmichCookie, Permission } from 'src/enum';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
@@ -25,8 +24,8 @@ export class SharedLinkController {
 
   @Get()
   @Authenticated({ permission: Permission.SHARED_LINK_READ })
-  getAllSharedLinks(@Auth() auth: AuthDto, @Query() dto: SharedLinkSearchDto): Promise<SharedLinkResponseDto[]> {
+  getAllSharedLinks(@Auth() auth: AuthDto): Promise<SharedLinkResponseDto[]> {
-    return this.service.getAll(auth, dto);
+    return this.service.getAll(auth);
   }
 
   @Get('me')

server/src/cores/storage.core.ts

@@ -9,7 +9,8 @@ import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
-import { IConfigRepository, ILoggingRepository, ISystemMetadataRepository } from 'src/types';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
+import { IConfigRepository, ILoggingRepository } from 'src/types';
 import { getAssetFiles } from 'src/utils/asset.util';
 import { getConfig } from 'src/utils/config';
 

server/src/dtos/session.dto.ts

@@ -1,4 +1,4 @@
-import { SessionItem } from 'src/types';
+import { SessionEntity } from 'src/entities/session.entity';
 
 export class SessionResponseDto {
   id!: string;
@@ -9,7 +9,7 @@ export class SessionResponseDto {
   deviceOS!: string;
 }
 
-export const mapSession = (entity: SessionItem, currentId?: string): SessionResponseDto => ({
+export const mapSession = (entity: SessionEntity, currentId?: string): SessionResponseDto => ({
   id: entity.id,
   createdAt: entity.createdAt.toISOString(),
   updatedAt: entity.updatedAt.toISOString(),

server/src/dtos/shared-link.dto.ts

@@ -7,11 +7,6 @@ import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { SharedLinkType } from 'src/enum';
 import { Optional, ValidateBoolean, ValidateDate, ValidateUUID } from 'src/validation';
 
-export class SharedLinkSearchDto {
-  @ValidateUUID({ optional: true })
-  albumId?: string;
-}
-
 export class SharedLinkCreateDto {
   @IsEnum(SharedLinkType)
   @ApiProperty({ enum: SharedLinkType, enumName: 'SharedLinkType' })

server/src/interfaces/job.interface.ts

@@ -144,7 +144,6 @@ export interface IAssetDeleteJob extends IEntityJob {
 }
 
 export interface ILibraryFileJob extends IEntityJob {
-  ownerId: string;
   assetPath: string;
 }
 

server/src/interfaces/process.interface.ts

@@ -0,0 +1,25 @@
+import { ChildProcessWithoutNullStreams, SpawnOptionsWithoutStdio } from 'node:child_process';
+import { Readable } from 'node:stream';
+
+export interface ImmichReadStream {
+  stream: Readable;
+  type?: string;
+  length?: number;
+}
+
+export interface ImmichZipStream extends ImmichReadStream {
+  addFile: (inputPath: string, filename: string) => void;
+  finalize: () => Promise<void>;
+}
+
+export interface DiskUsage {
+  available: number;
+  free: number;
+  total: number;
+}
+
+export const IProcessRepository = 'IProcessRepository';
+
+export interface IProcessRepository {
+  spawn(command: string, args?: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams;
+}

server/src/interfaces/session.interface.ts

@@ -0,0 +1,17 @@
+import { Insertable, Updateable } from 'kysely';
+import { Sessions } from 'src/db';
+import { SessionEntity } from 'src/entities/session.entity';
+
+export const ISessionRepository = 'ISessionRepository';
+
+type E = SessionEntity;
+export type SessionSearchOptions = { updatedBefore: Date };
+
+export interface ISessionRepository {
+  search(options: SessionSearchOptions): Promise<SessionEntity[]>;
+  create(dto: Insertable<Sessions>): Promise<SessionEntity>;
+  update(id: string, dto: Updateable<Sessions>): Promise<SessionEntity>;
+  delete(id: string): Promise<void>;
+  getByToken(token: string): Promise<E | undefined>;
+  getByUserId(userId: string): Promise<E[]>;
+}

server/src/interfaces/shared-link.interface.ts

@@ -4,13 +4,8 @@ import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 
 export const ISharedLinkRepository = 'ISharedLinkRepository';
 
-export type SharedLinkSearchOptions = {
-  userId: string;
-  albumId?: string;
-};
-
 export interface ISharedLinkRepository {
-  getAll(options: SharedLinkSearchOptions): Promise<SharedLinkEntity[]>;
+  getAll(userId: string): Promise<SharedLinkEntity[]>;
   get(userId: string, id: string): Promise<SharedLinkEntity | undefined>;
   getByKey(key: Buffer): Promise<SharedLinkEntity | undefined>;
   create(entity: Insertable<SharedLinks> & { assetIds?: string[] }): Promise<SharedLinkEntity>;

server/src/interfaces/system-metadata.interface.ts

@@ -0,0 +1,10 @@
+import { SystemMetadata } from 'src/entities/system-metadata.entity';
+
+export const ISystemMetadataRepository = 'ISystemMetadataRepository';
+
+export interface ISystemMetadataRepository {
+  get<T extends keyof SystemMetadata>(key: T): Promise<SystemMetadata[T] | null>;
+  set<T extends keyof SystemMetadata>(key: T, value: SystemMetadata[T]): Promise<void>;
+  delete<T extends keyof SystemMetadata>(key: T): Promise<void>;
+  readFile(filename: string): Promise<string>;
+}

server/src/repositories/index.ts

@@ -9,10 +9,13 @@ import { IMachineLearningRepository } from 'src/interfaces/machine-learning.inte
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
+import { IProcessRepository } from 'src/interfaces/process.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
+import { ISessionRepository } from 'src/interfaces/session.interface';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
 import { IStackRepository } from 'src/interfaces/stack.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ITagRepository } from 'src/interfaces/tag.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -70,10 +73,7 @@ export const repositories = [
   MetadataRepository,
   NotificationRepository,
   OAuthRepository,
-  ProcessRepository,
-  SessionRepository,
   ServerInfoRepository,
-  SystemMetadataRepository,
   TelemetryRepository,
   TrashRepository,
   ViewRepository,
@@ -92,10 +92,13 @@ export const providers = [
   { provide: IMoveRepository, useClass: MoveRepository },
   { provide: IPartnerRepository, useClass: PartnerRepository },
   { provide: IPersonRepository, useClass: PersonRepository },
+  { provide: IProcessRepository, useClass: ProcessRepository },
   { provide: ISearchRepository, useClass: SearchRepository },
+  { provide: ISessionRepository, useClass: SessionRepository },
   { provide: ISharedLinkRepository, useClass: SharedLinkRepository },
   { provide: IStackRepository, useClass: StackRepository },
   { provide: IStorageRepository, useClass: StorageRepository },
+  { provide: ISystemMetadataRepository, useClass: SystemMetadataRepository },
   { provide: ITagRepository, useClass: TagRepository },
   { provide: IUserRepository, useClass: UserRepository },
 ];

server/src/repositories/job.repository.ts

@@ -216,6 +216,17 @@ export class JobRepository implements IJobRepository {
 
   private getJobOptions(item: JobItem): JobsOptions | null {
     switch (item.name) {
+      case JobName.LIBRARY_QUEUE_SYNC_ASSETS:
+      case JobName.LIBRARY_QUEUE_SYNC_FILES:
+      case JobName.LIBRARY_SYNC_ASSET:
+      case JobName.LIBRARY_DELETE:
+      case JobName.SIDECAR_SYNC:
+      case JobName.SIDECAR_DISCOVERY: {
+        return { jobId: `${item.data.id}-${item.name}` };
+      }
+      case JobName.LIBRARY_SYNC_FILE: {
+        return { jobId: `${item.data.id}-${item.data.assetPath}` };
+      }
       case JobName.NOTIFY_ALBUM_UPDATE: {
         return { jobId: item.data.id, delay: item.data?.delay };
       }
@@ -228,6 +239,11 @@ export class JobRepository implements IJobRepository {
       case JobName.QUEUE_FACIAL_RECOGNITION: {
         return { jobId: JobName.QUEUE_FACIAL_RECOGNITION };
       }
+      case JobName.LIBRARY_QUEUE_SYNC_ALL:
+      case JobName.LIBRARY_QUEUE_CLEANUP: {
+        // These jobs are globally unique and should only have one instance running at a time
+        return { jobId: item.name };
+      }
       default: {
         return null;
       }

server/src/repositories/map.repository.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@nestjs/common';
+import { Inject, Injectable } from '@nestjs/common';
 import { getName } from 'i18n-iso-countries';
 import { Expression, Kysely, sql, SqlBool } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
@@ -11,9 +11,9 @@ import { DB, GeodataPlaces, NaturalearthCountries } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { NaturalEarthCountriesTempEntity } from 'src/entities/natural-earth-countries.entity';
 import { LogLevel, SystemMetadataKey } from 'src/enum';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ConfigRepository } from 'src/repositories/config.repository';
 import { LoggingRepository } from 'src/repositories/logging.repository';
-import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 
 export interface MapMarkerSearchOptions {
   isArchived?: boolean;
@@ -48,7 +48,7 @@ interface MapDB extends DB {
 export class MapRepository {
   constructor(
     private configRepository: ConfigRepository,
-    private metadataRepository: SystemMetadataRepository,
+    @Inject(ISystemMetadataRepository) private metadataRepository: ISystemMetadataRepository,
     private logger: LoggingRepository,
     @InjectKysely() private db: Kysely<MapDB>,
   ) {

server/src/repositories/oauth.repository.ts

@@ -43,12 +43,7 @@ export class OAuthRepository {
     const params = client.callbackParams(url);
     try {
       const tokens = await client.callback(redirectUrl, params, { state: params.state });
-      const profile = await client.userinfo<OAuthProfile>(tokens.access_token || '');
+      return await client.userinfo<OAuthProfile>(tokens.access_token || '');
-      if (!profile.sub) {
-        throw new Error('Unexpected profile response, no `sub`');
-      }
-
-      return profile;
     } catch (error: Error | any) {
       if (error.message.includes('unexpected JWT alg received')) {
         this.logger.warn(

server/src/repositories/process.repository.ts

@@ -1,11 +1,13 @@
 import { Injectable } from '@nestjs/common';
 import { ChildProcessWithoutNullStreams, spawn, SpawnOptionsWithoutStdio } from 'node:child_process';
+import { IProcessRepository } from 'src/interfaces/process.interface';
 import { LoggingRepository } from 'src/repositories/logging.repository';
+import { StorageRepository } from 'src/repositories/storage.repository';
 
 @Injectable()
-export class ProcessRepository {
+export class ProcessRepository implements IProcessRepository {
   constructor(private logger: LoggingRepository) {
-    this.logger.setContext(ProcessRepository.name);
+    this.logger.setContext(StorageRepository.name);
   }
 
   spawn(command: string, args: readonly string[], options?: SpawnOptionsWithoutStdio): ChildProcessWithoutNullStreams {

server/src/repositories/session.repository.ts

@@ -3,37 +3,36 @@ import { Insertable, Kysely, Updateable } from 'kysely';
 import { InjectKysely } from 'nestjs-kysely';
 import { DB, Sessions } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
-import { withUser } from 'src/entities/session.entity';
+import { SessionEntity, withUser } from 'src/entities/session.entity';
+import { ISessionRepository, SessionSearchOptions } from 'src/interfaces/session.interface';
 import { asUuid } from 'src/utils/database';
 
-export type SessionSearchOptions = { updatedBefore: Date };
-
 @Injectable()
-export class SessionRepository {
+export class SessionRepository implements ISessionRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   @GenerateSql({ params: [{ updatedBefore: DummyValue.DATE }] })
-  search(options: SessionSearchOptions) {
+  search(options: SessionSearchOptions): Promise<SessionEntity[]> {
     return this.db
       .selectFrom('sessions')
       .selectAll()
       .where('sessions.updatedAt', '<=', options.updatedBefore)
-      .execute();
+      .execute() as Promise<SessionEntity[]>;
   }
 
   @GenerateSql({ params: [DummyValue.STRING] })
-  getByToken(token: string) {
+  getByToken(token: string): Promise<SessionEntity | undefined> {
     return this.db
       .selectFrom('sessions')
       .innerJoinLateral(withUser, (join) => join.onTrue())
       .selectAll('sessions')
       .select((eb) => eb.fn.toJson('user').as('user'))
       .where('sessions.token', '=', token)
-      .executeTakeFirst();
+      .executeTakeFirst() as Promise<SessionEntity | undefined>;
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getByUserId(userId: string) {
+  getByUserId(userId: string): Promise<SessionEntity[]> {
     return this.db
       .selectFrom('sessions')
       .innerJoinLateral(withUser, (join) => join.onTrue())
@@ -42,24 +41,30 @@ export class SessionRepository {
       .where('sessions.userId', '=', userId)
       .orderBy('sessions.updatedAt', 'desc')
       .orderBy('sessions.createdAt', 'desc')
-      .execute();
+      .execute() as unknown as Promise<SessionEntity[]>;
   }
 
-  create(dto: Insertable<Sessions>) {
+  async create(dto: Insertable<Sessions>): Promise<SessionEntity> {
-    return this.db.insertInto('sessions').values(dto).returningAll().executeTakeFirstOrThrow();
+    const { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } = await this.db
+      .insertInto('sessions')
+      .values(dto)
+      .returningAll()
+      .executeTakeFirstOrThrow();
+
+    return { id, token, userId, createdAt, updatedAt, deviceType, deviceOS } as SessionEntity;
   }
 
-  update(id: string, dto: Updateable<Sessions>) {
+  update(id: string, dto: Updateable<Sessions>): Promise<SessionEntity> {
     return this.db
       .updateTable('sessions')
       .set(dto)
       .where('sessions.id', '=', asUuid(id))
       .returningAll()
-      .executeTakeFirstOrThrow();
+      .executeTakeFirstOrThrow() as Promise<SessionEntity>;
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  async delete(id: string) {
+  async delete(id: string): Promise<void> {
     await this.db.deleteFrom('sessions').where('id', '=', asUuid(id)).execute();
   }
 }

server/src/repositories/shared-link.repository.ts

@@ -7,7 +7,7 @@ import { DB, SharedLinks } from 'src/db';
 import { DummyValue, GenerateSql } from 'src/decorators';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { SharedLinkType } from 'src/enum';
-import { ISharedLinkRepository, SharedLinkSearchOptions } from 'src/interfaces/shared-link.interface';
+import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
 
 @Injectable()
 export class SharedLinkRepository implements ISharedLinkRepository {
@@ -93,7 +93,7 @@ export class SharedLinkRepository implements ISharedLinkRepository {
   }
 
   @GenerateSql({ params: [DummyValue.UUID] })
-  getAll({ userId, albumId }: SharedLinkSearchOptions): Promise<SharedLinkEntity[]> {
+  getAll(userId: string): Promise<SharedLinkEntity[]> {
     return this.db
       .selectFrom('shared_links')
       .selectAll('shared_links')
@@ -149,7 +149,6 @@ export class SharedLinkRepository implements ISharedLinkRepository {
       )
       .select((eb) => eb.fn.toJson('album').as('album'))
       .where((eb) => eb.or([eb('shared_links.type', '=', SharedLinkType.INDIVIDUAL), eb('album.id', 'is not', null)]))
-      .$if(!!albumId, (eb) => eb.where('shared_links.albumId', '=', albumId!))
       .orderBy('shared_links.createdAt', 'desc')
       .distinctOn(['shared_links.createdAt'])
       .execute() as unknown as Promise<SharedLinkEntity[]>;

server/src/repositories/system-metadata.repository.ts

@@ -5,11 +5,12 @@ import { readFile } from 'node:fs/promises';
 import { DB, SystemMetadata as DbSystemMetadata } from 'src/db';
 import { GenerateSql } from 'src/decorators';
 import { SystemMetadata } from 'src/entities/system-metadata.entity';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 
 type Upsert = Insertable<DbSystemMetadata>;
 
 @Injectable()
-export class SystemMetadataRepository {
+export class SystemMetadataRepository implements ISystemMetadataRepository {
   constructor(@InjectKysely() private db: Kysely<DB>) {}
 
   @GenerateSql({ params: ['metadata_key'] })

server/src/services/asset.service.spec.ts

@@ -9,9 +9,9 @@ import { IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IStackRepository } from 'src/interfaces/stack.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AssetService } from 'src/services/asset.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { faceStub } from 'test/fixtures/face.stub';

server/src/services/auth.service.spec.ts

@@ -5,10 +5,12 @@ import { UserEntity } from 'src/entities/user.entity';
 import { AuthType, Permission } from 'src/enum';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IEventRepository } from 'src/interfaces/event.interface';
+import { ISessionRepository } from 'src/interfaces/session.interface';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AuthService } from 'src/services/auth.service';
-import { IApiKeyRepository, IOAuthRepository, ISessionRepository, ISystemMetadataRepository } from 'src/types';
+import { IApiKeyRepository, IOAuthRepository } from 'src/types';
 import { keyStub } from 'test/fixtures/api-key.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { sessionStub } from 'test/fixtures/session.stub';
@@ -256,7 +258,7 @@ describe('AuthService', () => {
 
     it('should validate using authorization header', async () => {
       userMock.get.mockResolvedValue(userStub.user1);
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid as any);
+      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
       await expect(
         sut.authenticate({
           headers: { authorization: 'Bearer auth_token' },
@@ -361,7 +363,7 @@ describe('AuthService', () => {
     });
 
     it('should return an auth dto', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid as any);
+      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
       await expect(
         sut.authenticate({
           headers: { cookie: 'immich_access_token=auth_token' },
@@ -375,7 +377,7 @@ describe('AuthService', () => {
     });
 
     it('should throw if admin route and not an admin', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.valid as any);
+      sessionMock.getByToken.mockResolvedValue(sessionStub.valid);
       await expect(
         sut.authenticate({
           headers: { cookie: 'immich_access_token=auth_token' },
@@ -386,7 +388,7 @@ describe('AuthService', () => {
     });
 
     it('should update when access time exceeds an hour', async () => {
-      sessionMock.getByToken.mockResolvedValue(sessionStub.inactive as any);
+      sessionMock.getByToken.mockResolvedValue(sessionStub.inactive);
       sessionMock.update.mockResolvedValue(sessionStub.valid);
       await expect(
         sut.authenticate({

server/src/services/auth.service.ts

@@ -17,7 +17,6 @@ import {
   mapLoginResponse,
 } from 'src/dtos/auth.dto';
 import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
-import { SessionEntity } from 'src/entities/session.entity';
 import { UserEntity } from 'src/entities/user.entity';
 import { AuthType, ImmichCookie, ImmichHeader, ImmichQuery, Permission } from 'src/enum';
 import { OAuthProfile } from 'src/repositories/oauth.repository';
@@ -339,7 +338,7 @@ export class AuthService extends BaseService {
         await this.sessionRepository.update(session.id, { id: session.id, updatedAt: new Date() });
       }
 
-      return { user: session.user as unknown as UserEntity, session: session as unknown as SessionEntity };
+      return { user: session.user, session };
     }
 
     throw new UnauthorizedException('Invalid user token');

server/src/services/backup.service.spec.ts

@@ -4,9 +4,11 @@ import { StorageCore } from 'src/cores/storage.core';
 import { ImmichWorker, StorageFolder } from 'src/enum';
 import { IDatabaseRepository } from 'src/interfaces/database.interface';
 import { JobStatus } from 'src/interfaces/job.interface';
+import { IProcessRepository } from 'src/interfaces/process.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { BackupService } from 'src/services/backup.service';
-import { IConfigRepository, ICronRepository, IProcessRepository, ISystemMetadataRepository } from 'src/types';
+import { IConfigRepository, ICronRepository } from 'src/types';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';
 import { mockSpawn, newTestService } from 'test/utils';
 import { describe, Mocked } from 'vitest';

server/src/services/base.service.ts

@@ -17,10 +17,13 @@ import { IMachineLearningRepository } from 'src/interfaces/machine-learning.inte
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPartnerRepository } from 'src/interfaces/partner.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
+import { IProcessRepository } from 'src/interfaces/process.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
+import { ISessionRepository } from 'src/interfaces/session.interface';
 import { ISharedLinkRepository } from 'src/interfaces/shared-link.interface';
 import { IStackRepository } from 'src/interfaces/stack.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ITagRepository } from 'src/interfaces/tag.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { AccessRepository } from 'src/repositories/access.repository';
@@ -37,10 +40,7 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { NotificationRepository } from 'src/repositories/notification.repository';
 import { OAuthRepository } from 'src/repositories/oauth.repository';
-import { ProcessRepository } from 'src/repositories/process.repository';
 import { ServerInfoRepository } from 'src/repositories/server-info.repository';
-import { SessionRepository } from 'src/repositories/session.repository';
-import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TelemetryRepository } from 'src/repositories/telemetry.repository';
 import { TrashRepository } from 'src/repositories/trash.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
@@ -77,14 +77,14 @@ export class BaseService {
     protected oauthRepository: OAuthRepository,
     @Inject(IPartnerRepository) protected partnerRepository: IPartnerRepository,
     @Inject(IPersonRepository) protected personRepository: IPersonRepository,
-    protected processRepository: ProcessRepository,
+    @Inject(IProcessRepository) protected processRepository: IProcessRepository,
     @Inject(ISearchRepository) protected searchRepository: ISearchRepository,
     protected serverInfoRepository: ServerInfoRepository,
-    protected sessionRepository: SessionRepository,
+    @Inject(ISessionRepository) protected sessionRepository: ISessionRepository,
     @Inject(ISharedLinkRepository) protected sharedLinkRepository: ISharedLinkRepository,
     @Inject(IStackRepository) protected stackRepository: IStackRepository,
     @Inject(IStorageRepository) protected storageRepository: IStorageRepository,
-    protected systemMetadataRepository: SystemMetadataRepository,
+    @Inject(ISystemMetadataRepository) protected systemMetadataRepository: ISystemMetadataRepository,
     @Inject(ITagRepository) protected tagRepository: ITagRepository,
     protected telemetryRepository: TelemetryRepository,
     protected trashRepository: TrashRepository,

server/src/services/cli.service.spec.ts

@@ -1,6 +1,6 @@
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { CliService } from 'src/services/cli.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { userStub } from 'test/fixtures/user.stub';
 import { newTestService } from 'test/utils';
 import { Mocked, describe, it } from 'vitest';

server/src/services/duplicate.service.spec.ts

@@ -1,9 +1,10 @@
 import { IAssetRepository, WithoutProperty } from 'src/interfaces/asset.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { DuplicateService } from 'src/services/duplicate.service';
 import { SearchService } from 'src/services/search.service';
-import { ILoggingRepository, ISystemMetadataRepository } from 'src/types';
+import { ILoggingRepository } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';
 import { newTestService } from 'test/utils';

server/src/services/library.service.spec.ts

@@ -181,7 +181,6 @@ describe(LibraryService.name, () => {
           name: JobName.LIBRARY_SYNC_FILE,
           data: {
             id: libraryStub.externalLibrary1.id,
-            ownerId: libraryStub.externalLibrary1.owner.id,
             assetPath: '/data/user1/photo.jpg',
           },
         },
@@ -401,7 +400,6 @@ describe(LibraryService.name, () => {
     it('should import a new asset', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: '/data/user1/photo.jpg',
       };
 
@@ -445,7 +443,6 @@ describe(LibraryService.name, () => {
     it('should import a new video', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: '/data/user1/video.mp4',
       };
 
@@ -489,7 +486,6 @@ describe(LibraryService.name, () => {
     it('should not import an asset to a soft deleted library', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: '/data/user1/photo.jpg',
       };
 
@@ -504,7 +500,6 @@ describe(LibraryService.name, () => {
     it('should not refresh a file whose mtime matches existing asset', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: assetStub.hasFileExtension.originalPath,
       };
 
@@ -522,10 +517,9 @@ describe(LibraryService.name, () => {
       expect(jobMock.queueAll).not.toHaveBeenCalled();
     });
 
-    it('should skip existing asset', async () => {
+    it('should skip an existing asset', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: '/data/user1/photo.jpg',
       };
 
@@ -537,7 +531,6 @@ describe(LibraryService.name, () => {
     it('should not refresh an asset trashed by user', async () => {
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: mockUser.id,
         assetPath: assetStub.hasFileExtension.originalPath,
       };
 
@@ -554,7 +547,6 @@ describe(LibraryService.name, () => {
 
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: userStub.admin.id,
         assetPath: '/data/user1/photo.jpg',
       };
 
@@ -572,7 +564,6 @@ describe(LibraryService.name, () => {
 
       const mockLibraryJob: ILibraryFileJob = {
         id: libraryStub.externalLibrary1.id,
-        ownerId: userStub.admin.id,
         assetPath: '/data/user1/photo.jpg',
       };
 
@@ -923,7 +914,6 @@ describe(LibraryService.name, () => {
             data: {
               id: libraryStub.externalLibraryWithImportPaths1.id,
               assetPath: '/foo/photo.jpg',
-              ownerId: libraryStub.externalLibraryWithImportPaths1.owner.id,
             },
           },
         ]);
@@ -948,7 +938,6 @@ describe(LibraryService.name, () => {
             data: {
               id: libraryStub.externalLibraryWithImportPaths1.id,
               assetPath: '/foo/photo.jpg',
-              ownerId: libraryStub.externalLibraryWithImportPaths1.owner.id,
             },
           },
         ]);

server/src/services/library.service.ts

@@ -228,14 +228,13 @@ export class LibraryService extends BaseService {
     return mapLibrary(library);
   }
 
-  private async syncFiles({ id, ownerId }: LibraryEntity, assetPaths: string[]) {
+  private async syncFiles({ id }: LibraryEntity, assetPaths: string[]) {
     await this.jobRepository.queueAll(
       assetPaths.map((assetPath) => ({
         name: JobName.LIBRARY_SYNC_FILE,
         data: {
           id,
           assetPath,
-          ownerId,
         },
       })),
     );
@@ -401,7 +400,7 @@ export class LibraryService extends BaseService {
     const mtime = stat.mtime;
 
     asset = await this.assetRepository.create({
-      ownerId: job.ownerId,
+      ownerId: library.ownerId,
       libraryId: job.id,
       checksum: pathHash,
       originalPath: assetPath,
@@ -433,12 +432,18 @@ export class LibraryService extends BaseService {
   async queueScan(id: string) {
     await this.findOrFail(id);
 
+    // We purge any existing scan jobs for this library. This is because the scan settings
+    // might have changed and the user wants to start a new scan with these settings.
+    await this.jobRepository.removeJob(id, JobName.LIBRARY_QUEUE_SYNC_FILES);
+    await this.jobRepository.removeJob(id, JobName.LIBRARY_QUEUE_SYNC_ASSETS);
+
     await this.jobRepository.queue({
       name: JobName.LIBRARY_QUEUE_SYNC_FILES,
       data: {
         id,
       },
     });
+
     await this.jobRepository.queue({ name: JobName.LIBRARY_QUEUE_SYNC_ASSETS, data: { id } });
   }
 

server/src/services/media.service.spec.ts

@@ -18,8 +18,9 @@ import { IJobRepository, JobCounts, JobName, JobStatus } from 'src/interfaces/jo
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { MediaService } from 'src/services/media.service';
-import { ILoggingRepository, IMediaRepository, ISystemMetadataRepository, RawImageInfo } from 'src/types';
+import { ILoggingRepository, IMediaRepository, RawImageInfo } from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { faceStub } from 'test/fixtures/face.stub';
 import { probeStub } from 'test/fixtures/media.stub';

server/src/services/metadata.service.spec.ts

@@ -12,17 +12,12 @@ import { IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { ITagRepository } from 'src/interfaces/tag.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { ImmichTags } from 'src/repositories/metadata.repository';
 import { MetadataService } from 'src/services/metadata.service';
-import {
+import { IConfigRepository, IMapRepository, IMediaRepository, IMetadataRepository } from 'src/types';
-  IConfigRepository,
-  IMapRepository,
-  IMediaRepository,
-  IMetadataRepository,
-  ISystemMetadataRepository,
-} from 'src/types';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { fileStub } from 'test/fixtures/file.stub';
 import { probeStub } from 'test/fixtures/media.stub';

server/src/services/notification.service.spec.ts

@@ -8,10 +8,11 @@ import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IAssetRepository } from 'src/interfaces/asset.interface';
 import { IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, INotifyAlbumUpdateJob, JobName, JobStatus } from 'src/interfaces/job.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { EmailTemplate } from 'src/repositories/notification.repository';
 import { NotificationService } from 'src/services/notification.service';
-import { INotificationRepository, ISystemMetadataRepository } from 'src/types';
+import { INotificationRepository } from 'src/types';
 import { albumStub } from 'test/fixtures/album.stub';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { userStub } from 'test/fixtures/user.stub';

server/src/services/person.service.spec.ts

@@ -10,8 +10,9 @@ import { DetectedFaces, IMachineLearningRepository } from 'src/interfaces/machin
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { FaceSearchResult, ISearchRepository } from 'src/interfaces/search.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { PersonService } from 'src/services/person.service';
-import { IMediaRepository, ISystemMetadataRepository } from 'src/types';
+import { IMediaRepository } from 'src/types';
 import { ImmichFileResponse } from 'src/utils/file';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { authStub } from 'test/fixtures/auth.stub';

server/src/services/server.service.spec.ts

@@ -1,8 +1,8 @@
 import { SystemMetadataKey } from 'src/enum';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { ServerService } from 'src/services/server.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { newTestService } from 'test/utils';
 import { Mocked } from 'vitest';
 

server/src/services/session.service.spec.ts

@@ -1,6 +1,7 @@
+import { UserEntity } from 'src/entities/user.entity';
 import { JobStatus } from 'src/interfaces/job.interface';
+import { ISessionRepository } from 'src/interfaces/session.interface';
 import { SessionService } from 'src/services/session.service';
-import { ISessionRepository } from 'src/types';
 import { authStub } from 'test/fixtures/auth.stub';
 import { sessionStub } from 'test/fixtures/session.stub';
 import { IAccessRepositoryMock } from 'test/repositories/access.repository.mock';
@@ -37,6 +38,7 @@ describe('SessionService', () => {
           deviceType: '',
           id: '123',
           token: '420',
+          user: {} as UserEntity,
           userId: '42',
         },
       ]);
@@ -48,7 +50,7 @@ describe('SessionService', () => {
 
   describe('getAll', () => {
     it('should get the devices', async () => {
-      sessionMock.getByUserId.mockResolvedValue([sessionStub.valid as any, sessionStub.inactive]);
+      sessionMock.getByUserId.mockResolvedValue([sessionStub.valid, sessionStub.inactive]);
       await expect(sut.getAll(authStub.user1)).resolves.toEqual([
         {
           createdAt: '2021-01-01T00:00:00.000Z',
@@ -74,7 +76,7 @@ describe('SessionService', () => {
 
   describe('logoutDevices', () => {
     it('should logout all devices', async () => {
-      sessionMock.getByUserId.mockResolvedValue([sessionStub.inactive, sessionStub.valid] as any[]);
+      sessionMock.getByUserId.mockResolvedValue([sessionStub.inactive, sessionStub.valid]);
 
       await sut.deleteAll(authStub.user1);
 

server/src/services/shared-link.service.spec.ts

@@ -29,11 +29,11 @@ describe(SharedLinkService.name, () => {
   describe('getAll', () => {
     it('should return all shared links for a user', async () => {
       sharedLinkMock.getAll.mockResolvedValue([sharedLinkStub.expired, sharedLinkStub.valid]);
-      await expect(sut.getAll(authStub.user1, {})).resolves.toEqual([
+      await expect(sut.getAll(authStub.user1)).resolves.toEqual([
         sharedLinkResponseStub.expired,
         sharedLinkResponseStub.valid,
       ]);
-      expect(sharedLinkMock.getAll).toHaveBeenCalledWith({ userId: authStub.user1.user.id });
+      expect(sharedLinkMock.getAll).toHaveBeenCalledWith(authStub.user1.user.id);
     });
   });
 

server/src/services/shared-link.service.ts

@@ -9,7 +9,6 @@ import {
   SharedLinkEditDto,
   SharedLinkPasswordDto,
   SharedLinkResponseDto,
-  SharedLinkSearchDto,
 } from 'src/dtos/shared-link.dto';
 import { SharedLinkEntity } from 'src/entities/shared-link.entity';
 import { Permission, SharedLinkType } from 'src/enum';
@@ -18,10 +17,8 @@ import { getExternalDomain, OpenGraphTags } from 'src/utils/misc';
 
 @Injectable()
 export class SharedLinkService extends BaseService {
-  async getAll(auth: AuthDto, { albumId }: SharedLinkSearchDto): Promise<SharedLinkResponseDto[]> {
+  async getAll(auth: AuthDto): Promise<SharedLinkResponseDto[]> {
-    return this.sharedLinkRepository
+    return this.sharedLinkRepository.getAll(auth.user.id).then((links) => links.map((link) => mapSharedLink(link)));
-      .getAll({ userId: auth.user.id, albumId })
-      .then((links) => links.map((link) => mapSharedLink(link)));
   }
 
   async getMine(auth: AuthDto, dto: SharedLinkPasswordDto): Promise<SharedLinkResponseDto> {

server/src/services/smart-info.service.spec.ts

@@ -5,8 +5,9 @@ import { IDatabaseRepository } from 'src/interfaces/database.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
 import { IMachineLearningRepository } from 'src/interfaces/machine-learning.interface';
 import { ISearchRepository } from 'src/interfaces/search.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { SmartInfoService } from 'src/services/smart-info.service';
-import { IConfigRepository, ISystemMetadataRepository } from 'src/types';
+import { IConfigRepository } from 'src/types';
 import { getCLIPModelInfo } from 'src/utils/misc';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';

server/src/services/storage-template.service.spec.ts

@@ -8,9 +8,9 @@ import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { JobStatus } from 'src/interfaces/job.interface';
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { StorageTemplateService } from 'src/services/storage-template.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { albumStub } from 'test/fixtures/album.stub';
 import { assetStub } from 'test/fixtures/asset.stub';
 import { userStub } from 'test/fixtures/user.stub';

server/src/services/storage.service.spec.ts

@@ -1,7 +1,8 @@
 import { SystemMetadataKey } from 'src/enum';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { StorageService } from 'src/services/storage.service';
-import { IConfigRepository, ILoggingRepository, ISystemMetadataRepository } from 'src/types';
+import { IConfigRepository, ILoggingRepository } from 'src/types';
 import { ImmichStartupError } from 'src/utils/misc';
 import { mockEnvData } from 'test/repositories/config.repository.mock';
 import { newTestService } from 'test/utils';

server/src/services/system-config.service.spec.ts

@@ -14,8 +14,9 @@ import {
 } from 'src/enum';
 import { IEventRepository } from 'src/interfaces/event.interface';
 import { QueueName } from 'src/interfaces/job.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { SystemConfigService } from 'src/services/system-config.service';
-import { DeepPartial, IConfigRepository, ILoggingRepository, ISystemMetadataRepository } from 'src/types';
+import { DeepPartial, IConfigRepository, ILoggingRepository } from 'src/types';
 import { mockEnvData } from 'test/repositories/config.repository.mock';
 import { newTestService } from 'test/utils';
 import { Mocked } from 'vitest';

server/src/services/system-metadata.service.spec.ts

@@ -1,6 +1,6 @@
 import { SystemMetadataKey } from 'src/enum';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { SystemMetadataService } from 'src/services/system-metadata.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { newTestService } from 'test/utils';
 import { Mocked } from 'vitest';
 

server/src/services/user.service.spec.ts

@@ -4,9 +4,9 @@ import { CacheControl, UserMetadataKey } from 'src/enum';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { IJobRepository, JobName } from 'src/interfaces/job.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
 import { UserService } from 'src/services/user.service';
-import { ISystemMetadataRepository } from 'src/types';
 import { ImmichFileResponse } from 'src/utils/file';
 import { authStub } from 'test/fixtures/auth.stub';
 import { systemConfigStub } from 'test/fixtures/system-config.stub';

server/src/services/version.service.spec.ts

@@ -4,14 +4,9 @@ import { serverVersion } from 'src/constants';
 import { ImmichEnvironment, SystemMetadataKey } from 'src/enum';
 import { IEventRepository } from 'src/interfaces/event.interface';
 import { IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { VersionService } from 'src/services/version.service';
-import {
+import { IConfigRepository, ILoggingRepository, IServerInfoRepository, IVersionHistoryRepository } from 'src/types';
-  IConfigRepository,
-  ILoggingRepository,
-  IServerInfoRepository,
-  ISystemMetadataRepository,
-  IVersionHistoryRepository,
-} from 'src/types';
 import { mockEnvData } from 'test/repositories/config.repository.mock';
 import { newTestService } from 'test/utils';
 import { Mocked } from 'vitest';

server/src/types.ts

@@ -14,10 +14,7 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { NotificationRepository } from 'src/repositories/notification.repository';
 import { OAuthRepository } from 'src/repositories/oauth.repository';
-import { ProcessRepository } from 'src/repositories/process.repository';
 import { ServerInfoRepository } from 'src/repositories/server-info.repository';
-import { SessionRepository } from 'src/repositories/session.repository';
-import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { MetricGroupRepository, TelemetryRepository } from 'src/repositories/telemetry.repository';
 import { TrashRepository } from 'src/repositories/trash.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
@@ -61,10 +58,7 @@ export type IMetadataRepository = RepositoryInterface<MetadataRepository>;
 export type IMetricGroupRepository = RepositoryInterface<MetricGroupRepository>;
 export type INotificationRepository = RepositoryInterface<NotificationRepository>;
 export type IOAuthRepository = RepositoryInterface<OAuthRepository>;
-export type IProcessRepository = RepositoryInterface<ProcessRepository>;
-export type ISessionRepository = RepositoryInterface<SessionRepository>;
 export type IServerInfoRepository = RepositoryInterface<ServerInfoRepository>;
-export type ISystemMetadataRepository = RepositoryInterface<SystemMetadataRepository>;
 export type ITelemetryRepository = RepositoryInterface<TelemetryRepository>;
 export type ITrashRepository = RepositoryInterface<TrashRepository>;
 export type IViewRepository = RepositoryInterface<ViewRepository>;
@@ -83,8 +77,6 @@ export type MemoryItem =
   | Awaited<ReturnType<IMemoryRepository['create']>>
   | Awaited<ReturnType<IMemoryRepository['search']>>[0];
 
-export type SessionItem = Awaited<ReturnType<ISessionRepository['getByUserId']>>[0];
-
 export interface CropOptions {
   top: number;
   left: number;

server/src/utils/config.ts

@@ -7,7 +7,8 @@ import { SystemConfig, defaults } from 'src/config';
 import { SystemConfigDto } from 'src/dtos/system-config.dto';
 import { SystemMetadataKey } from 'src/enum';
 import { DatabaseLock } from 'src/interfaces/database.interface';
-import { DeepPartial, IConfigRepository, ILoggingRepository, ISystemMetadataRepository } from 'src/types';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
+import { DeepPartial, IConfigRepository, ILoggingRepository } from 'src/types';
 import { getKeysDeep, unsetDeep } from 'src/utils/misc';
 
 export type SystemConfigValidator = (config: SystemConfig, newConfig: SystemConfig) => void | Promise<void>;

server/test/repositories/process.repository.mock.ts

@@ -1,4 +1,4 @@
-import { IProcessRepository } from 'src/types';
+import { IProcessRepository } from 'src/interfaces/process.interface';
 import { Mocked, vitest } from 'vitest';
 
 export const newProcessRepositoryMock = (): Mocked<IProcessRepository> => {

server/test/repositories/session.repository.mock.ts

@@ -1,4 +1,4 @@
-import { ISessionRepository } from 'src/types';
+import { ISessionRepository } from 'src/interfaces/session.interface';
 import { Mocked, vitest } from 'vitest';
 
 export const newSessionRepositoryMock = (): Mocked<ISessionRepository> => {

server/test/repositories/system-metadata.repository.mock.ts

@@ -1,4 +1,4 @@
-import { ISystemMetadataRepository } from 'src/types';
+import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
 import { clearConfigCache } from 'src/utils/config';
 import { Mocked, vitest } from 'vitest';
 

server/test/utils.ts

@@ -15,10 +15,7 @@ import { MemoryRepository } from 'src/repositories/memory.repository';
 import { MetadataRepository } from 'src/repositories/metadata.repository';
 import { NotificationRepository } from 'src/repositories/notification.repository';
 import { OAuthRepository } from 'src/repositories/oauth.repository';
-import { ProcessRepository } from 'src/repositories/process.repository';
 import { ServerInfoRepository } from 'src/repositories/server-info.repository';
-import { SessionRepository } from 'src/repositories/session.repository';
-import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
 import { TelemetryRepository } from 'src/repositories/telemetry.repository';
 import { TrashRepository } from 'src/repositories/trash.repository';
 import { VersionHistoryRepository } from 'src/repositories/version-history.repository';
@@ -38,10 +35,7 @@ import {
   IMetadataRepository,
   INotificationRepository,
   IOAuthRepository,
-  IProcessRepository,
   IServerInfoRepository,
-  ISessionRepository,
-  ISystemMetadataRepository,
   ITrashRepository,
   IVersionHistoryRepository,
   IViewRepository,
@@ -169,14 +163,14 @@ export const newTestService = <T extends BaseService>(
     oauthMock as IOAuthRepository as OAuthRepository,
     partnerMock,
     personMock,
-    processMock as IProcessRepository as ProcessRepository,
+    processMock,
     searchMock,
     serverInfoMock as IServerInfoRepository as ServerInfoRepository,
-    sessionMock as ISessionRepository as SessionRepository,
+    sessionMock,
     sharedLinkMock,
     stackMock,
     storageMock,
-    systemMock as ISystemMetadataRepository as SystemMetadataRepository,
+    systemMock,
     tagMock,
     telemetryMock as unknown as TelemetryRepository,
     trashMock as ITrashRepository as TrashRepository,

web/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "immich-web",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "immich-web",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@formatjs/icu-messageformat-parser": "^2.9.8",
@@ -77,7 +77,7 @@
     },
     "../open-api/typescript-sdk": {
       "name": "@immich/sdk",
-      "version": "1.126.0",
+      "version": "1.125.7",
       "license": "GNU Affero General Public License version 3",
       "dependencies": {
         "@oazapfts/runtime": "^1.0.2"

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "immich-web",
-  "version": "1.126.0",
+  "version": "1.125.7",
   "license": "GNU Affero General Public License version 3",
   "scripts": {
     "dev": "vite dev --host 0.0.0.0 --port 3000",

web/src/lib/components/album-page/album-shared-link.svelte

@@ -1,40 +0,0 @@
-<script lang="ts">
-  import SharedLinkCopy from '$lib/components/sharedlinks-page/actions/shared-link-copy.svelte';
-  import { locale } from '$lib/stores/preferences.store';
-  import type { AlbumResponseDto, SharedLinkResponseDto } from '@immich/sdk';
-  import { Text } from '@immich/ui';
-  import { DateTime } from 'luxon';
-  import { t } from 'svelte-i18n';
-
-  type Props = {
-    album: AlbumResponseDto;
-    sharedLink: SharedLinkResponseDto;
-  };
-
-  const { album, sharedLink }: Props = $props();
-</script>
-
-<div class="flex justify-between items-center">
-  <div class="flex flex-col gap-1">
-    <Text size="small">{sharedLink.description || album.albumName}</Text>
-    <Text size="tiny" color="muted"
-      >{[
-        DateTime.fromISO(sharedLink.createdAt).toLocaleString(
-          {
-            month: 'long',
-            day: 'numeric',
-            year: 'numeric',
-          },
-          { locale: $locale },
-        ),
-        sharedLink.allowUpload && $t('upload'),
-        sharedLink.allowDownload && $t('download'),
-        sharedLink.showMetadata && $t('exif'),
-        sharedLink.password && $t('password'),
-      ]
-        .filter(Boolean)
-        .join(' • ')}</Text
-    >
-  </div>
-  <SharedLinkCopy link={sharedLink} />
-</div>

web/src/lib/components/album-page/user-selection-modal.svelte

@@ -1,5 +1,4 @@
 <script lang="ts">
-  import AlbumSharedLink from '$lib/components/album-page/album-shared-link.svelte';
   import Dropdown from '$lib/components/elements/dropdown.svelte';
   import Icon from '$lib/components/elements/icon.svelte';
   import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
@@ -13,11 +12,11 @@
     type SharedLinkResponseDto,
     type UserResponseDto,
   } from '@immich/sdk';
-  import { Button, Link, Stack, Text } from '@immich/ui';
+  import { mdiCheck, mdiEye, mdiLink, mdiPencil, mdiShareCircle } from '@mdi/js';
-  import { mdiCheck, mdiEye, mdiLink, mdiPencil } from '@mdi/js';
   import { onMount } from 'svelte';
-  import { t } from 'svelte-i18n';
+  import Button from '../elements/buttons/button.svelte';
   import UserAvatar from '../shared-components/user-avatar.svelte';
+  import { t } from 'svelte-i18n';
 
   interface Props {
     album: AlbumResponseDto;
@@ -39,7 +38,7 @@
 
   let sharedLinks: SharedLinkResponseDto[] = $state([]);
   onMount(async () => {
-    sharedLinks = await getAllSharedLinks({ albumId: album.id });
+    await getSharedLinks();
     const data = await searchUsers();
 
     // remove album owner
@@ -51,6 +50,11 @@
     }
   });
 
+  const getSharedLinks = async () => {
+    const data = await getAllSharedLinks();
+    sharedLinks = data.filter((link) => link.album?.id === album.id);
+  };
+
   const handleToggle = (user: UserResponseDto) => {
     if (Object.keys(selectedUsers).includes(user.id)) {
       delete selectedUsers[user.id];
@@ -68,10 +72,10 @@
   };
 </script>
 
-<FullScreenModal title={$t('share')} showLogo {onClose}>
+<FullScreenModal title={$t('invite_to_album')} showLogo {onClose}>
   {#if Object.keys(selectedUsers).length > 0}
     <div class="mb-2 py-2 sticky">
-      <p class="text-xs font-medium">{$t('selected')}</p>
+      <p class="text-xs font-medium">{$t('selected').toUpperCase()}</p>
       <div class="my-2">
         {#each Object.values(selectedUsers) as { user }}
           {#key user.id}
@@ -113,7 +117,7 @@
 
   <div class="immich-scrollbar max-h-[500px] overflow-y-auto">
     {#if users.length > 0 && users.length !== Object.keys(selectedUsers).length}
-      <Text>{$t('users')}</Text>
+      <p class="text-xs font-medium">{$t('suggestions').toUpperCase()}</p>
 
       <div class="my-2">
         {#each users as user}
@@ -140,9 +144,9 @@
   {#if users.length > 0}
     <div class="py-3">
       <Button
-        size="small"
+        size="sm"
-        fullWidth
+        fullwidth
-        shape="round"
+        rounded="full"
         disabled={Object.keys(selectedUsers).length === 0}
         onclick={() =>
           onSelect(Object.values(selectedUsers).map(({ user, ...rest }) => ({ userId: user.id, ...rest })))}
@@ -151,22 +155,26 @@
     </div>
   {/if}
 
-  <hr class="my-4" />
+  <hr />
 
-  <Stack gap={6}>
+  <div id="shared-buttons" class="mt-4 flex place-content-center place-items-center justify-around">
-    {#if sharedLinks.length > 0}
+    <button
-      <div class="flex justify-between items-center">
+      type="button"
-        <Text>{$t('shared_links')}</Text>
+      class="flex flex-col place-content-center place-items-center gap-2 hover:cursor-pointer"
-        <Link href={AppRoute.SHARED_LINKS} class="text-sm">{$t('view_all')}</Link>
+      onclick={onShare}
-      </div>
+    >
+      <Icon path={mdiLink} size={24} />
+      <p class="text-sm">{$t('create_link')}</p>
+    </button>
 
-      <Stack gap={4}>
+    {#if sharedLinks.length}
-        {#each sharedLinks as sharedLink}
+      <a
-          <AlbumSharedLink {album} {sharedLink} />
+        href={AppRoute.SHARED_LINKS}
-        {/each}
+        class="flex flex-col place-content-center place-items-center gap-2 hover:cursor-pointer"
-      </Stack>
+      >
+        <Icon path={mdiShareCircle} size={24} />
+        <p class="text-sm">{$t('view_links')}</p>
+      </a>
     {/if}
-
+  </div>
-    <Button leadingIcon={mdiLink} size="small" shape="round" fullWidth onclick={onShare}>{$t('create_link')}</Button>
-  </Stack>
 </FullScreenModal>

web/src/routes/(user)/shared-links/[[id=id]]/+page.svelte

@@ -27,7 +27,7 @@
   let sharedLink = $derived(sharedLinks.find(({ id }) => id === page.params.id));
 
   const refresh = async () => {
-    sharedLinks = await getAllSharedLinks({});
+    sharedLinks = await getAllSharedLinks();
   };
 
   onMount(async () => {
@@ -97,7 +97,7 @@
     </div>
   {/snippet}
 
-  <div class="w-full max-w-3xl m-auto">
+  <div>
     {#if sharedLinks.length === 0}
       <div
         class="flex place-content-center place-items-center rounded-lg bg-gray-100 dark:bg-immich-dark-gray dark:text-immich-gray p-12"