auth

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

@@ -5,8 +5,7 @@ import { SmsService } from '../../notification/services/sms.service';
 import { UserService } from '../../user/providers/user.service';
 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 { AuthMessage } 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';
@@ -17,31 +16,32 @@ import { normalizePhone } from '../../util/phone.util';
 export class AuthService {
   readonly ADMIN_PERMISSIONS_KEY = 'admin-perms';
   private OTP_EXPIRATION_TIME: number;
+
   constructor(
     private readonly cacheService: CacheService,
     private readonly smsService: SmsService,
     private readonly userService: UserService,
     private readonly tokensService: TokensService,
-    private readonly restRepository: RestRepository,
     private readonly adminRepository: AdminRepository,
     private readonly configService: ConfigService,
   ) {
     this.OTP_EXPIRATION_TIME = this.configService.get<number>('OTP_EXPIRATION_TIME') ?? 240;
   }
 
-  private userOtpKey(restaurantSlug: string, phone: string) {
-    return `otp:${restaurantSlug}:${phone}`;
+  private userOtpKey(phone: string) {
+    return `otp:${phone}`;
   }
 
-  private adminOtpKey(restaurantSlug: string, phone: string) {
-    return `otp-admin:${restaurantSlug}:${phone}`;
+  private adminOtpKey(phone: string) {
+    return `otp-admin:${phone}`;
   }
 
   async requestOtp(dto: RequestOtpDto, isAdmin: boolean) {
-    const { phone, slug } = dto;
+    const { phone } = dto;
     const normalizedPhone = normalizePhone(phone);
     const code = this.generateOtpCode();
-    const key = isAdmin ? this.adminOtpKey(slug, normalizedPhone) : this.userOtpKey(slug, normalizedPhone);
+    const key = isAdmin ? this.adminOtpKey(normalizedPhone) : this.userOtpKey(normalizedPhone);
+
     await this.cacheService.set(key, code, this.OTP_EXPIRATION_TIME);
 
     await this.smsService.sendotp(normalizedPhone, code);
@@ -49,33 +49,34 @@ export class AuthService {
     return { code: null };
   }
 
-  async verifyOtp(phone: string, slug: string, code: string) {
+  async verifyOtp(phone: string, code: string) {
     const normalizedPhone = normalizePhone(phone);
-    const key = this.userOtpKey(slug, normalizedPhone);
+    const key = this.userOtpKey(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 user = await this.userService.getOrCreate({
+      firstName: '[کاربر]',
+      lastName: '',
+      phone: normalizedPhone,
+      gender: true,
+      maxCredit: 0
+    });
 
-    const rest = await this.restRepository.findOne({ slug });
 
-    if (!rest) {
-      throw new BadRequestException(RestMessage.NOT_FOUND);
-    }
+    const tokens = await this.tokensService.generateAccessAndRefreshToken(user.id, false);
 
-    const tokens = await this.tokensService.generateAccessAndRefreshToken(user.id, rest.id, false, slug);
-
-    const userResponse = UserLoginTransformer.transform(user, rest);
+    const userResponse = UserLoginTransformer.transform(user);
 
     return { tokens, user: userResponse };
   }
 
-  async verifyOtpAdmin(phone: string, slug: string, code: string) {
+  async verifyOtpAdmin(phone: string, code: string) {
     const normalizedPhone = normalizePhone(phone);
-    const key = this.adminOtpKey(slug, normalizedPhone);
+    const key = this.adminOtpKey(normalizedPhone);
     const cachedCode = await this.cacheService.get(key);
 
     if (!cachedCode) throw new BadRequestException('OTP expired or not found');
@@ -83,45 +84,15 @@ export class AuthService {
     if (cachedCode !== code) throw new BadRequestException('Invalid OTP');
     await this.cacheService.del(key);
 
-    const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
+    const admin = await this.adminRepository.findOne({ phone: normalizedPhone });
 
     if (!admin) {
       throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
     }
 
-    const rest = await this.restRepository.findOne({ slug });
+    const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, true);
 
-    if (!rest) {
-      throw new BadRequestException(RestMessage.NOT_FOUND);
-    }
-
-    const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
-
-    const adminResponse = await AdminLoginTransformer.transform(admin, rest);
-
-    return { tokens, admin: adminResponse };
-  }
-  /**
-   * 
-  to use for login directly from DSC
-   */
-  async loginAdminForDsc(phone: string, slug: string) {
-    const normalizedPhone = normalizePhone(phone);
-    const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
-
-    if (!admin) {
-      throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
-    }
-
-    const rest = await this.restRepository.findOne({ slug });
-
-    if (!rest) {
-      throw new BadRequestException(RestMessage.NOT_FOUND);
-    }
-
-    const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
-
-    const adminResponse = await AdminLoginTransformer.transform(admin, rest);
+    const adminResponse = await AdminLoginTransformer.transform(admin);
 
     return { tokens, admin: adminResponse };
   }