admin refactor

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:AdminRepository,
-    private readonly adminRepository: EntityRepository<Admin>,
     @InjectRepository(AdminRole)
     private readonly adminRoleRepository: EntityRepository<AdminRole>,
     private readonly em: EntityManager,

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);
 

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);

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,
+            id: shop.id,
-              name: shop.name,
+            name: shop.name,
-              slug: shop.slug,
+            slug: shop.slug,
-            }
+          }
           : undefined,
       };
     }
@@ -52,27 +50,16 @@ export class AdminLoginTransformer {
         lastName: admin.lastName,
         phone: admin.phone,
         role: '',
-        permissions: [],
         shop: shop
           ? {
-              id: shop.id,
+            id: shop.id,
-              name: shop.name,
+            name: shop.name,
-              slug: shop.slug,
+            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,
+          id: shop.id,
-            name: shop.name,
+          name: shop.name,
-            slug: shop.slug,
+          slug: shop.slug,
-          }
+        }
         : undefined,
     };
   }