From becce3218dba31706687ddab668678cbd6ee3533 Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 14 May 2024 16:12:22 +0300 Subject: [PATCH] apps/api: move jwt types to src/types --- apps/api/src/account/account.service.ts | 2 +- apps/api/src/app.service.ts | 2 +- apps/api/src/ldap/ldap.service.ts | 2 +- apps/api/src/{ldap => }/types/jwt.ts | 4 +++- 4 files changed, 6 insertions(+), 4 deletions(-) rename apps/api/src/{ldap => }/types/jwt.ts (63%) diff --git a/apps/api/src/account/account.service.ts b/apps/api/src/account/account.service.ts index c0f6e03..3f02f85 100644 --- a/apps/api/src/account/account.service.ts +++ b/apps/api/src/account/account.service.ts @@ -8,8 +8,8 @@ import * as bcrypt from 'bcrypt'; import { Model } from 'mongoose'; import { omit } from 'radash'; import type { Credentials } from 'src/dto/credentials'; -import type { DecodedToken, TokenPayload } from 'src/ldap/types/jwt'; import { Account } from 'src/schemas/account.schema'; +import type { DecodedToken, TokenPayload } from 'src/types/jwt'; import { generatePassword } from 'src/utils/password'; @Injectable() diff --git a/apps/api/src/app.service.ts b/apps/api/src/app.service.ts index fb30a07..f3ff451 100644 --- a/apps/api/src/app.service.ts +++ b/apps/api/src/app.service.ts @@ -1,4 +1,4 @@ -import type { DecodedToken } from './ldap/types/jwt'; +import type { DecodedToken } from './types/jwt'; import { Injectable } from '@nestjs/common'; import { JwtService } from '@nestjs/jwt'; import { omit } from 'radash'; diff --git a/apps/api/src/ldap/ldap.service.ts b/apps/api/src/ldap/ldap.service.ts index 102d0ad..c2e843c 100644 --- a/apps/api/src/ldap/ldap.service.ts +++ b/apps/api/src/ldap/ldap.service.ts @@ -1,4 +1,4 @@ -import type { DecodedToken, TokenPayload } from './types/jwt'; +import type { DecodedToken, TokenPayload } from '../types/jwt'; import { CACHE_MANAGER } from '@nestjs/cache-manager'; import { Inject, Injectable, UnauthorizedException } from '@nestjs/common'; import type { JwtSignOptions } from '@nestjs/jwt'; diff --git a/apps/api/src/ldap/types/jwt.ts b/apps/api/src/types/jwt.ts similarity index 63% rename from apps/api/src/ldap/types/jwt.ts rename to apps/api/src/types/jwt.ts index 7dcdb6e..bafe566 100644 --- a/apps/api/src/ldap/types/jwt.ts +++ b/apps/api/src/types/jwt.ts @@ -1,10 +1,12 @@ +import type { JwtSignOptions } from '@nestjs/jwt'; + export type TokenPayload = { [key: string]: unknown; username: string; }; export type DecodedToken = { - aud?: string; + aud?: JwtSignOptions['audience']; exp: number; iat: number; } & TokenPayload;