@futo-org/backups-orchestrator-api 0.38.0 → 0.40.0

package/dist/services/auth.service.js

@@ -12,8 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthService = void 0;
 const backups_api_client_1 = require("@futo-org/backups-api-client");
 const common_1 = require("@nestjs/common");
+const event_iterator_1 = require("event-iterator");
 const eventsource_client_1 = require("eventsource-client");
 const node_os_1 = require("node:os");
+const rxjs_1 = require("rxjs");
 const const_1 = require("../const");
 const enum_1 = require("../enum");
 const events_gateway_1 = require("../events/events.gateway");
@@ -22,6 +24,7 @@ const config_repository_1 = require("../repositories/config.repository");
 const moduleConfig_repository_1 = require("../repositories/moduleConfig.repository");
 const repository_repository_1 = require("../repositories/repository.repository");
 const wellKnown_1 = require("../wellKnown");
+const session_service_1 = require("./session.service");
 const telemetry_service_1 = require("./telemetry.service");
 let AuthService = class AuthService {
     config;
@@ -30,13 +33,15 @@ let AuthService = class AuthService {
     events;
     telemetry;
     repository;
-    constructor(config, backend, moduleConfig, events, telemetry, repository) {
+    session;
+    constructor(config, backend, moduleConfig, events, telemetry, repository, session) {
         this.config = config;
         this.backend = backend;
         this.moduleConfig = moduleConfig;
         this.events = events;
         this.telemetry = telemetry;
         this.repository = repository;
+        this.session = session;
     }
     connectionType() {
         return this.moduleConfig.get().immichIntegration ? 'immich' : 'standalone';
@@ -81,65 +86,138 @@ let AuthService = class AuthService {
             this.telemetry.submitStructuredLog('Repository adoption skipped', { error: String(error) });
         }
     }
-    async waitForDeviceFlow(events, overrideEndpoint, endpoint) {
-        for await (const { data } of events) {
-            const { type, accessToken } = JSON.parse(data);
-            switch (type) {
-                case 'SUCCESS': {
-                    await this.backend.updateBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID, {
-                        type: enum_1.BackendType.Yucca,
-                        accessToken,
-                        url: overrideEndpoint,
-                    });
-                    await this.adoptOwnRepositories(endpoint, accessToken);
-                    this.telemetry.submitStructuredLog('Connected FUTO Backups backend', {
-                        backendId: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
-                    });
-                    this.events.publish({
-                        type: 'BackendCreate',
-                        backend: {
-                            id: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
-                            type: enum_1.BackendType.Yucca,
-                            description: 'FUTO Backups',
-                            isOnline: true,
-                        },
+    async fetchBackendUserId(endpoint, accessToken) {
+        const auth = await (0, backups_api_client_1.getAuth)({
+            baseUrl: endpoint,
+            headers: { cookie: `${enum_1.CookieName.YuccaAccessToken}=${accessToken}` },
+        });
+        return auth.id;
+    }
+    async connectBackend(endpoint, accessToken, userId) {
+        await this.backend.updateBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID, {
+            type: enum_1.BackendType.Yucca,
+            accessToken,
+            userId,
+        });
+        await this.adoptOwnRepositories(endpoint, accessToken);
+        this.telemetry.submitStructuredLog('Connected FUTO Backups backend', {
+            backendId: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
+        });
+        this.events.publish({
+            type: 'BackendCreate',
+            backend: {
+                id: const_1.REPOSITORY_DEFAULT_CLOUD_UUID,
+                type: enum_1.BackendType.Yucca,
+                description: 'FUTO Backups',
+                isOnline: true,
+            },
+        });
+    }
+    async relayDeviceFlow(identity, endpoint, publish) {
+        const url = new URL(identity ? '/api/auth/oidc/device/identity' : '/api/auth/oidc/device', endpoint);
+        if (!identity) {
+            url.searchParams.set('connection_type', this.connectionType());
+            url.searchParams.set('connection_name', this.connectionName());
+        }
+        const events = (0, eventsource_client_1.createEventSource)({
+            url,
+            onDisconnect: () => events.close(),
+        });
+        const connectTimeout = setTimeout(() => events.close(), 10_000);
+        try {
+            for await (const { data } of events) {
+                clearTimeout(connectTimeout);
+                const message = JSON.parse(data);
+                if (message.type === 'START') {
+                    publish({
+                        type: enum_1.DeviceFlowEventType.Start,
+                        userCode: message.userCode,
+                        verificationUri: message.verificationUri,
                     });
-                    break;
+                    continue;
                 }
-                case 'FAILURE': {
-                    this.telemetry.submitStructuredLog('Device flow authentication failed', {});
-                    this.events.publish({
-                        type: 'DeviceFlowFailure',
-                    });
-                    break;
+                if (message.type === 'SUCCESS') {
+                    return message;
+                }
+                if (message.type === 'FAILURE') {
+                    this.telemetry.submitStructuredLog('Device flow authentication failed', { reason: message.reason });
+                    return;
                 }
             }
         }
-        events.close();
+        finally {
+            clearTimeout(connectTimeout);
+            events.close();
+        }
     }
-    async oidcDeviceFlow() {
+    async runDeviceFlow(identity, publish) {
+        const cloud = await this.session.cloudConfiguration();
+        if (identity && !cloud) {
+            publish({ type: enum_1.DeviceFlowEventType.Failure, reason: enum_1.DeviceFlowFailureReason.NotConnected });
+            return;
+        }
         const endpoint = await wellKnown_1.yuccaWellKnown.getBaseUrl();
-        const url = new URL('/api/auth/oidc/device', endpoint);
-        url.searchParams.set('connection_type', this.connectionType());
-        url.searchParams.set('connection_name', this.connectionName());
-        const events = (0, eventsource_client_1.createEventSource)({
-            url,
-            onDisconnect: () => events.close(),
+        const upstream = await this.relayDeviceFlow(identity, endpoint, publish);
+        if (!upstream) {
+            publish({ type: enum_1.DeviceFlowEventType.Failure, reason: enum_1.DeviceFlowFailureReason.DeviceFlowFailed });
+            return;
+        }
+        if (!upstream.userId) {
+            throw new Error('Device flow succeeded without a user');
+        }
+        const userId = upstream.userId;
+        let backendId;
+        if (identity) {
+            const configuration = cloud;
+            let claimedUserId = configuration.userId;
+            if (!claimedUserId) {
+                claimedUserId = await this.fetchBackendUserId(endpoint, configuration.accessToken);
+                await this.backend.updateBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID, { ...configuration, userId: claimedUserId });
+            }
+            if (userId !== claimedUserId) {
+                publish({ type: enum_1.DeviceFlowEventType.Failure, reason: enum_1.DeviceFlowFailureReason.WrongAccount });
+                return;
+            }
+        }
+        else {
+            const { accessToken } = upstream;
+            if (!accessToken) {
+                throw new Error('Device flow succeeded without an access token');
+            }
+            backendId = const_1.REPOSITORY_DEFAULT_CLOUD_UUID;
+            await this.connectBackend(endpoint, accessToken, userId);
+        }
+        const configuration = await this.session.cloudConfiguration();
+        const isRequired = this.session.isRequired(configuration);
+        publish({
+            type: enum_1.DeviceFlowEventType.Success,
+            token: isRequired ? await this.session.issue(userId) : undefined,
+            backendId,
         });
-        const connectTimeout = setTimeout(() => events.close(), 10_000);
-        for await (const { data } of events) {
-            clearTimeout(connectTimeout);
-            const { userCode, verificationUri } = JSON.parse(data);
-            void this.waitForDeviceFlow(events, undefined, endpoint).catch((error) => {
-                this.telemetry.submitStructuredLog('Device flow authentication errored', { error });
-                this.events.publish({ type: 'DeviceFlowFailure' });
+    }
+    deviceFlow(identity) {
+        return (0, rxjs_1.from)(new event_iterator_1.EventIterator((queue) => void this.runDeviceFlow(identity, (event) => queue.push({ data: event }))
+            .catch((error) => {
+            this.telemetry.submitStructuredLog('Device flow authentication errored', { error });
+            queue.push({
+                data: { type: enum_1.DeviceFlowEventType.Failure, reason: enum_1.DeviceFlowFailureReason.Unknown },
             });
-            return {
-                userCode,
-                verificationUri,
-            };
+        })
+            .finally(() => queue.stop())));
+    }
+    async createTicket(dto) {
+        const localRepository = await this.repository.get(dto.repositoryId);
+        if (!localRepository) {
+            throw new common_1.NotFoundException('Repository not found locally');
         }
-        throw new common_1.InternalServerErrorException('Failed to start authentication with FUTO Backups');
+        const result = await this.backend.getBackend(localRepository.backendId);
+        if (!result) {
+            throw new common_1.NotFoundException('Backend not found locally');
+        }
+        return await result.backend.createTicket({
+            action: dto.action,
+            repositoryId: localRepository.remoteId,
+        });
     }
 };
 exports.AuthService = AuthService;
@@ -150,6 +228,7 @@ exports.AuthService = AuthService = __decorate([
         moduleConfig_repository_1.ModuleConfigRepository,
         events_gateway_1.EventsGateway,
         telemetry_service_1.TelemetryService,
-        repository_repository_1.RepositoryRepository])
+        repository_repository_1.RepositoryRepository,
+        session_service_1.SessionService])
 ], AuthService);
 //# sourceMappingURL=auth.service.js.map

package/dist/services/auth.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.service.js","sourceRoot":"","sources":["../../src/services/auth.service.ts"],"names":[],"mappings":"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"}

package/dist/services/onboarding.service.d.ts

@@ -4,6 +4,7 @@ import { BootstrapRepository } from '../repositories/bootstrap.repository';
 import { ConfigRepository } from '../repositories/config.repository';
 import { RepositoryRepository } from '../repositories/repository.repository';
 import { ScheduleRepository } from '../repositories/schedule.repository';
+import { Session, SessionService } from './session.service';
 import { TelemetryService } from './telemetry.service';
 export declare class OnboardingService {
     private readonly backend;
@@ -12,8 +13,9 @@ export declare class OnboardingService {
     private readonly config;
     private readonly bootstrap;
     private readonly telemetry;
-    constructor(backend: BackendRepository, repository: RepositoryRepository, schedule: ScheduleRepository, config: ConfigRepository, bootstrap: BootstrapRepository, telemetry: TelemetryService);
-    onboardingStatus(): Promise<OnboardingStatusResponseDto>;
+    private readonly session;
+    constructor(backend: BackendRepository, repository: RepositoryRepository, schedule: ScheduleRepository, config: ConfigRepository, bootstrap: BootstrapRepository, telemetry: TelemetryService, session: SessionService);
+    onboardingStatus(session?: Session): Promise<OnboardingStatusResponseDto>;
     currentRecoveryKey(): Promise<CurrentRecoveryKeyResponse>;
     importRecoveryKey(key: string): Promise<void>;
     confirmRecoveryKey(): Promise<void>;

package/dist/services/onboarding.service.js

@@ -17,6 +17,7 @@ const bootstrap_repository_1 = require("../repositories/bootstrap.repository");
 const config_repository_1 = require("../repositories/config.repository");
 const repository_repository_1 = require("../repositories/repository.repository");
 const schedule_repository_1 = require("../repositories/schedule.repository");
+const session_service_1 = require("./session.service");
 const telemetry_service_1 = require("./telemetry.service");
 let OnboardingService = class OnboardingService {
     backend;
@@ -25,16 +26,21 @@ let OnboardingService = class OnboardingService {
     config;
     bootstrap;
     telemetry;
-    constructor(backend, repository, schedule, config, bootstrap, telemetry) {
+    session;
+    constructor(backend, repository, schedule, config, bootstrap, telemetry, session) {
         this.backend = backend;
         this.repository = repository;
         this.schedule = schedule;
         this.config = config;
         this.bootstrap = bootstrap;
         this.telemetry = telemetry;
+        this.session = session;
     }
-    async onboardingStatus() {
+    async onboardingStatus(session) {
         const status = this.bootstrap.getStatus();
+        const configuration = await this.session.cloudConfiguration();
+        const requiresAuthentication = this.session.isRequired(configuration);
+        const isAuthenticated = session !== undefined;
         if (status !== enum_1.BootstrapStatus.Ready) {
             let error = this.bootstrap.getError();
             error = error ? `${error}` : undefined;
@@ -42,6 +48,8 @@ let OnboardingService = class OnboardingService {
                 status,
                 error,
                 hasTelemetry: enum_1.TelemetryLevel.None,
+                requiresAuthentication,
+                isAuthenticated,
                 hasOnboardedKey: false,
                 hasBackend: false,
                 hasBackup: false,
@@ -55,6 +63,8 @@ let OnboardingService = class OnboardingService {
         return {
             status: enum_1.BootstrapStatus.Ready,
             hasTelemetry: (await this.config.hasTelemetry()) ? enum_1.TelemetryLevel.Full : enum_1.TelemetryLevel.None,
+            requiresAuthentication,
+            isAuthenticated,
             hasOnboardedKey: await this.config.hasOnboardedKey(),
             hasBackend: backends.length > 0,
             hasBackup: repositories.length > 0,
@@ -95,6 +105,7 @@ exports.OnboardingService = OnboardingService = __decorate([
         schedule_repository_1.ScheduleRepository,
         config_repository_1.ConfigRepository,
         bootstrap_repository_1.BootstrapRepository,
-        telemetry_service_1.TelemetryService])
+        telemetry_service_1.TelemetryService,
+        session_service_1.SessionService])
 ], OnboardingService);
 //# sourceMappingURL=onboarding.service.js.map

package/dist/services/onboarding.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"onboarding.service.js","sourceRoot":"","sources":["../../src/services/onboarding.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"onboarding.service.js","sourceRoot":"","sources":["../../src/services/onboarding.service.ts"],"names":[],"mappings":"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"}

package/dist/services/session.service.d.ts

@@ -0,0 +1,26 @@
+import { JwtService } from '@nestjs/jwt';
+import { BackendType } from '../enum';
+import { BackendRepository } from '../repositories/backend.repository';
+import { ConfigRepository } from '../repositories/config.repository';
+import { ModuleConfigRepository } from '../repositories/moduleConfig.repository';
+import { BackendConfiguration } from '../schema/tables/backend.table';
+export type CloudConfiguration = BackendConfiguration & {
+    type: BackendType.Yucca;
+};
+export type Session = {
+    userId: string;
+};
+export declare class SessionService {
+    private readonly config;
+    private readonly moduleConfig;
+    private readonly backend;
+    private readonly jwt;
+    constructor(config: ConfigRepository, moduleConfig: ModuleConfigRepository, backend: BackendRepository, jwt: JwtService);
+    cloudConfiguration(): Promise<CloudConfiguration | undefined>;
+    isRequired(configuration: CloudConfiguration | undefined): boolean;
+    issue(userId: string): Promise<string>;
+    verify(token: string | undefined, configuration: CloudConfiguration | undefined): Promise<Session | undefined>;
+    authenticate(token: string): Promise<Session>;
+    fromCookieHeader(header: string | undefined, configuration: CloudConfiguration | undefined): Promise<Session | undefined>;
+    private signingKey;
+}

package/dist/services/session.service.js

@@ -0,0 +1,88 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SessionService = void 0;
+const common_1 = require("@nestjs/common");
+const jwt_1 = require("@nestjs/jwt");
+const cookie_1 = require("cookie");
+const const_1 = require("../const");
+const enum_1 = require("../enum");
+const backend_repository_1 = require("../repositories/backend.repository");
+const config_repository_1 = require("../repositories/config.repository");
+const moduleConfig_repository_1 = require("../repositories/moduleConfig.repository");
+let SessionService = class SessionService {
+    config;
+    moduleConfig;
+    backend;
+    jwt;
+    constructor(config, moduleConfig, backend, jwt) {
+        this.config = config;
+        this.moduleConfig = moduleConfig;
+        this.backend = backend;
+        this.jwt = jwt;
+    }
+    async cloudConfiguration() {
+        const cloud = await this.backend.getBackend(const_1.REPOSITORY_DEFAULT_CLOUD_UUID);
+        return cloud?.configuration.type === enum_1.BackendType.Yucca ? cloud.configuration : undefined;
+    }
+    isRequired(configuration) {
+        if (!this.moduleConfig.get().requireSession) {
+            return false;
+        }
+        return configuration !== undefined;
+    }
+    async issue(userId) {
+        return this.jwt.signAsync({}, {
+            secret: await this.signingKey(),
+            subject: userId,
+            expiresIn: const_1.SESSION_TTL_MS / 1000,
+        });
+    }
+    async verify(token, configuration) {
+        const claimedUserId = configuration?.userId;
+        if (!token || !claimedUserId) {
+            return;
+        }
+        try {
+            await this.jwt.verifyAsync(token, { secret: await this.signingKey(), subject: claimedUserId });
+        }
+        catch {
+            return;
+        }
+        return { userId: claimedUserId };
+    }
+    async authenticate(token) {
+        const configuration = await this.cloudConfiguration();
+        const session = await this.verify(token, configuration);
+        if (!session) {
+            throw new common_1.UnauthorizedException('Session token is invalid or expired');
+        }
+        return session;
+    }
+    async fromCookieHeader(header, configuration) {
+        if (!header) {
+            return;
+        }
+        return this.verify((0, cookie_1.parse)(header)[enum_1.CookieName.SessionToken], configuration);
+    }
+    async signingKey() {
+        return this.config.getSessionSecret();
+    }
+};
+exports.SessionService = SessionService;
+exports.SessionService = SessionService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [config_repository_1.ConfigRepository,
+        moduleConfig_repository_1.ModuleConfigRepository,
+        backend_repository_1.BackendRepository,
+        jwt_1.JwtService])
+], SessionService);
+//# sourceMappingURL=session.service.js.map

package/dist/services/session.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"session.service.js","sourceRoot":"","sources":["../../src/services/session.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAmE;AACnE,qCAAyC;AACzC,mCAA+C;AAC/C,oCAAyE;AACzE,kCAAkD;AAClD,2EAAuE;AACvE,yEAAqE;AACrE,qFAAiF;AAU1E,IAAM,cAAc,GAApB,MAAM,cAAc;IAEN;IACA;IACA;IACA;IAJnB,YACmB,MAAwB,EACxB,YAAoC,EACpC,OAA0B,EAC1B,GAAe;QAHf,WAAM,GAAN,MAAM,CAAkB;QACxB,iBAAY,GAAZ,YAAY,CAAwB;QACpC,YAAO,GAAP,OAAO,CAAmB;QAC1B,QAAG,GAAH,GAAG,CAAY;IAC/B,CAAC;IAEJ,KAAK,CAAC,kBAAkB;QACtB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,qCAA6B,CAAC,CAAC;QAE3E,OAAO,KAAK,EAAE,aAAa,CAAC,IAAI,KAAK,kBAAW,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3F,CAAC;IAED,UAAU,CAAC,aAA6C;QACtD,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,cAAc,EAAE,CAAC;YAC5C,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,aAAa,KAAK,SAAS,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,MAAc;QACxB,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CACvB,EAAE,EACF;YACE,MAAM,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE;YAC/B,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,sBAAc,GAAG,IAAI;SACjC,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAAyB,EAAE,aAA6C;QACnF,MAAM,aAAa,GAAG,aAAa,EAAE,MAAM,CAAC;QAC5C,IAAI,CAAC,KAAK,IAAI,CAAC,aAAa,EAAE,CAAC;YAC7B,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,UAAU,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QACjG,CAAC;QAAC,MAAM,CAAC;YACP,OAAO;QACT,CAAC;QAED,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QACtD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QAExD,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,8BAAqB,CAAC,qCAAqC,CAAC,CAAC;QACzE,CAAC;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,MAA0B,EAC1B,aAA6C;QAE7C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO;QACT,CAAC;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAA,cAAY,EAAC,MAAM,CAAC,CAAC,iBAAU,CAAC,YAAY,CAAC,EAAE,aAAa,CAAC,CAAC;IACnF,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;IACxC,CAAC;CACF,CAAA;AAzEY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;qCAGgB,oCAAgB;QACV,gDAAsB;QAC3B,sCAAiB;QACrB,gBAAU;GALvB,cAAc,CAyE1B"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@futo-org/backups-orchestrator-api",
   "repository": "https://github.com/immich-app/yucca",
-  "version": "0.38.0",
+  "version": "0.40.0",
   "description": "Backups orchestrator (API)",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,8 +19,8 @@
   "dependencies": {
     "@futo-org/restic-wrapper": "1.3.1",
     "@nestjs/event-emitter": "^3.0.1",
+    "@nestjs/jwt": "^11.0.2",
     "better-sqlite3": "^12.6.2",
-    "class-validator": "^0.14.3",
     "cookie": "^1.1.1",
     "cron": "^4.4.0",
     "event-iterator": "^2.0.0",
@@ -28,12 +28,13 @@
     "express": "^5.2.1",
     "kysely": "0.28.2",
     "nestjs-kysely": "^3.1.2",
+    "nestjs-zod": "^5.5.0",
     "openid-client": "^6.8.1",
     "rxjs": "^7.8.2",
     "socket.io": "^4.8.3",
     "tail": "^2.2.6",
     "zod": "^4.3.5",
-    "@futo-org/backups-api-client": "^0.38.0"
+    "@futo-org/backups-api-client": "^0.40.0"
   },
   "devDependencies": {
     "@nestjs/cli": "^11.0.14",