diff --git a/src/modules/admin/providers/admin.service.ts b/src/modules/admin/providers/admin.service.ts index 77ccd00..9ead972 100644 --- a/src/modules/admin/providers/admin.service.ts +++ b/src/modules/admin/providers/admin.service.ts @@ -10,12 +10,12 @@ import { CreateMyShopAdminDto } from '../dto/create-shop-admin.dto'; import { UpdateAdminDto } from '../dto/update-admin.dto'; import { AdminRole } from '../entities/adminRole.entity'; import { normalizePhone } from '../../utils/phone.util'; +import { AdminRepository } from '../repositories/admin.repository'; @Injectable() export class AdminService { constructor( - @InjectRepository(Admin) - private readonly adminRepository: EntityRepository, + private readonly adminRepository:AdminRepository, @InjectRepository(AdminRole) private readonly adminRoleRepository: EntityRepository, private readonly em: EntityManager, diff --git a/src/modules/auth/services/auth.service.ts b/src/modules/auth/services/auth.service.ts index 41f4d91..8b6deac 100644 --- a/src/modules/auth/services/auth.service.ts +++ b/src/modules/auth/services/auth.service.ts @@ -68,7 +68,7 @@ export class AuthService { throw new BadRequestException(RestMessage.NOT_FOUND); } - const tokens = await this.tokensService.generateAccessAndRefreshToken(user.id, shop.id, false, slug); + const tokens = await this.tokensService.generateTokens(user.id, shop.id, false, slug); const userResponse = UserLoginTransformer.transform(user, shop); @@ -93,7 +93,7 @@ export class AuthService { throw new BadRequestException(RestMessage.NOT_FOUND); } - const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, shop.id, true, slug); + const tokens = await this.tokensService.generateTokens(admin.id, shop.id, true, slug); const adminResponse = await AdminLoginTransformer.transform(admin, shop); @@ -117,7 +117,7 @@ export class AuthService { throw new BadRequestException(RestMessage.NOT_FOUND); } - const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, shop.id, true, slug); + const tokens = await this.tokensService.generateTokens(admin.id, shop.id, true, slug); const adminResponse = await AdminLoginTransformer.transform(admin, shop); diff --git a/src/modules/auth/services/tokens.service.ts b/src/modules/auth/services/tokens.service.ts index 5683ce6..5bdf251 100755 --- a/src/modules/auth/services/tokens.service.ts +++ b/src/modules/auth/services/tokens.service.ts @@ -18,9 +18,9 @@ export class TokensService { private readonly configService: ConfigService, private readonly jwtService: JwtService, private readonly em: EntityManager, - ) {} + ) { } - async generateAccessAndRefreshToken( + async generateTokens( ownerId: string, shopId: string, isAdmin: boolean, @@ -118,7 +118,7 @@ export class TokensService { try { // Generate new tokens first (before removing old token) // Pass the transaction EntityManager to ensure operations are within the transaction - const tokens = await this.generateAccessAndRefreshToken(ownerId, shop.id, isAdmin, shop.slug, em); + const tokens = await this.generateTokens(ownerId, shop.id, isAdmin, shop.slug, em); // Remove old token only after new token is created em.remove(token); diff --git a/src/modules/auth/transformers/admin-login.transformer.ts b/src/modules/auth/transformers/admin-login.transformer.ts index d0bfec6..6a067c4 100644 --- a/src/modules/auth/transformers/admin-login.transformer.ts +++ b/src/modules/auth/transformers/admin-login.transformer.ts @@ -7,7 +7,6 @@ export interface AdminLoginResponse { lastName?: string; phone: string; role: string; - permissions: string[]; shop?: { id: string; name: string; @@ -32,13 +31,12 @@ export class AdminLoginTransformer { lastName: admin.lastName, phone: admin.phone, role: '', - permissions: [], shop: shop ? { - id: shop.id, - name: shop.name, - slug: shop.slug, - } + id: shop.id, + name: shop.name, + slug: shop.slug, + } : undefined, }; } @@ -52,27 +50,16 @@ export class AdminLoginTransformer { lastName: admin.lastName, phone: admin.phone, role: '', - permissions: [], shop: shop ? { - id: shop.id, - name: shop.name, - slug: shop.slug, - } + id: shop.id, + name: shop.name, + slug: shop.slug, + } : undefined, }; } - // Extract permissions - ensure collection is loaded if needed - let permissions: string[] = []; - if (role.permissions) { - if (role.permissions.isInitialized()) { - permissions = role.permissions.getItems().map(p => p.name); - } else { - await role.permissions.loadItems(); - permissions = role.permissions.getItems().map(p => p.name); - } - } return { id: admin.id, @@ -80,13 +67,12 @@ export class AdminLoginTransformer { lastName: admin.lastName, phone: admin.phone, role: role.name, - permissions, shop: shop ? { - id: shop.id, - name: shop.name, - slug: shop.slug, - } + id: shop.id, + name: shop.name, + slug: shop.slug, + } : undefined, }; }