role perms

src/modules/auth/services/tokens.service.ts

@@ -9,9 +9,11 @@ import dayjs from 'dayjs';
 import { AuthMessage, UserMessage } from '../../../common/enums/message.enum';
 import { RefreshToken } from '../../users/entities/refresh-token.entity';
 import { User } from '../../users/entities/user.entity';
-import { ITokenPayload } from '../interfaces/IToken-payload';
+import { IAdminTokenPayload, ITokenPayload } from '../interfaces/IToken-payload';
 import { Restaurant } from 'src/modules/restaurants/entities/restaurant.entity';
 import { RestRepository } from 'src/modules/restaurants/repositories/rest.repository';
+import { Admin } from 'src/modules/admin/entities/admin.entity';
+import { CacheService } from 'src/modules/utils/cache.service';
 
 @Injectable()
 export class TokensService {
@@ -21,12 +23,23 @@ export class TokensService {
     private readonly jwtService: JwtService,
     private readonly em: EntityManager,
     private readonly restRepository: RestRepository,
+    private readonly cacheService: CacheService,
   ) {}
 
   async generateTokens(user: User, rest: Restaurant, em?: EntityManager) {
     return this.generateAccessAndRefreshToken(
       {
-        id: user.id,
+        userId: user.id,
+        restId: rest.id,
+      },
+      em,
+    );
+  }
+
+  async generateTokensAdmin(admin: Admin, rest: Restaurant, em?: EntityManager) {
+    return this.generateAccessAndRefreshTokenAdmin(
+      {
+        adminId: admin.id,
         restId: rest.id,
       },
       em,
@@ -38,13 +51,13 @@ export class TokensService {
     const refreshExpire = this.configService.getOrThrow<number>('REFRESH_TOKEN_EXPIRE');
 
     const tokenPayload: ITokenPayload = {
-      id: payload.id,
+      userId: payload.userId,
       restId: payload.restId,
     };
     const accessToken = await this.jwtService.signAsync(tokenPayload, { expiresIn: `${accessExpire}m` });
     const refreshToken = this.generateRefreshToken();
 
-    await this.storeRefreshToken(payload.id, refreshToken, em);
+    await this.storeRefreshToken(payload.userId, payload.restId, refreshToken, em);
 
     return {
       accessToken: { token: accessToken, expire: dayjs().add(accessExpire, 'minute').valueOf() },
@@ -52,7 +65,25 @@ export class TokensService {
     };
   }
 
-  async storeRefreshToken(userId: string, refreshToken: string, em?: EntityManager) {
+  private async generateAccessAndRefreshTokenAdmin(payload: IAdminTokenPayload, em?: EntityManager) {
+    const accessExpire = this.configService.getOrThrow<number>('ACCESS_TOKEN_EXPIRE');
+    const refreshExpire = this.configService.getOrThrow<number>('REFRESH_TOKEN_EXPIRE');
+
+    const tokenPayload: IAdminTokenPayload = {
+      adminId: payload.adminId,
+      restId: payload.restId,
+    };
+    const accessToken = await this.jwtService.signAsync(tokenPayload, { expiresIn: `${accessExpire}m` });
+    const refreshToken = this.generateRefreshToken();
+
+    await this.storeRefreshToken(payload.adminId, payload.restId, refreshToken, em);
+    return {
+      accessToken: { token: accessToken, expire: dayjs().add(accessExpire, 'minute').valueOf() },
+      refreshToken: { token: refreshToken, expire: dayjs().add(refreshExpire, 'day').valueOf() },
+    };
+  }
+
+  async storeRefreshToken(userId: string, restId: string, refreshToken: string, em?: EntityManager) {
     const entityManager = em || this.em.fork();
     const isExternalTransaction = !!em && em.isInTransaction();
 
@@ -68,15 +99,19 @@ export class TokensService {
       const user = await entityManager.findOne(User, { id: userId });
       if (!user) throw new BadRequestException(UserMessage.USER_NOT_FOUND);
 
+      const restaurant = await entityManager.findOne(Restaurant, { id: restId });
+      if (!restaurant) throw new BadRequestException(UserMessage.Rest_NOT_FOUND);
+
       const token = entityManager.create(RefreshToken, {
         token: refreshToken,
+        restaurant,
         user,
         expiresAt,
       });
 
       // Use persist instead of persistAndFlush when in transaction
       if (isExternalTransaction) {
-        await entityManager.persist(token);
+        entityManager.persist(token);
       } else {
         await entityManager.persistAndFlush(token);
         if (entityManager.isInTransaction()) {
@@ -98,19 +133,19 @@ export class TokensService {
 
     try {
       await entityManager.begin();
-
+      console.log('oldRefreshToken', oldRefreshToken);
       const token = await entityManager.findOne(
         RefreshToken,
         { token: oldRefreshToken },
         {
-          populate: ['user'],
+          populate: ['user', 'restaurant'],
         },
       );
 
       if (!token) throw new UnauthorizedException(AuthMessage.INVALID_REFRESH_TOKEN);
 
-      const rest = await this.restRepository.findOne({ id: token.user.id });
-      if (!rest) throw new UnauthorizedException(AuthMessage.INVALID_REFRESH_TOKEN);
+      // const rest = await this.restRepository.findOne({ id: token.user.id });
+      // if (!rest) throw new UnauthorizedException(AuthMessage.INVALID_REFRESH_TOKEN);
 
       if (dayjs(token.expiresAt).isBefore(dayjs())) {
         entityManager.remove(token);
@@ -123,7 +158,7 @@ export class TokensService {
       entityManager.remove(token);
 
       // Generate new tokens within the same transaction
-      const tokens = await this.generateTokens(token.user, rest, entityManager);
+      const tokens = await this.generateTokens(token.user, token.restaurant, entityManager);
 
       // Commit the transaction
       await entityManager.flush();