4nk/lecoffre-back
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'staging' into preprod

Browse Source
This commit is contained in:
Vins 2023-12-05 11:28:51 +01:00
commit d83b9d6f2a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/config/variables/Variables.ts
View File

@ -67,6 +67,9 @@ export class BackendVariables {
@IsNotEmpty()
public readonly PINATA_GATEWAY!: string;
@IsNotEmpty()
public readonly PINATA_GATEWAY_TOKEN!: string;
@IsNotEmpty()
public readonly ACCESS_TOKEN_SECRET!: string;
@ -150,6 +153,7 @@ export class BackendVariables {
this.PINATA_API_KEY = process.env["PINATA_API_KEY"]!;
this.PINATA_API_SECRET = process.env["PINATA_API_SECRET"]!;
this.PINATA_GATEWAY = process.env["PINATA_GATEWAY"]!;
this.PINATA_GATEWAY_TOKEN = process.env["PINATA_GATEWAY_TOKEN"]!;
this.ACCESS_TOKEN_SECRET = process.env["ACCESS_TOKEN_SECRET"]!;
this.REFRESH_TOKEN_SECRET = process.env["REFRESH_TOKEN_SECRET"]!;
this.MAILCHIMP_API_KEY = process.env["MAILCHIMP_API_KEY"]!;
@ -170,8 +174,6 @@ export class BackendVariables {
this.OVH_CONSUMER_KEY = process.env["OVH_CONSUMER_KEY"]!;
this.OVH_SMS_SERVICE_NAME = process.env["OVH_SMS_SERVICE_NAME"]!;
this.SMS_FACTOR_TOKEN = process.env["SMS_FACTOR_TOKEN"]!;
}
public async validate(groups?: string[]) {
const validationOptions = groups ? { groups } : undefined;
@ -179,7 +181,7 @@ export class BackendVariables {
try {
await validateOrReject(this, validationOptions);
} catch (error: any) {
if (process.env["ENV"] === "dev" || process.env["ENV"] === 'stg') {
if (process.env["ENV"] === "dev" || process.env["ENV"] === "stg") {
throw error;
}
throw new Error("Some env variables are required!");

2
src/services/common/FilesService/FilesService.ts
View File

@ -59,7 +59,7 @@ export default class FilesService extends BaseService {
public async download(uid: string) {
const file = await this.filesRepository.findOneByUid(uid);
if (!file?.key) return null;
const fileResult = await fetch(file.file_path);
const fileResult = await fetch(file.file_path.concat("?pinataGatewayToken=").concat(this.variables.PINATA_GATEWAY_TOKEN));
const fileArrayBuffer = await fileResult.arrayBuffer();
return { file: file, buffer: await this.cryptoService.decrypt(Buffer.from(fileArrayBuffer), file.key) };
}

13
src/services/customer/CustomersService/CustomersService.ts
View File

@ -1,4 +1,4 @@
// import { BackendVariables } from "@Common/config/variables/Variables";
import { BackendVariables } from "@Common/config/variables/Variables";
import { Customers, Prisma, TotpCodes } from "@prisma/client";
import CustomersRepository from "@Repositories/CustomersRepository";
import TotpCodesRepository from "@Repositories/TotpCodesRepository";
@ -57,7 +57,7 @@ export default class CustomersService extends BaseService {
private customerRepository: CustomersRepository,
private authService: AuthService,
private totpCodesRepository: TotpCodesRepository,
// private variables: BackendVariables,
private variables: BackendVariables,
private ovhService: OvhService,
private smsFactorService: SmsFactorService,
) {
@ -110,8 +110,7 @@ export default class CustomersService extends BaseService {
const totpCode = await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60 * 1000), reason);
if (!totpCode) return null;
// 5: Send the SMS code to the customer
// if(this.variables.ENV !== 'dev')
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return {
customer,
totpCode: TotpCodesResource.hydrate<TotpCodesResource>({
@ -163,8 +162,7 @@ export default class CustomersService extends BaseService {
await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60000), TotpCodesReasons.RESET_PASSWORD);
// 5: Send the SMS code to the customer
// if(this.variables.ENV !== 'dev')
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return customer;
}
@ -294,8 +292,7 @@ export default class CustomersService extends BaseService {
const totpCode = await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60 * 1000), totpCodeToResend.reason!, true);
// 7: Send the SMS code to the customer
// if(this.variables.ENV !== 'dev')
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return { customer, totpCode };
}