@fastybird/smart-panel-backend 1.1.0-alpha.4 → 1.1.0-alpha.41

package/dist/modules/auth/guards/auth.guard.js

@@ -27,7 +27,6 @@ const api_documentation_decorator_1 = require("../../swagger/decorators/api-docu
 const users_service_1 = require("../../users/services/users.service");
 const users_constants_1 = require("../../users/users.constants");
 const auth_constants_1 = require("../auth.constants");
-const auth_entity_1 = require("../entities/auth.entity");
 const tokens_service_1 = require("../services/tokens.service");
 const token_utils_1 = require("../utils/token.utils");
 exports.IS_PUBLIC_KEY = 'isPublic';
@@ -116,29 +115,17 @@ let AuthGuard = class AuthGuard {
         return this.validateLongLiveToken(request, token);
     }
     async validateUserAccessToken(request, token, userId) {
-        const storedAccessTokens = await this.tokensService.findAllByOwner(userId, auth_entity_1.AccessTokenEntity);
-        let storedAccessToken = null;
-        for (const accessToken of storedAccessTokens) {
-            if ((0, token_utils_1.hashToken)(token) === accessToken.hashedToken) {
-                storedAccessToken = accessToken;
-                break;
-            }
-        }
+        const storedAccessToken = await this.tokensService.findAuthenticationAccessToken(userId, (0, token_utils_1.hashToken)(token));
         if (!storedAccessToken) {
             this.logger.warn('Access token not found in database');
             throw new common_1.UnauthorizedException('Token not found');
         }
-        if (storedAccessToken.revoked || storedAccessToken.refreshToken.revoked) {
+        if (storedAccessToken.revoked || storedAccessToken.refreshRevoked) {
             this.logger.warn('Access token is revoked');
             throw new common_1.UnauthorizedException('Token revoked');
         }
-        let user;
-        try {
-            user = await this.usersService.getOneOrThrow(userId);
-        }
-        catch (error) {
-            const err = error;
-            this.logger.warn('Token valid, but user not found', { message: err.message, stack: err.stack });
+        const user = storedAccessToken.owner;
+        if (!user || user.id !== userId) {
             throw new common_1.UnauthorizedException('Invalid user');
         }
         request.auth = { type: 'user', id: user.id, role: user.role };
@@ -147,7 +134,7 @@ let AuthGuard = class AuthGuard {
     }
     async validateDisplayToken(request, token, _displayId) {
         const hashedValue = (0, token_utils_1.hashToken)(token);
-        const storedToken = await this.tokensService.findOneByHashedToken(hashedValue);
+        const storedToken = await this.tokensService.findAuthenticationTokenByHash(hashedValue);
         if (!storedToken) {
             this.logger.warn('Display token not found in database');
             throw new common_1.UnauthorizedException('Token not found');
@@ -163,7 +150,7 @@ let AuthGuard = class AuthGuard {
         if (storedToken.ownerType !== auth_constants_1.TokenOwnerType.DISPLAY || storedToken.ownerId !== _displayId) {
             throw new common_1.UnauthorizedException('Invalid display token owner');
         }
-        void this.tokensService.updateLastUsedAt(storedToken.id);
+        this.tokensService.recordUsage(storedToken);
         request.auth = {
             type: 'token',
             tokenId: storedToken.id,
@@ -176,7 +163,7 @@ let AuthGuard = class AuthGuard {
     }
     async validateLongLiveToken(request, token, expectedOwnerType, expectedOwnerId) {
         const hashedValue = (0, token_utils_1.hashToken)(token);
-        const storedLongLiveToken = await this.tokensService.findOneByHashedToken(hashedValue);
+        const storedLongLiveToken = await this.tokensService.findAuthenticationTokenByHash(hashedValue);
         let effectiveMcpCapabilities;
         if (!storedLongLiveToken) {
             this.logger.warn('Long-live token not found');
@@ -205,7 +192,6 @@ let AuthGuard = class AuthGuard {
             }
             effectiveMcpCapabilities = this.mcpClientsService.getEffectiveCapabilities(client);
         }
-        void this.tokensService.updateLastUsedAt(storedLongLiveToken.id);
         let role = users_constants_1.UserRole.USER;
         if (storedLongLiveToken.ownerType === auth_constants_1.TokenOwnerType.USER && storedLongLiveToken.ownerId) {
             const user = await this.usersService.findOne(storedLongLiveToken.ownerId);
@@ -213,6 +199,7 @@ let AuthGuard = class AuthGuard {
                 role = user.role;
             }
         }
+        this.tokensService.recordUsage(storedLongLiveToken);
         request.auth = {
             type: 'token',
             tokenId: storedLongLiveToken.id,

package/dist/modules/auth/guards/auth.guard.js.map

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

package/dist/modules/auth/services/token-metadata.service.d.ts

@@ -0,0 +1,42 @@
+import { DataSource, EntitySubscriberInterface, InsertEvent, RemoveEvent, TransactionCommitEvent, TransactionRollbackEvent, UpdateEvent } from 'typeorm';
+import { OnModuleDestroy } from '@nestjs/common';
+import { ConfigService } from '@nestjs/config';
+import { UserEntity } from '../../users/entities/users.entity';
+import { LongLiveTokenEntity } from '../entities/auth.entity';
+export type AuthenticationToken = Pick<LongLiveTokenEntity, 'id' | 'hashedToken' | 'ownerType' | 'ownerId' | 'revoked' | 'expiresAt'>;
+export interface AuthenticationAccessToken {
+    id: string;
+    revoked: boolean;
+    expiresAt: Date | null;
+    owner: Pick<UserEntity, 'id' | 'role'> | null;
+    refreshRevoked: boolean;
+}
+export declare const tokenMetadataCapacity = 1000;
+export declare class TokenMetadataService implements EntitySubscriberInterface, OnModuleDestroy {
+    private readonly dataSource;
+    private readonly enabled;
+    private readonly tokens;
+    private readonly loading;
+    private readonly dirtyTransactions;
+    private generation;
+    private stopped;
+    constructor(dataSource: DataSource, config?: ConfigService);
+    findByHash(hash: string): Promise<AuthenticationToken | null>;
+    findAccessToken(ownerId: string, hash: string): Promise<AuthenticationAccessToken | null>;
+    private findCached;
+    invalidate(): void;
+    beforeInsert(event: InsertEvent<unknown>): void;
+    afterInsert(event: InsertEvent<unknown>): void;
+    beforeRemove(event: RemoveEvent<unknown>): void;
+    afterRemove(event: RemoveEvent<unknown>): void;
+    beforeUpdate(event: UpdateEvent<unknown>): void;
+    afterUpdate(event: UpdateEvent<unknown>): void;
+    afterTransactionCommit(event: TransactionCommitEvent): void;
+    afterTransactionRollback(event: TransactionRollbackEvent): void;
+    onModuleDestroy(): void;
+    private mutation;
+    private settled;
+    private isUsageOnly;
+    private query;
+    private copy;
+}

package/dist/modules/auth/services/token-metadata.service.js

@@ -0,0 +1,202 @@
+"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);
+};
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenMetadataService = exports.tokenMetadataCapacity = void 0;
+const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
+const config_1 = require("@nestjs/config");
+const config_utils_1 = require("../../../common/utils/config.utils");
+const users_entity_1 = require("../../users/entities/users.entity");
+const auth_entity_1 = require("../entities/auth.entity");
+exports.tokenMetadataCapacity = 1_000;
+let TokenMetadataService = class TokenMetadataService {
+    constructor(dataSource, config = new config_1.ConfigService()) {
+        this.dataSource = dataSource;
+        this.tokens = new Map();
+        this.loading = new Map();
+        this.dirtyTransactions = new Set();
+        this.generation = 0;
+        this.stopped = false;
+        this.enabled = !(0, config_utils_1.getEnvValue)(config, 'FB_PROPERTY_VALUE_LOCKS_ENABLED', false);
+        dataSource.subscribers.push(this);
+    }
+    async findByHash(hash) {
+        const entry = await this.findCached(`long-lived:${hash}`, async () => {
+            const facts = await this.query(hash);
+            return facts ? { kind: 'long-lived', facts } : null;
+        });
+        return entry?.kind === 'long-lived' ? entry.facts : null;
+    }
+    async findAccessToken(ownerId, hash) {
+        const entry = await this.findCached(JSON.stringify(['access', ownerId, hash]), async () => {
+            const token = await this.dataSource
+                .getRepository(auth_entity_1.AccessTokenEntity)
+                .createQueryBuilder('token')
+                .leftJoinAndSelect('token.owner', 'owner')
+                .leftJoinAndSelect('token.children', 'children')
+                .select([
+                'token.id',
+                'token.revoked',
+                'token.expiresAt',
+                'owner.id',
+                'owner.role',
+                'children.id',
+                'children.revoked',
+            ])
+                .where('owner.id = :ownerId', { ownerId })
+                .andWhere('token.hashedToken = :hash', { hash })
+                .getOne();
+            if (!token)
+                return null;
+            return {
+                kind: 'access',
+                facts: {
+                    id: token.id,
+                    revoked: token.revoked,
+                    expiresAt: token.expiresAt,
+                    owner: token.owner ? { id: token.owner.id, role: token.owner.role } : null,
+                    refreshRevoked: token.revoked || token.refreshToken.revoked,
+                },
+            };
+        });
+        return entry?.kind === 'access' ? entry.facts : null;
+    }
+    async findCached(key, query) {
+        while (true) {
+            if (!this.enabled || this.stopped || this.dirtyTransactions.size > 0)
+                return query();
+            const cached = this.tokens.get(key);
+            if (cached) {
+                this.tokens.delete(key);
+                if (!cached.facts.expiresAt || cached.facts.expiresAt.getTime() >= Date.now())
+                    this.tokens.set(key, cached);
+                return this.copy(cached);
+            }
+            const generation = this.generation;
+            let pending = this.loading.get(key);
+            if (!pending || pending.generation !== generation) {
+                if (!pending && this.loading.size >= exports.tokenMetadataCapacity)
+                    return query();
+                pending = { generation, promise: query() };
+                this.loading.set(key, pending);
+            }
+            try {
+                const token = await pending.promise;
+                if (generation !== this.generation)
+                    continue;
+                if (token &&
+                    !token.facts.revoked &&
+                    (token.kind !== 'access' || !token.facts.refreshRevoked) &&
+                    (!token.facts.expiresAt || token.facts.expiresAt.getTime() >= Date.now()) &&
+                    !this.stopped &&
+                    this.dirtyTransactions.size === 0) {
+                    if (!this.tokens.has(key) && this.tokens.size >= exports.tokenMetadataCapacity) {
+                        const oldest = this.tokens.keys().next().value;
+                        if (typeof oldest === 'string')
+                            this.tokens.delete(oldest);
+                    }
+                    this.tokens.set(key, token);
+                }
+                return token ? this.copy(token) : null;
+            }
+            finally {
+                if (this.loading.get(key) === pending)
+                    this.loading.delete(key);
+            }
+        }
+    }
+    invalidate() {
+        this.generation++;
+        this.tokens.clear();
+    }
+    beforeInsert(event) {
+        this.mutation(event);
+    }
+    afterInsert(event) {
+        this.mutation(event);
+    }
+    beforeRemove(event) {
+        this.mutation(event);
+    }
+    afterRemove(event) {
+        this.mutation(event);
+    }
+    beforeUpdate(event) {
+        if (!this.isUsageOnly(event))
+            this.mutation(event);
+    }
+    afterUpdate(event) {
+        if (!this.isUsageOnly(event))
+            this.mutation(event);
+    }
+    afterTransactionCommit(event) {
+        this.settled(event.queryRunner);
+    }
+    afterTransactionRollback(event) {
+        this.settled(event.queryRunner);
+    }
+    onModuleDestroy() {
+        this.stopped = true;
+        const index = this.dataSource.subscribers.indexOf(this);
+        if (index >= 0)
+            this.dataSource.subscribers.splice(index, 1);
+        this.invalidate();
+        this.dirtyTransactions.clear();
+    }
+    mutation(event) {
+        if (!event.metadata.inheritanceTree.some((type) => type === auth_entity_1.TokenEntity || type === users_entity_1.UserEntity))
+            return;
+        if (event.queryRunner.isTransactionActive)
+            this.dirtyTransactions.add(event.queryRunner);
+        this.invalidate();
+    }
+    settled(runner) {
+        if (!this.dirtyTransactions.has(runner))
+            return;
+        this.invalidate();
+        if (!runner.isTransactionActive)
+            this.dirtyTransactions.delete(runner);
+    }
+    isUsageOnly(event) {
+        const keys = Object.keys(event.entity ?? {});
+        return (event.metadata.inheritanceTree.includes(auth_entity_1.LongLiveTokenEntity) && keys.length === 1 && keys[0] === 'lastUsedAt');
+    }
+    async query(hash) {
+        const token = await this.dataSource.getRepository(auth_entity_1.LongLiveTokenEntity).findOne({
+            select: { id: true, hashedToken: true, ownerType: true, tokenOwnerId: true, revoked: true, expiresAt: true },
+            where: { hashedToken: hash },
+        });
+        return token
+            ? {
+                id: token.id,
+                hashedToken: token.hashedToken,
+                ownerType: token.ownerType,
+                ownerId: token.ownerId,
+                revoked: token.revoked,
+                expiresAt: token.expiresAt,
+            }
+            : null;
+    }
+    copy(token) {
+        return structuredClone(token);
+    }
+};
+exports.TokenMetadataService = TokenMetadataService;
+exports.TokenMetadataService = TokenMetadataService = __decorate([
+    (0, common_1.Injectable)(),
+    __param(1, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [typeorm_1.DataSource,
+        config_1.ConfigService])
+], TokenMetadataService);
+//# sourceMappingURL=token-metadata.service.js.map

package/dist/modules/auth/services/token-metadata.service.js.map

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

package/dist/modules/auth/services/token-usage.service.d.ts

@@ -0,0 +1,22 @@
+import { DataSource } from 'typeorm';
+import { BeforeApplicationShutdown, OnModuleInit } from '@nestjs/common';
+import { LongLiveTokenEntity } from '../entities/auth.entity';
+export declare const tokenUsageFlushIntervalMs = 60000;
+export declare const tokenUsageMaxPending = 1000;
+type TokenIdentity = Pick<LongLiveTokenEntity, 'id' | 'hashedToken'>;
+export declare class TokenUsageService implements OnModuleInit, BeforeApplicationShutdown {
+    private readonly dataSource;
+    private readonly logger;
+    private readonly pending;
+    private timer?;
+    private inFlight?;
+    private stopping;
+    private dropped;
+    constructor(dataSource: DataSource);
+    onModuleInit(): void;
+    record(token: TokenIdentity): void;
+    flush(): Promise<void>;
+    beforeApplicationShutdown(): Promise<void>;
+    private persist;
+}
+export {};

package/dist/modules/auth/services/token-usage.service.js

@@ -0,0 +1,93 @@
+"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.TokenUsageService = exports.tokenUsageMaxPending = exports.tokenUsageFlushIntervalMs = void 0;
+const typeorm_1 = require("typeorm");
+const common_1 = require("@nestjs/common");
+const logger_1 = require("../../../common/logger");
+const auth_constants_1 = require("../auth.constants");
+const auth_entity_1 = require("../entities/auth.entity");
+exports.tokenUsageFlushIntervalMs = 60_000;
+exports.tokenUsageMaxPending = 1_000;
+let TokenUsageService = class TokenUsageService {
+    constructor(dataSource) {
+        this.dataSource = dataSource;
+        this.logger = (0, logger_1.createExtensionLogger)(auth_constants_1.AUTH_MODULE_NAME, 'TokenUsageService');
+        this.pending = new Map();
+        this.stopping = false;
+        this.dropped = 0;
+    }
+    onModuleInit() {
+        this.timer = setInterval(() => void this.flush(), exports.tokenUsageFlushIntervalMs);
+        this.timer.unref();
+    }
+    record(token) {
+        if (this.stopping)
+            return;
+        const key = `${token.id}:${token.hashedToken}`;
+        const previous = this.pending.get(key);
+        if (!previous && this.pending.size >= exports.tokenUsageMaxPending) {
+            this.dropped++;
+            return;
+        }
+        this.pending.set(key, {
+            id: token.id,
+            hashedToken: token.hashedToken,
+            lastUsedAt: new Date(Math.max(Date.now(), previous?.lastUsedAt.getTime() ?? 0)),
+        });
+    }
+    flush() {
+        if (this.inFlight !== undefined)
+            return this.inFlight;
+        if (this.pending.size === 0)
+            return Promise.resolve();
+        const batch = [...this.pending.values()];
+        this.pending.clear();
+        if (this.dropped > 0) {
+            this.logger.warn(`Dropped ${this.dropped} token usage observations because the telemetry queue was full`);
+            this.dropped = 0;
+        }
+        this.inFlight = this.persist(batch).finally(() => {
+            this.inFlight = undefined;
+        });
+        return this.inFlight;
+    }
+    async beforeApplicationShutdown() {
+        this.stopping = true;
+        if (this.timer)
+            clearInterval(this.timer);
+        await this.flush();
+        await this.flush();
+    }
+    async persist(batch) {
+        let failures = 0;
+        for (const { id, hashedToken, lastUsedAt } of batch) {
+            try {
+                const identity = { id, hashedToken, revoked: false };
+                await this.dataSource.getRepository(auth_entity_1.LongLiveTokenEntity).update([
+                    { ...identity, lastUsedAt: (0, typeorm_1.IsNull)() },
+                    { ...identity, lastUsedAt: (0, typeorm_1.LessThan)(lastUsedAt) },
+                ], { lastUsedAt });
+            }
+            catch {
+                failures++;
+            }
+        }
+        if (failures > 0)
+            this.logger.warn(`Failed to persist ${failures} token usage observations`);
+    }
+};
+exports.TokenUsageService = TokenUsageService;
+exports.TokenUsageService = TokenUsageService = __decorate([
+    (0, common_1.Injectable)(),
+    __metadata("design:paramtypes", [typeorm_1.DataSource])
+], TokenUsageService);
+//# sourceMappingURL=token-usage.service.js.map

package/dist/modules/auth/services/token-usage.service.js.map

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

package/dist/modules/auth/services/tokens.service.d.ts

@@ -2,23 +2,30 @@ import { DataSource, EntityManager, Repository } from 'typeorm';
 import { TokenOwnerType } from '../auth.constants';
 import { CreateTokenDto } from '../dto/create-token.dto';
 import { UpdateTokenDto } from '../dto/update-token.dto';
-import { LongLiveTokenEntity, TokenEntity } from '../entities/auth.entity';
+import { AccessTokenEntity, LongLiveTokenEntity, TokenEntity } from '../entities/auth.entity';
+import { AuthenticationAccessToken, AuthenticationToken, TokenMetadataService } from './token-metadata.service';
+import { TokenUsageService } from './token-usage.service';
 import { TokensTypeMapperService } from './tokens-type-mapper.service';
 export declare class TokensService {
     private readonly repository;
     private readonly tokensMapperService;
     private readonly dataSource;
+    private readonly tokenUsageService;
+    private readonly tokenMetadata;
     private readonly logger;
-    constructor(repository: Repository<TokenEntity>, tokensMapperService: TokensTypeMapperService, dataSource: DataSource);
+    constructor(repository: Repository<TokenEntity>, tokensMapperService: TokensTypeMapperService, dataSource: DataSource, tokenUsageService: TokenUsageService, tokenMetadata: TokenMetadataService);
     findAll<TToken extends TokenEntity>(type?: new (...args: any[]) => TToken): Promise<TToken[]>;
     findAllByOwner<TToken extends TokenEntity>(owner: string, type?: new (...args: any[]) => TToken): Promise<TToken[]>;
+    findAccessTokenByOwnerAndHash(ownerId: string, hashedToken: string): Promise<AccessTokenEntity | null>;
     findAllByOwnerType(ownerType: TokenOwnerType): Promise<LongLiveTokenEntity[]>;
     findByOwnerId(ownerId: string, ownerType: TokenOwnerType): Promise<LongLiveTokenEntity[]>;
     revokeByOwnerId(ownerId: string, ownerType: TokenOwnerType): Promise<void>;
     revokeUserCredentials(userId: string): Promise<void>;
     revoke(id: string, manager?: EntityManager): Promise<void>;
+    findAuthenticationAccessToken(ownerId: string, hashedToken: string): Promise<AuthenticationAccessToken | null>;
+    findAuthenticationTokenByHash(hashedToken: string): Promise<AuthenticationToken | null>;
     findOneByHashedToken(hashedToken: string): Promise<LongLiveTokenEntity | null>;
-    updateLastUsedAt(tokenId: string): Promise<void>;
+    recordUsage(token: Pick<LongLiveTokenEntity, 'id' | 'hashedToken'>): void;
     findOne<TToken extends TokenEntity>(id: string, type?: new (...args: any[]) => TToken): Promise<TToken | null>;
     findByHashedToken<TToken extends TokenEntity>(token: string, type?: new (...args: any[]) => TToken): Promise<TToken | null>;
     create<TToken extends TokenEntity, TCreateDTO extends CreateTokenDto>(createDto: TCreateDTO): Promise<TToken>;

package/dist/modules/auth/services/tokens.service.js

@@ -28,12 +28,16 @@ const auth_constants_1 = require("../auth.constants");
 const auth_exceptions_1 = require("../auth.exceptions");
 const auth_entity_1 = require("../entities/auth.entity");
 const token_utils_1 = require("../utils/token.utils");
+const token_metadata_service_1 = require("./token-metadata.service");
+const token_usage_service_1 = require("./token-usage.service");
 const tokens_type_mapper_service_1 = require("./tokens-type-mapper.service");
 let TokensService = class TokensService {
-    constructor(repository, tokensMapperService, dataSource) {
+    constructor(repository, tokensMapperService, dataSource, tokenUsageService, tokenMetadata) {
         this.repository = repository;
         this.tokensMapperService = tokensMapperService;
         this.dataSource = dataSource;
+        this.tokenUsageService = tokenUsageService;
+        this.tokenMetadata = tokenMetadata;
         this.logger = (0, logger_1.createExtensionLogger)(auth_constants_1.AUTH_MODULE_NAME, 'TokensService');
     }
     async findAll(type) {
@@ -82,6 +86,16 @@ let TokensService = class TokensService {
         this.logger.debug(`Found ${tokens.length} tokens`);
         return tokens;
     }
+    async findAccessTokenByOwnerAndHash(ownerId, hashedToken) {
+        return this.dataSource
+            .getRepository(auth_entity_1.AccessTokenEntity)
+            .createQueryBuilder('token')
+            .leftJoinAndSelect('token.owner', 'owner')
+            .leftJoinAndSelect('token.children', 'children')
+            .where('owner.id = :ownerId', { ownerId })
+            .andWhere('token.hashedToken = :hashedToken', { hashedToken })
+            .getOne();
+    }
     async findAllByOwnerType(ownerType) {
         this.logger.debug(`Fetching all long-live tokens by owner type=${ownerType}`);
         const repository = this.dataSource.getRepository(auth_entity_1.LongLiveTokenEntity);
@@ -124,6 +138,12 @@ let TokensService = class TokensService {
             throw new auth_exceptions_1.AuthNotFoundException('Requested token does not exist');
         }
     }
+    findAuthenticationAccessToken(ownerId, hashedToken) {
+        return this.tokenMetadata.findAccessToken(ownerId, hashedToken);
+    }
+    findAuthenticationTokenByHash(hashedToken) {
+        return this.tokenMetadata.findByHash(hashedToken);
+    }
     async findOneByHashedToken(hashedToken) {
         this.logger.debug('Finding long-live token by hashed value');
         const repository = this.dataSource.getRepository(auth_entity_1.LongLiveTokenEntity);
@@ -132,14 +152,8 @@ let TokensService = class TokensService {
         });
         return token ?? null;
     }
-    async updateLastUsedAt(tokenId) {
-        try {
-            const repository = this.dataSource.getRepository(auth_entity_1.LongLiveTokenEntity);
-            await repository.update(tokenId, { lastUsedAt: new Date() });
-        }
-        catch (error) {
-            this.logger.debug(`Failed to update lastUsedAt for token ${tokenId}: ${error.message}`);
-        }
+    recordUsage(token) {
+        this.tokenUsageService.record(token);
     }
     async findOne(id, type) {
         return this.findByField('id', id, type);
@@ -316,6 +330,8 @@ exports.TokensService = TokensService = __decorate([
     __param(0, (0, typeorm_2.InjectRepository)(auth_entity_1.TokenEntity)),
     __metadata("design:paramtypes", [typeorm_1.Repository,
         tokens_type_mapper_service_1.TokensTypeMapperService,
-        typeorm_1.DataSource])
+        typeorm_1.DataSource,
+        token_usage_service_1.TokenUsageService,
+        token_metadata_service_1.TokenMetadataService])
 ], TokensService);
 //# sourceMappingURL=tokens.service.js.map