wallet

src/modules/auth/auth.module.ts

@@ -2,23 +2,20 @@ import { Module, forwardRef } from '@nestjs/common';
 import { AuthService } from './services/auth.service';
 import { AuthController } from './controllers/auth.controller';
 import { UtilsModule } from '../utils/utils.module';
-import { UserModule } from '../users/user.module';
-import { JwtModule } from '@nestjs/jwt';
+ import { JwtModule } from '@nestjs/jwt';
 import { ConfigService } from '@nestjs/config';
 import { AdminModule } from '../admin/admin.module';
 import { TokensService } from './services/tokens.service';
 import { RestaurantsModule } from '../restaurants/restaurants.module';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
-import { User } from '../users/entities/user.entity';
-import { AdminAuthGuard } from './guards/adminAuth.guard';
+ import { AdminAuthGuard } from './guards/adminAuth.guard';
 import { RefreshToken } from './entities/refresh-token.entity';
 import { NotificationsModule } from '../notifications/notifications.module';
 
 @Module({
   imports: [
     UtilsModule,
-    forwardRef(() => UserModule),
-    JwtModule.registerAsync({
+     JwtModule.registerAsync({
       useFactory: (configService: ConfigService) => {
         const expiresIn = configService.getOrThrow<number>('JWT_EXPIRATION_TIME');
         return {
@@ -34,7 +31,7 @@ import { NotificationsModule } from '../notifications/notifications.module';
     }),
     forwardRef(() => AdminModule),
     forwardRef(() => RestaurantsModule),
-    MikroOrmModule.forFeature([User, RefreshToken]),
+    MikroOrmModule.forFeature([RefreshToken]),
     forwardRef(() => NotificationsModule),
     
   ],

src/modules/auth/controllers/auth.controller.ts

@@ -22,13 +22,7 @@ export class AuthController {
     return this.authService.requestOtp(dto, false);
   }
 
-  @Post('public/auth/otp/verify')
-  @ApiOperation({ summary: 'Verify OTP code' })
-  @ApiBody({ type: VerifyOtpDto, description: 'Mobile number and OTP code' })
-  otpVerify(@Body() dto: VerifyOtpDto) {
-    return this.authService.verifyOtp(dto.phone, dto.slug, dto.otp); // assuming dto has `otp` property
-  }
-
+ 
   @RefreshTokenRateLimit()
   @ApiOperation({ summary: 'refresh the user access token / refresh token' })
   @Post('public/auth/refresh')

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

@@ -2,15 +2,13 @@ import { Injectable, BadRequestException } from '@nestjs/common';
 import { RequestOtpDto } from '../dto/request-otp.dto';
 import { CacheService } from '../../utils/cache.service';
 import { SmsService } from '../../notifications/services/sms.service';
-import { UserService } from '../../users/providers/user.service';
-import { randomInt } from 'crypto';
+ import { randomInt } from 'crypto';
 import { TokensService } from './tokens.service';
 import { RestRepository } from 'src/modules/restaurants/repositories/rest.repository';
 import { AuthMessage, RestMessage } from 'src/common/enums/message.enum';
 import { AdminRepository } from 'src/modules/admin/repositories/admin.repository';
 import { AdminLoginTransformer } from '../transformers/admin-login.transformer';
-import { UserLoginTransformer } from '../transformers/user-login.transformer';
-import { ConfigService } from '@nestjs/config';
+ import { ConfigService } from '@nestjs/config';
 import { normalizePhone } from '../../utils/phone.util';
 
 @Injectable()
@@ -20,8 +18,7 @@ export class AuthService {
   constructor(
     private readonly cacheService: CacheService,
     private readonly smsService: SmsService,
-    private readonly userService: UserService,
-    private readonly tokensService: TokensService,
+     private readonly tokensService: TokensService,
     private readonly restRepository: RestRepository,
     private readonly adminRepository: AdminRepository,
     private readonly configService: ConfigService,
@@ -56,29 +53,7 @@ export class AuthService {
     return { code: null };
   }
 
-  async verifyOtp(phone: string, slug: string, code: string) {
-    const normalizedPhone = normalizePhone(phone);
-    const key = this.userOtpKey(slug, normalizedPhone);
-    const cachedCode = await this.cacheService.get(key);
-    if (!cachedCode) throw new BadRequestException('OTP expired or not found');
-    if (cachedCode !== code) throw new BadRequestException('Invalid OTP');
-
-    await this.cacheService.del(key);
-
-    const user = await this.userService.findOrCreateByPhone(normalizedPhone);
-
-    const rest = await this.restRepository.findOne({ slug });
-
-    if (!rest) {
-      throw new BadRequestException(RestMessage.NOT_FOUND);
-    }
-
-    const tokens = await this.tokensService.generateAccessAndRefreshToken(user.id, rest.id, false, slug);
-
-    const userResponse = UserLoginTransformer.transform(user, rest);
-
-    return { tokens, user: userResponse };
-  }
+ 
 
   async verifyOtpAdmin(phone: string, slug: string, code: string) {
     const normalizedPhone = normalizePhone(phone);

src/modules/auth/transformers/user-login.transformer.ts

@@ -1,6 +1,4 @@
-import type { User } from '../../users/entities/user.entity';
-import type { Restaurant } from '../../restaurants/entities/restaurant.entity';
-
+ 
 export interface UserLoginResponse {
   id: string;
   firstName: string;
@@ -15,19 +13,4 @@ export interface UserLoginResponse {
   };
 }
 
-export class UserLoginTransformer {
-  static transform(user: User, restaurant: Restaurant): UserLoginResponse {
-    return {
-      id: user.id,
-      firstName: user.firstName,
-      lastName: user.lastName,
-      phone: user.phone,
-      isActive: user.isActive,
-      restaurant: {
-        id: restaurant.id,
-        name: restaurant.name,
-        slug: restaurant.slug,
-      },
-    };
-  }
-}
+