diff --git a/src/app/admin/components/manage-employers/manage-employers.component.html b/src/app/admin/components/manage-employers/manage-employers.component.html
index acdcc7b103f0a619dae2dba9d7d529f5546ae753..823f405ba3f39dcf6ed7adc747b0ef2b7af84321 100644
--- a/src/app/admin/components/manage-employers/manage-employers.component.html
+++ b/src/app/admin/components/manage-employers/manage-employers.component.html
@@ -9,7 +9,7 @@
</div>
<div class="adminLayout">
- <h3 *ngIf="unvalidatedEmployers" class="title">Employeurs non validées ({{ unvalidatedEmployers.length }})</h3>
+ <h3 *ngIf="unvalidatedEmployers" class="title">Employeurs non validés ({{ unvalidatedEmployers.length }})</h3>
<ag-grid-angular
*ngIf="unvalidatedEmployers"
class="ag-theme-alpine user-table"
@@ -24,7 +24,7 @@
>
</ag-grid-angular>
- <h3 *ngIf="validatedEmployers" class="title">Employeurs validées ({{ validatedEmployers.length }})</h3>
+ <h3 *ngIf="validatedEmployers" class="title">Employeurs validés ({{ validatedEmployers.length }})</h3>
<ag-grid-angular
*ngIf="validatedEmployers"
class="ag-theme-alpine user-table"
diff --git a/src/app/profile/edit/edit.component.ts b/src/app/profile/edit/edit.component.ts
index 8f35e3f9ef1d3084778d332ff7ad40811d214f9d..8a893d12366470d6072d96dbf284b4047893caa7 100644
--- a/src/app/profile/edit/edit.component.ts
+++ b/src/app/profile/edit/edit.component.ts
@@ -2,6 +2,7 @@ import { HttpErrorResponse } from '@angular/common/http';
import { ChangeDetectorRef, Component, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import * as _ from 'lodash';
+import { lastValueFrom } from 'rxjs';
import { catchError, first } from 'rxjs/operators';
import { Employer } from '../../models/employer.model';
import { Job } from '../../models/job.model';
@@ -231,17 +232,14 @@ export class EditComponent implements OnInit {
});
}
- public confirmEmployer(): void {
+ public async confirmEmployer(): Promise<void> {
if (this.newJob) {
this.selectedJob = this.newJob;
- this.profileService.createJob(this.selectedJob).subscribe((res) => {
- console.log(res);
- });
+
+ const resJob = await lastValueFrom(this.profileService.createJob(this.selectedJob));
}
if (this.isNewEmployer) {
- this.profileService.createEmployer(this.selectedEmployer).subscribe((res) => {
- console.log(res);
- });
+ const resEmployer = await lastValueFrom(this.profileService.createEmployer(this.selectedEmployer));
}
this.profileService
diff --git a/src/app/profile/services/profile.service.ts b/src/app/profile/services/profile.service.ts
index 9ef8564810d6741d7c1955a38506eb0e59f9d53f..da35a4a9caf46de0df37a68ab90a2987311a64db 100644
--- a/src/app/profile/services/profile.service.ts
+++ b/src/app/profile/services/profile.service.ts
@@ -75,11 +75,14 @@ export class ProfileService {
});
}
public changeEmail(newEmail: string, oldEmail: string): Observable<User> {
- return this.http.post<any>(`${this.baseUrl}/change-email`, { newEmail, oldEmail });
+ return this.http.post<any>(`${this.baseUrl}/change-email`, {
+ newEmail: newEmail.toLowerCase(),
+ oldEmail: oldEmail.toLowerCase(),
+ });
}
public isEmailAlreadyUsed(newMail: string): Observable<boolean> {
- return this.http.post<boolean>(`${this.baseUrl}/verify-exist-user`, { newMail });
+ return this.http.post<boolean>(`${this.baseUrl}/verify-exist-user`, { newMail: newMail.toLowerCase() });
}
public getAllDataConsentPendingStructures(): Observable<Structure[]> {
diff --git a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts
index 460e3e75b45ae5bb9084cac8e979ef9fc1c2be66..2131cd9ab822927ba0ee1b94dbf2f42909284f8e 100644
--- a/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts
+++ b/src/app/profile/structure-add-member-modal/structure-add-member-modal.component.ts
@@ -47,7 +47,7 @@ export class StructureAddMemberModalComponent implements OnInit {
return;
}
const user = new TempUser();
- user.email = this.fAddAccount.email.value;
+ user.email = this.fAddAccount.email.value.toLowerCase();
this.structureService.addOwnerToStructure(user, this.structure.structure._id).subscribe(
(res) => {
if ((res as TempUser).email) {
diff --git a/src/app/services/auth.service.ts b/src/app/services/auth.service.ts
index 093bfe6da41196b6d4748356a9e84975cde5f099..bdcd462fbced8208a6da8a9dc028116c6d6c5657 100644
--- a/src/app/services/auth.service.ts
+++ b/src/app/services/auth.service.ts
@@ -68,7 +68,7 @@ export class AuthService {
}
public login(email: string, password: string): Observable<any> {
- return this.http.post<UserAuth>('api/auth/login', { email, password }).pipe(
+ return this.http.post<UserAuth>('api/auth/login', { email: email.toLowerCase(), password }).pipe(
map((user) => {
// store user details and jwt token in local storage to keep user logged in between page refreshes
localStorage.setItem('user', JSON.stringify(user));
@@ -79,7 +79,7 @@ export class AuthService {
}
public resendEmail(email: string, password: string): Observable<User> {
- return this.http.post<User>(`api/auth/resendEmail`, { email, password });
+ return this.http.post<User>(`api/auth/resendEmail`, { email: email.toLowerCase(), password });
}
public verifyUser(userId: string, token: string): Observable<User> {
@@ -89,7 +89,7 @@ export class AuthService {
}
public resetPassword(email: string): Observable<any> {
- return this.http.post(`api/users/reset-password`, { email });
+ return this.http.post(`api/users/reset-password`, { email: email.toLowerCase() });
}
public resetPasswordApply(token: string, password: string): Observable<any> {
diff --git a/src/app/services/newsletter.service.ts b/src/app/services/newsletter.service.ts
index 4635c10d871562b4d920512bb3f33daec575da3c..0f2c17569b004495c4a20f4bd043803ccae06818 100644
--- a/src/app/services/newsletter.service.ts
+++ b/src/app/services/newsletter.service.ts
@@ -10,14 +10,14 @@ export class NewsletterService {
constructor(private http: HttpClient) {}
public subscribe(email: string): Observable<NewsletterSubscription> {
- return this.http.post<NewsletterSubscription>('/api/newsletter/subscribe', { email });
+ return this.http.post<NewsletterSubscription>('/api/newsletter/subscribe', { email: email.toLowerCase() });
}
public unsubscribe(email: string): Observable<NewsletterSubscription> {
- return this.http.post<NewsletterSubscription>('/api/newsletter/unsubscribe', { email });
+ return this.http.post<NewsletterSubscription>('/api/newsletter/unsubscribe', { email: email.toLowerCase() });
}
public find(email: string): Observable<NewsletterSubscription> {
- return this.http.get<NewsletterSubscription>(`/api/newsletter?email=${email}`);
+ return this.http.get<NewsletterSubscription>(`/api/newsletter?email=${email.toLowerCase()}`);
}
}
diff --git a/src/styles.scss b/src/styles.scss
index 2621b049b0cf6343b7bb1cbe329b90343e20bb96..a4cb2b35c80d3e950745b0a14620a738bdd03639 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -608,17 +608,3 @@ button {
white-space: nowrap !important;
border: 0 !important;
}
-
-// Status colors
-.error {
- color: $info-error;
-}
-.success {
- color: $info-success;
-}
-.info {
- color: $info-blue;
-}
-.warning {
- color: $info-warning;
-}