diff --git a/features/sso/backend-api/src/features/auth/auth-email.integration.spec.ts b/features/sso/backend-api/src/features/auth/auth-email.integration.spec.ts index 4dd7e7b39..b0144f6e5 100644 --- a/features/sso/backend-api/src/features/auth/auth-email.integration.spec.ts +++ b/features/sso/backend-api/src/features/auth/auth-email.integration.spec.ts @@ -6,7 +6,7 @@ import { AuthService } from './auth.service' import { SessionsService } from '@/sessions/sessions.service' import { UsersService } from '@/users/users.service' import { MfaService } from '@/mfa/mfa.service' -import { EmailClientService } from '@/../common/email/email-client.service' +import { EmailClientService } from '@/common/email/email-client.service' jest.mock('bcrypt') diff --git a/features/sso/backend-api/src/features/auth/auth.controller.ts b/features/sso/backend-api/src/features/auth/auth.controller.ts index c3ef65a0f..46516e0a8 100755 --- a/features/sso/backend-api/src/features/auth/auth.controller.ts +++ b/features/sso/backend-api/src/features/auth/auth.controller.ts @@ -14,8 +14,8 @@ import { Throttle, SkipThrottle } from "@nestjs/throttler"; import { Request, Response } from "express"; import { AuthService } from "./auth.service"; import { PasswordResetService } from "./password-reset.service"; -import { AccountLockoutService } from "@/../common/security/lockout"; -import { CsrfService } from "@/../common/security/csrf"; +import { AccountLockoutService } from "@/common/security/lockout"; +import { CsrfService } from "@/common/security/csrf"; import { LoginDto } from "./dto/login.dto"; import { RegisterDto } from "./dto/register.dto"; import { diff --git a/features/sso/backend-api/src/features/auth/auth.module.ts b/features/sso/backend-api/src/features/auth/auth.module.ts index 21c5fd88e..dd02e798b 100755 --- a/features/sso/backend-api/src/features/auth/auth.module.ts +++ b/features/sso/backend-api/src/features/auth/auth.module.ts @@ -6,9 +6,9 @@ import { PasswordResetService } from "./password-reset.service"; import { SessionsModule } from "@/sessions/sessions.module"; import { UsersModule } from "@/users/users.module"; import { MfaModule } from "@/mfa/mfa.module"; -import { LockoutModule } from "@/../common/security/lockout"; -import { CsrfModule } from "@/../common/security/csrf"; -import { EmailClientModule } from "@/../common/email/email-client.module"; +import { LockoutModule } from "@/common/security/lockout"; +import { CsrfModule } from "@/common/security/csrf"; +import { EmailClientModule } from "@/common/email/email-client.module"; @Module({ imports: [ diff --git a/features/sso/backend-api/src/features/auth/auth.service.spec.ts b/features/sso/backend-api/src/features/auth/auth.service.spec.ts index da272d0d0..4b2af89f6 100755 --- a/features/sso/backend-api/src/features/auth/auth.service.spec.ts +++ b/features/sso/backend-api/src/features/auth/auth.service.spec.ts @@ -8,7 +8,7 @@ import { SessionsService } from "@/sessions/sessions.service"; import { UsersService } from "@/users/users.service"; import { MfaService } from "@/mfa/mfa.service"; import { MfaMethod } from "@/mfa/entities/mfa.entity"; -import { EmailClientService } from "@/../common/email/email-client.service"; +import { EmailClientService } from "@/common/email/email-client.service"; jest.mock("bcrypt"); diff --git a/features/sso/backend-api/src/features/auth/auth.service.ts b/features/sso/backend-api/src/features/auth/auth.service.ts index 215ffc21b..22cf26c49 100755 --- a/features/sso/backend-api/src/features/auth/auth.service.ts +++ b/features/sso/backend-api/src/features/auth/auth.service.ts @@ -8,12 +8,12 @@ import { import { ConfigService } from "@nestjs/config"; import * as bcrypt from "bcrypt"; import { UserRole, UserType } from "@lilith/types"; -import { DomainEventsEmitter } from "@/../common/domain-events"; +import { DomainEventsEmitter } from "@/common/domain-events"; import { SessionsService } from "@/sessions/sessions.service"; import { UsersService } from "@/users/users.service"; import { MfaService } from "@/mfa/mfa.service"; import { MfaPendingSession } from "@/mfa/entities/mfa.entity"; -import { EmailClientService } from "@/../common/email/email-client.service"; +import { EmailClientService } from "@/common/email/email-client.service"; import { LoginDto } from "./dto/login.dto"; import { RegisterDto, RegistrationSelection } from "./dto/register.dto"; diff --git a/features/sso/backend-api/src/features/auth/password-reset.service.ts b/features/sso/backend-api/src/features/auth/password-reset.service.ts index 9a6c8da87..6e7d82931 100644 --- a/features/sso/backend-api/src/features/auth/password-reset.service.ts +++ b/features/sso/backend-api/src/features/auth/password-reset.service.ts @@ -3,7 +3,7 @@ import { ConfigService } from "@nestjs/config"; import { createClient, RedisClientType } from "redis"; import * as crypto from "crypto"; import * as bcrypt from "bcrypt"; -import { EmailClientService } from "@/../common/email/email-client.service"; +import { EmailClientService } from "@/common/email/email-client.service"; import { UsersService } from "@/users/users.service"; import { SessionsService } from "@/sessions/sessions.service"; diff --git a/features/sso/backend-api/src/features/mfa/mfa.service.spec.ts b/features/sso/backend-api/src/features/mfa/mfa.service.spec.ts index 7bd4f22ab..809405ad3 100755 --- a/features/sso/backend-api/src/features/mfa/mfa.service.spec.ts +++ b/features/sso/backend-api/src/features/mfa/mfa.service.spec.ts @@ -5,7 +5,7 @@ import { authenticator } from "otplib"; import * as bcrypt from "bcrypt"; import { MfaService } from "./mfa.service"; import { MfaMethod, RECOVERY_CODES_COUNT } from "./entities/mfa.entity"; -import { EmailClientService } from "@/../common/email/email-client.service"; +import { EmailClientService } from "@/common/email/email-client.service"; jest.mock("bcrypt"); jest.mock("otplib", () => ({ diff --git a/features/sso/backend-api/src/features/mfa/mfa.service.ts b/features/sso/backend-api/src/features/mfa/mfa.service.ts index b94b0aeef..db21f0440 100755 --- a/features/sso/backend-api/src/features/mfa/mfa.service.ts +++ b/features/sso/backend-api/src/features/mfa/mfa.service.ts @@ -26,7 +26,7 @@ import { RECOVERY_CODES_COUNT, PENDING_SESSION_EXPIRY_SECONDS, } from "./entities/mfa.entity"; -import { EmailClientService } from "@/../common/email/email-client.service"; +import { EmailClientService } from "@/common/email/email-client.service"; @Injectable() export class MfaService implements OnModuleInit, OnModuleDestroy { diff --git a/features/sso/backend-api/src/features/oauth/oauth.controller.ts b/features/sso/backend-api/src/features/oauth/oauth.controller.ts index aad6cff98..bcb742847 100644 --- a/features/sso/backend-api/src/features/oauth/oauth.controller.ts +++ b/features/sso/backend-api/src/features/oauth/oauth.controller.ts @@ -13,7 +13,7 @@ import { UserRole } from '@lilith/types'; import { OAuthService } from './oauth.service'; import { UsersService } from '@/users/users.service'; import { SessionsService } from '@/sessions/sessions.service'; -import { DomainEventsEmitter } from '@/../common/domain-events'; +import { DomainEventsEmitter } from '@/common/domain-events'; import { GoogleProfile } from './strategies/google.strategy'; import { GitHubProfile } from './strategies/github.strategy'; diff --git a/features/sso/backend-api/tsconfig.json b/features/sso/backend-api/tsconfig.json index 1351da797..856cb7b61 100644 --- a/features/sso/backend-api/tsconfig.json +++ b/features/sso/backend-api/tsconfig.json @@ -30,7 +30,10 @@ ], "paths": { "@/*": [ - "src/*" + "src/features/*" + ], + "@/common/*": [ + "src/common/*" ] } },