danak/dpage-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

notifs

Browse Source
This commit is contained in:
morteza-mortezai
2026-03-10 10:47:25 +03:30
parent d07f7d3777
commit 4104bab0c6
64 changed files with 189 additions and 38637 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/auth/services/auth.service.ts
+62 -64
View File
@@ -2,12 +2,11 @@ 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 { 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 { AuthMessage, RestMessage } from 'src/common/enums/message.enum';
import { AdminRepository } from 'src/modules/admin/repositories/admin.repository';
import { ConfigService } from '@nestjs/config';
import { ConfigService } from '@nestjs/config';
import { normalizePhone } from '../../utils/phone.util';
@Injectable()
@@ -17,9 +16,8 @@ export class AuthService {
constructor(
private readonly cacheService: CacheService,
private readonly smsService: SmsService,
private readonly tokensService: TokensService,
private readonly restRepository: RestRepository,
private readonly adminRepository: AdminRepository,
private readonly tokensService: TokensService,
private readonly adminRepository: AdminRepository,
private readonly configService: ConfigService,
) {
this.OTP_EXPIRATION_TIME = this.configService.get<number>('OTP_EXPIRATION_TIME') ?? 240;
@@ -33,85 +31,85 @@ export class AuthService {
return `otp-admin:${restaurantSlug}:${phone}`;
}
async requestOtp(dto: RequestOtpDto, isAdmin: boolean) {
const { phone, slug } = dto;
const normalizedPhone = normalizePhone(phone);
if (isAdmin) {
const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
if (!admin) {
throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
}
}
const code = this.generateOtpCode();
const key = isAdmin ? this.adminOtpKey(slug, normalizedPhone) : this.userOtpKey(slug, normalizedPhone);
await this.cacheService.set(key, code, this.OTP_EXPIRATION_TIME);
// async requestOtp(dto: RequestOtpDto, isAdmin: boolean) {
// const { phone, slug } = dto;
// const normalizedPhone = normalizePhone(phone);
await this.smsService.sendotp(normalizedPhone, code);
// if (isAdmin) {
// const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
// if (!admin) {
// throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
// }
// }
// const code = this.generateOtpCode();
// const key = isAdmin ? this.adminOtpKey(slug, normalizedPhone) : this.userOtpKey(slug, normalizedPhone);
// await this.cacheService.set(key, code, this.OTP_EXPIRATION_TIME);
return { code: null };
}
// await this.smsService.sendotp(normalizedPhone, code);
// return { code: null };
// }
async verifyOtpAdmin(phone: string, slug: string, code: string) {
const normalizedPhone = normalizePhone(phone);
const key = this.adminOtpKey(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);
// async verifyOtpAdmin(phone: string, slug: string, code: string) {
// const normalizedPhone = normalizePhone(phone);
// const key = this.adminOtpKey(slug, normalizedPhone);
// const cachedCode = await this.cacheService.get(key);
const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
// if (!cachedCode) throw new BadRequestException('OTP expired or not found');
if (!admin) {
throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
}
// if (cachedCode !== code) throw new BadRequestException('Invalid OTP');
// await this.cacheService.del(key);
const rest = await this.restRepository.findOne({ slug });
// // const admin = await this.adminRepository.findByPhoneAndRestaurantSlug(normalizedPhone, slug);
if (!rest) {
throw new BadRequestException(RestMessage.NOT_FOUND);
}
// // if (!admin) {
// // throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
// // }
const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
// const rest = await this.restRepository.findOne({ slug });
// if (!rest) {
// throw new BadRequestException(RestMessage.NOT_FOUND);
// }
return { tokens, admin };
}
// const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
// return { tokens, admin };
// }
/**
*
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);
// 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);
}
// if (!admin) {
// throw new BadRequestException(AuthMessage.ADMIN_NOT_FOUND);
// }
const rest = await this.restRepository.findOne({ slug });
// const rest = await this.restRepository.findOne({ slug });
if (!rest) {
throw new BadRequestException(RestMessage.NOT_FOUND);
}
// if (!rest) {
// throw new BadRequestException(RestMessage.NOT_FOUND);
// }
const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
// const tokens = await this.tokensService.generateAccessAndRefreshToken(admin.id, rest.id, true, slug);
return { tokens, admin };
}
private generateOtpCode(): string {
const code = randomInt(10000, 100000);
return code.toString();
}
// return { tokens, admin };
// }
refreshToken(oldRefreshToken: string) {
return this.tokensService.refreshToken(oldRefreshToken);
}
// private generateOtpCode(): string {
// const code = randomInt(10000, 100000);
// return code.toString();
// }
// refreshToken(oldRefreshToken: string) {
// return this.tokensService.refreshToken(oldRefreshToken);
// }
}