Chneemann/videoflix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

error when the email does not exist & clean code error service

Browse source
This commit is contained in:
Chneemann 2024-08-07 04:36:19 +02:00
parent 966d03edbd
commit bfa8b61449
7 changed files with 37 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/videoflix/auth/views.py
View file

@ -40,7 +40,7 @@ class RegisterView(APIView):
email = request.data.get('email')
password = request.data.get('password')
if CustomUser.objects.filter(email=email).exists():
return Response({'detail': 'A user with this email already exists.'}, status=status.HTTP_400_BAD_REQUEST)
return Response({'mail': 'A user with this email already exists.'}, status=status.HTTP_400_BAD_REQUEST)
serialized = UserSerializer(data=request.data)
if serialized.is_valid():
@ -81,7 +81,7 @@ class VerifyEmailView(APIView):
user = CustomUser.objects.filter(Q(email=email) & Q(verify_email_token=token)).first()
if user:
if user.is_active:
return Response({"error": "User has already been activated"}, status=status.HTTP_409_CONFLICT)
return Response({"error": "User has already been activated."}, status=status.HTTP_409_CONFLICT)
user.is_active = True
user.save()
@ -93,7 +93,7 @@ class ForgotPasswordView(APIView):
def post(self, request):
email = request.data.get('email')
if not email:
return Response({"error": "Email required."}, status=status.HTTP_400_BAD_REQUEST)
return Response({"mail": "Email required."}, status=status.HTTP_400_BAD_REQUEST)
try:
user = CustomUser.objects.get(email=email)
@ -101,7 +101,7 @@ class ForgotPasswordView(APIView):
user.save()
self.send_email(user)
except CustomUser.DoesNotExist:
pass
return Response({"mail": "This email does not exist."}, status=status.HTTP_400_BAD_REQUEST)
return Response(status=status.HTTP_200_OK)
def send_email(self, user):

6
frontend/src/app/components/auth/forgot-password/forgot-password.component.html
View file

@ -25,6 +25,7 @@
!isUserEmailValid(authData.mail.toLowerCase()) &&
authData.mail.length > 0)
"
(click)="this.errorService.clearError()"
required
/>
<div class="error-msg">
@ -34,6 +35,11 @@
!isUserEmailValid(authData.mail.toLowerCase())) {
<p>This is not a valid email format</p>
}}
<div *ngIf="errorService.error$ | async as errors">
<div *ngIf="errors?.['mail']">
<p>{{ errors["mail"] }}</p>
</div>
</div>
</div>
<app-btn-large
[value]="'Send Email'"

23
frontend/src/app/components/auth/forgot-password/forgot-password.component.ts
View file

@ -48,16 +48,16 @@ export class ForgotPasswordComponent {
return emailRegex.test(emailValue);
}
onSubmit(ngForm: NgForm, mailInput: any) {
async onSubmit(ngForm: NgForm, mailInput: any) {
if (ngForm.submitted && ngForm.form.valid) {
if (mailInput.name === 'mail') {
try {
this.verifyEmail();
await this.verifyEmail();
ngForm.form.reset();
} catch {}
} else if (mailInput.name === 'password') {
try {
this.changePassword();
await this.changePassword();
ngForm.form.reset();
} catch {}
}
@ -76,7 +76,7 @@ export class ForgotPasswordComponent {
this.errorService.clearError();
} catch (error) {
this.sendMailSuccess = false;
this.errorMsg(error);
this.errorService.errorMsg(error);
}
}
@ -94,20 +94,7 @@ export class ForgotPasswordComponent {
this.queryEmailSuccess = true;
this.errorService.clearError();
} catch (error) {
this.errorMsg(error);
}
}
errorMsg(error: any) {
if (error instanceof HttpErrorResponse) {
const errorTypes = ['error'];
for (const type of errorTypes) {
if (error.error[type]) {
this.errorService.setError(type, error.error[type]);
return;
}
}
this.errorService.clearError();
this.errorService.errorMsg(error);
}
}
}

15
frontend/src/app/components/auth/login/login.component.ts
View file

@ -45,21 +45,8 @@ export class LoginComponent {
this.router.navigate(['/browse/']);
this.errorService.clearError();
} catch (error) {
this.errorMsg(error);
this.errorService.errorMsg(error);
}
}
}
errorMsg(error: any) {
if (error instanceof HttpErrorResponse) {
const errorTypes = ['mail', 'password'];
for (const type of errorTypes) {
if (error.error[type]) {
this.errorService.setError(type, error.error[type]);
return;
}
}
this.errorService.clearError();
}
}
}

9
frontend/src/app/components/auth/register/register.component.html
View file

@ -38,9 +38,12 @@
} @else { @if (mail.touched && authData.mail.length > 0 &&
!isUserEmailValid(authData.mail.toLowerCase())) {
<p>This is not a valid email format</p>
}} @if ((errorService.error$ | async)) {
<p>{{ errorService.error$ | async }}</p>
}
}}
<div *ngIf="errorService.error$ | async as errors">
<div *ngIf="errors?.['mail']" class="error-msg">
<p>{{ errors["mail"] }}</p>
</div>
</div>
</div>
<input
type="password"

6
frontend/src/app/components/auth/register/register.component.ts
View file

@ -55,11 +55,7 @@ export class RegisterComponent {
this.registrationSuccess = true;
this.errorService.clearError();
} catch (error) {
// if (error instanceof HttpErrorResponse) {
// this.errorService.setError(error.error.detail);
// } else {
// this.errorService.setError('An unknown error has occurred.');
// }
this.errorService.errorMsg(error);
}
}
}

14
frontend/src/app/services/error.service.ts
View file

@ -1,3 +1,4 @@
import { HttpErrorResponse } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { map } from 'rxjs/operators';
@ -32,4 +33,17 @@ export class ErrorService {
clearError() {
this.errorSubject.next(null);
}
errorMsg(error: any) {
if (error instanceof HttpErrorResponse) {
const errorTypes = ['mail', 'password', 'error'];
for (const type of errorTypes) {
if (error.error[type]) {
this.setError(type, error.error[type]);
return;
}
}
this.clearError();
}
}
}