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

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Vins 2023-12-04 14:12:43 +01:00
commit 38f7d52978
6 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/api/customer/AuthController.ts
View File

@ -6,7 +6,6 @@ import CustomersService, {
InvalidPasswordError,
InvalidTotpCodeError,
NotRegisteredCustomerError,
PasswordAlreadySetError,
SmsNotExpiredError,
TooSoonForNewCode,
TotpCodeExpiredError,
@ -141,7 +140,7 @@ export default class AuthController extends ApiController {
}
try {
const customer = await this.customerService.setFirstPassword(email, totpCode, password);
const customer = await this.customerService.setPassword(email, totpCode, password);
if (!customer) {
this.httpBadRequest(response, "Customer not found");
return;
@ -153,7 +152,7 @@ export default class AuthController extends ApiController {
const refreshToken = this.authService.generateRefreshToken(payload);
this.httpSuccess(response, { accessToken, refreshToken });
} catch (error) {
if (error instanceof TotpCodeExpiredError || error instanceof PasswordAlreadySetError) {
if (error instanceof TotpCodeExpiredError) {
this.httpBadRequest(response, error.message);
return;
}

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

@ -121,6 +121,9 @@ export class BackendVariables {
@IsNotEmpty()
public readonly OVH_CONSUMER_KEY!: string;
@IsNotEmpty()
public readonly OVH_SMS_SERVICE_NAME!: string;
@IsNotEmpty()
public readonly SMS_FACTOR_TOKEN!: string;
@ -165,6 +168,7 @@ export class BackendVariables {
this.OVH_APP_KEY = process.env["OVH_APP_KEY"]!;
this.OVH_APP_SECRET = process.env["OVH_APP_SECRET"]!;
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"]!;

82
src/common/databases/seeders/seeder.ts
View File

@ -173,8 +173,8 @@ export default async function main() {
first_name: "Angela",
last_name: "Dubois",
email: "angela.dubois@gmail.com",
phone_number: "06 12 34 56 78",
cell_phone_number: "06 12 34 56 78",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -185,8 +185,8 @@ export default async function main() {
first_name: "Maxime",
last_name: "Lalo",
email: "maxime.lalo@smart-chain.fr",
phone_number: "06 23 45 67 89",
cell_phone_number: "06 23 45 67 89",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -197,8 +197,8 @@ export default async function main() {
first_name: "Vincent",
last_name: "Alamelle",
email: "vincent.alamelle@smart-chain.fr",
phone_number: "06 34 56 78 90",
cell_phone_number: "06 34 56 78 90",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -209,8 +209,8 @@ export default async function main() {
first_name: "Melissa",
last_name: "Desde",
email: "melissa.desde@smart-chain.fr",
phone_number: "06 45 67 89 01",
cell_phone_number: "06 45 67 89 01",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -221,8 +221,8 @@ export default async function main() {
first_name: "Maxime",
last_name: "Leroy",
email: "maxime.leroy@hotmail.fr",
phone_number: "06 56 78 90 12",
cell_phone_number: "06 56 78 90 12",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -233,8 +233,8 @@ export default async function main() {
first_name: "Paul",
last_name: "Dupont",
email: "paul.dupont@outlook.com",
phone_number: "06 67 89 01 23",
cell_phone_number: "06 67 89 01 23",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -245,8 +245,8 @@ export default async function main() {
first_name: "Jean",
last_name: "Dubignot",
email: "jean.dubignot@gmail.com",
phone_number: "06 78 90 12 34",
cell_phone_number: "06 78 90 12 34",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -257,8 +257,8 @@ export default async function main() {
first_name: "Vincent",
last_name: "Martin",
email: "vincent.martin@gmail.com",
phone_number: "06 89 01 23 45",
cell_phone_number: "06 89 01 23 45",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -269,8 +269,8 @@ export default async function main() {
first_name: "Lucie",
last_name: "Chevalier",
email: "lucie.chevalier@outlook.com",
phone_number: "07 12 34 56 78",
cell_phone_number: "07 12 34 56 78",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -281,8 +281,8 @@ export default async function main() {
first_name: "Sébastien",
last_name: "Dubois",
email: "sebastien.dubois@gmail.com",
phone_number: "07 23 45 67 89",
cell_phone_number: "07 23 45 67 89",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -293,8 +293,8 @@ export default async function main() {
first_name: "Mathilde",
last_name: "Durand",
email: "mathilde.durand@gmail.com",
phone_number: "07 34 56 78 90",
cell_phone_number: "07 34 56 78 90",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -305,8 +305,8 @@ export default async function main() {
first_name: "Antoine",
last_name: "Bernard",
email: "antoine.bernard@outlook.com",
phone_number: "07 45 67 89 01",
cell_phone_number: "07 45 67 89 01",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -317,8 +317,8 @@ export default async function main() {
first_name: "Camille",
last_name: "Laurent",
email: "camille.laurent@gmail.com",
phone_number: "07 56 78 90 12",
cell_phone_number: "07 56 78 90 12",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -329,8 +329,8 @@ export default async function main() {
first_name: "Julien",
last_name: "Mercier",
email: "julien.mercier@hotmail.fr",
phone_number: "07 67 89 01 23",
cell_phone_number: "07 67 89 01 23",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -341,8 +341,8 @@ export default async function main() {
first_name: "Charlotte",
last_name: "Lefebvre",
email: "charlotte.lefebvre@gmail.com",
phone_number: "07 78 90 12 34",
cell_phone_number: "07 78 90 12 34",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -353,8 +353,8 @@ export default async function main() {
first_name: "Caroline",
last_name: "Pallut",
email: "caroline.pallut@gmail.com",
phone_number: "07 89 01 23 45",
cell_phone_number: "07 89 01 23 45",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -365,8 +365,8 @@ export default async function main() {
first_name: "Nadège",
last_name: "Gauchet",
email: "nedege.gauchet@outlook.com",
phone_number: "06 11 22 33 44",
cell_phone_number: "06 11 22 33 44",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -377,8 +377,8 @@ export default async function main() {
first_name: "Matthieu",
last_name: "Bougeard",
email: "matthieu.bougeard@gmail.com",
phone_number: "07 22 33 44 55",
cell_phone_number: "07 22 33 44 55",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -389,8 +389,8 @@ export default async function main() {
first_name: "Cécile",
last_name: "Celton",
email: "cecile.celton@outlook.com",
phone_number: "06 55 66 77 88",
cell_phone_number: "06 55 66 77 88",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -401,8 +401,8 @@ export default async function main() {
first_name: "Gwendal",
last_name: "Texier",
email: "gwendal.texier@gmail.com",
phone_number: "07 88 99 00 11",
cell_phone_number: "07 88 99 00 11",
phone_number: "+33785186013",
cell_phone_number: "+33785186013",
birthdate: null,
created_at: new Date(),
updated_at: new Date(),
@ -1548,7 +1548,7 @@ export default async function main() {
office: offices[0],
created_at: new Date(),
updated_at: new Date(),
}
},
];
const deedTypes: DeedType[] = [

25
src/services/common/OvhService/OvhService.ts
View File

@ -15,26 +15,19 @@ export default class OvhService extends BaseService {
consumerKey: this.variables.OVH_CONSUMER_KEY,
});
ovh.request("GET", "/sms", function (err: any, serviceName: string) {
if (err) {
console.log(err, serviceName);
return false;
} else {
console.log("My account SMS is " + serviceName);
const serviceName = this.variables.OVH_SMS_SERVICE_NAME;
// Send a simple SMS with a short number using your serviceName
ovh.request(
"POST",
"/sms/" + serviceName + "/jobs",
{
ovh.request('POST', '/sms/' + serviceName + '/jobs/', {
message: message,
sender: "LeCoffre",
senderForResponse: true,
receivers: [phoneNumber],
},
function (errsend: any, result: any) {
console.log(errsend, result);
},
);
}, (error: any, response: any) => {
if (error) {
console.error('Error sending Ovh Sms:', error);
return false;
} else {
console.log('SMS sent successfully via Ovh:', response);
return true;
}
});

25
src/services/common/SmsFactorService/SmsFactorService.ts
View File

@ -5,24 +5,27 @@ import axios from "axios";
@Service()
export default class SmsFactorService extends BaseService {
constructor(private variables: BackendVariables) {
super();
}
public async sendSms(phoneNumber: string, message: string): Promise<boolean> {
axios.post('https://api.smsfactor.com/send/', {
token: this.variables.SMS_FACTOR_TOKEN,
sender: "LeCoffre",
to: phoneNumber,
text: message,
}).then(response => {
console.log('SMS sent successfully:', response.data);
axios
.get(
"https://api.smsfactor.com/send/simulate?to=" +
phoneNumber +
"&sender=LeCoffre&text=" +
message +
"&token=" +
this.variables.SMS_FACTOR_TOKEN,
{},
)
.then((response) => {
console.log("SMS sent successfully via Sms Factor :" + response);
return true;
})
.catch(error => {
console.error('Error sending SMS:', error.response.data);
.catch((error) => {
console.error("Error sending Sms Factor SMS:", error);
return false;
});
return false;

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

@ -107,10 +107,10 @@ export default class CustomersService extends BaseService {
const reason = customer.password ? TotpCodesReasons.LOGIN : TotpCodesReasons.FIRST_LOGIN;
// 4: Save the SMS code in database
const totpCode = await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60000), reason);
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
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return {
customer,
totpCode: TotpCodesResource.hydrate<TotpCodesResource>({
@ -162,7 +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
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return customer;
}
@ -180,7 +180,7 @@ export default class CustomersService extends BaseService {
* @param password
* @returns
*/
public async setFirstPassword(email: string, totpCode: string, password: string): Promise<Customer | null> {
public async setPassword(email: string, totpCode: string, password: string): Promise<Customer | null> {
// 1: Check if the customer exists
const customer = await this.getByEmail(email);
if (!customer) return null;
@ -212,7 +212,7 @@ export default class CustomersService extends BaseService {
const hashedPassword = await this.authService.hashPassword(password);
// 7: Set the password in database and return the result of the update
return await this.setPassword(customer, hashedPassword);
return await this.setPasswordInDatabase(customer, hashedPassword);
}
/**
@ -272,13 +272,13 @@ export default class CustomersService extends BaseService {
const customerHydrated = Customer.hydrate<Customer>(customer);
// 2: Get last code sent
// 2: Get last code sent and check if it's still valid
const totpCodeToResend = customerHydrated.totpCodes?.find((totpCode) => {
return totpCode.uid === totpCodeUid && totpCode.expire_at && totpCode.expire_at.getTime() > now;
});
if (!totpCodeToResend) throw new TotpCodeExpiredError();
// 3: Check if it was created more than 30 seconds ago
// 3: Check if it was created more than 30 seconds ago and hasn't been resent yet
if (totpCodeToResend.created_at && totpCodeToResend.created_at.getTime() > now - 30000 && totpCodeToResend.resent)
throw new TooSoonForNewCode();
@ -288,11 +288,11 @@ export default class CustomersService extends BaseService {
// 5: Disable the old code
await this.totpCodesRepository.disable(totpCodeToResend);
// 6: Save the SMS code in database
const totpCode = await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60000), totpCodeToResend.reason!, true);
// 6: Save the SMS code in database with the same reason as the old one
const totpCode = await this.saveTotpPin(customer, totpPin, new Date(now + 5 * 60 * 1000), totpCodeToResend.reason!, true);
// 7: Send the SMS code to the customer
await this.sendSmsCodeToCustomer(totpPin, customer);
if(this.variables.ENV !== 'dev') await this.sendSmsCodeToCustomer(totpPin, customer);
return { customer, totpCode };
}
@ -300,7 +300,7 @@ export default class CustomersService extends BaseService {
* @description : Set password for a customer
* @throws {Error} If customer cannot be updated
*/
private async setPassword(customer: Customer, password: string) {
private async setPasswordInDatabase(customer: Customer, password: string) {
return await this.customerRepository.update(
customer.uid as string,
Customer.hydrate<Customer>({
@ -355,17 +355,18 @@ export default class CustomersService extends BaseService {
}
private async sendSmsCodeToCustomer(totpPin: number, customer: Customer) {
const message = "Votre code de vérification LEcoffre.io est : " + totpPin.toString();
// Sélectionnez le fournisseur de SMS en fonction de la variable d'environnement
const selectedProvider = this.variables.SMS_PROVIDER === "OVH" ? this.ovhService : this.smsFactorService;
// Envoi du SMS
if (!customer.contact?.phone_number) return;
let success = await selectedProvider.sendSms(customer.contact?.phone_number, totpPin.toString());
let success = await selectedProvider.sendSms(customer.contact?.phone_number, message);
// Si l'envoi échoue, basculez automatiquement sur le second fournisseur
if (!success) {
const alternateProvider = this.variables.SMS_PROVIDER === "OVH" ? this.smsFactorService : this.ovhService;
success = await alternateProvider.sendSms(customer.contact?.phone_number, totpPin.toString());
success = await alternateProvider.sendSms(customer.contact?.phone_number, message);
}
}