From b4351ceaea4d7919d98ea0b47bf15b5cd536cf62 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 14 May 2025 10:32:44 +0200 Subject: [PATCH 1/3] refactor: throw proper error on registration conflict, handle properly --- .../GlobalExceptionHandler.java | 7 ++ .../java/de/szut/casino/user/UserService.java | 5 +- .../auth/register/register.component.html | 83 ++++++++++++------- .../auth/register/register.component.ts | 43 +++++++--- 4 files changed, 93 insertions(+), 45 deletions(-) diff --git a/backend/src/main/java/de/szut/casino/exceptionHandling/GlobalExceptionHandler.java b/backend/src/main/java/de/szut/casino/exceptionHandling/GlobalExceptionHandler.java index df20fe0..573abb8 100644 --- a/backend/src/main/java/de/szut/casino/exceptionHandling/GlobalExceptionHandler.java +++ b/backend/src/main/java/de/szut/casino/exceptionHandling/GlobalExceptionHandler.java @@ -2,6 +2,7 @@ package de.szut.casino.exceptionHandling; import de.szut.casino.exceptionHandling.exceptions.InsufficientFundsException; import de.szut.casino.exceptionHandling.exceptions.UserNotFoundException; +import jakarta.persistence.EntityExistsException; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ControllerAdvice; @@ -24,4 +25,10 @@ public class GlobalExceptionHandler { ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(), request.getDescription(false)); return new ResponseEntity<>(errorDetails, HttpStatus.BAD_REQUEST); } + + @ExceptionHandler(EntityExistsException.class) + public ResponseEntity handleEntityExistsException(EntityExistsException ex, WebRequest request) { + ErrorDetails errorDetails = new ErrorDetails(new Date(), ex.getMessage(), request.getDescription(false)); + return new ResponseEntity<>(errorDetails, HttpStatus.CONFLICT); + } } diff --git a/backend/src/main/java/de/szut/casino/user/UserService.java b/backend/src/main/java/de/szut/casino/user/UserService.java index f74bff9..25fabef 100644 --- a/backend/src/main/java/de/szut/casino/user/UserService.java +++ b/backend/src/main/java/de/szut/casino/user/UserService.java @@ -1,6 +1,7 @@ package de.szut.casino.user; import de.szut.casino.user.dto.CreateUserDto; +import jakarta.persistence.EntityExistsException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.crypto.password.PasswordEncoder; @@ -19,11 +20,11 @@ public class UserService { public UserEntity createUser(CreateUserDto createUserDto) { if (userRepository.existsByUsername(createUserDto.getUsername())) { - throw new IllegalArgumentException("Username is already taken"); + throw new EntityExistsException("Username is already taken"); } if (userRepository.existsByEmail(createUserDto.getEmail())) { - throw new IllegalArgumentException("Email is already in use"); + throw new EntityExistsException("Email is already in use"); } UserEntity user = new UserEntity( diff --git a/frontend/src/app/feature/auth/register/register.component.html b/frontend/src/app/feature/auth/register/register.component.html index 29794c9..5339e36 100644 --- a/frontend/src/app/feature/auth/register/register.component.html +++ b/frontend/src/app/feature/auth/register/register.component.html @@ -2,9 +2,11 @@

Konto erstellen

-
- {{ errorMessage }} -
+ @if (errorMessage()) { +
+ {{ errorMessage() }} +
+ }
@@ -14,18 +16,26 @@ type="email" formControlName="email" class="w-full px-4 py-2.5 bg-deep-blue-light/50 text-white rounded-lg my-1 border border-deep-blue-light/30 focus:border-emerald/50 focus:ring-1 focus:ring-emerald/50 outline-none transition-all duration-200" + [ngClass]="{ 'border-accent-red': fieldErrors()['email'] }" placeholder="Gib deine E-Mail-Adresse ein" /> -
- E-Mail ist erforderlich - - Bitte gib eine gültige E-Mail-Adresse ein - -
+ @if (fieldErrors()['email']) { +
+ {{ fieldErrors()['email'] }} +
+ } + + @if (!fieldErrors()['email'] && form['email'].touched && form['email'].errors) { +
+ @if (form['email'].errors['required']) { + E-Mail ist erforderlich + } + @if (form['email'].errors['email']) { + Bitte gib eine gültige E-Mail-Adresse ein + } +
+ }
@@ -37,18 +47,26 @@ type="text" formControlName="username" class="w-full px-4 py-2.5 bg-deep-blue-light/50 text-white rounded-lg my-1 border border-deep-blue-light/30 focus:border-emerald/50 focus:ring-1 focus:ring-emerald/50 outline-none transition-all duration-200" + [ngClass]="{ 'border-accent-red': fieldErrors()['username'] }" placeholder="Wähle einen Benutzernamen" /> -
- Benutzername ist erforderlich - - Benutzername muss mindestens 3 Zeichen haben - -
+ @if (fieldErrors()['username']) { +
+ {{ fieldErrors()['username'] }} +
+ } + + @if (!fieldErrors()['username'] && form['username'].touched && form['username'].errors) { +
+ @if (form['username'].errors['required']) { + Benutzername ist erforderlich + } + @if (form['username'].errors['minlength']) { + Benutzername muss mindestens 3 Zeichen haben + } +
+ }
@@ -63,24 +81,25 @@ placeholder="Erstelle ein Passwort" /> -
- Passwort ist erforderlich - - Passwort muss mindestens 6 Zeichen haben - -
+ @if (form['password'].touched && form['password'].errors) { +
+ @if (form['password'].errors['required']) { + Passwort ist erforderlich + } + @if (form['password'].errors['minlength']) { + Passwort muss mindestens 6 Zeichen haben + } +
+ }
diff --git a/frontend/src/app/feature/auth/register/register.component.ts b/frontend/src/app/feature/auth/register/register.component.ts index 22a032f..a916388 100644 --- a/frontend/src/app/feature/auth/register/register.component.ts +++ b/frontend/src/app/feature/auth/register/register.component.ts @@ -1,9 +1,10 @@ -import { Component } from '@angular/core'; +import { Component, signal } from '@angular/core'; import { FormBuilder, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { Router, RouterLink } from '@angular/router'; import { RegisterRequest } from '../../../model/auth/RegisterRequest'; import { AuthService } from '@service/auth.service'; import { CommonModule } from '@angular/common'; +import { HttpErrorResponse } from '@angular/common/http'; @Component({ selector: 'app-register', @@ -13,8 +14,9 @@ import { CommonModule } from '@angular/common'; }) export class RegisterComponent { registerForm: FormGroup; - errorMessage = ''; - isLoading = false; + errorMessage = signal(''); + isLoading = signal(false); + fieldErrors = signal<{ [key: string]: string }>({}); constructor( private fb: FormBuilder, @@ -37,8 +39,9 @@ export class RegisterComponent { return; } - this.isLoading = true; - this.errorMessage = ''; + this.isLoading.set(true); + this.errorMessage.set(''); + this.fieldErrors.set({}); const registerRequest: RegisterRequest = { email: this.form['email'].value, @@ -59,15 +62,33 @@ export class RegisterComponent { this.router.navigate(['/home']); }, error: () => { - this.isLoading = false; - this.errorMessage = - 'Registration successful but failed to login automatically. Please log in manually.'; + this.isLoading.set(false); + this.errorMessage.set( + 'Registration successful but failed to login automatically. Please log in manually.' + ); }, }); }, - error: (err) => { - this.isLoading = false; - this.errorMessage = err.error?.message || 'Failed to register. Please try again.'; + error: (err: HttpErrorResponse) => { + this.isLoading.set(false); + + if (err.status === 409) { + const errorResponse = err.error; + + if (errorResponse?.message === 'Email is already in use') { + this.fieldErrors.update((errors) => ({ + ...errors, + email: 'Diese E-Mail-Adresse wird bereits verwendet.', + })); + } else if (errorResponse?.message === 'Username is already taken') { + this.fieldErrors.update((errors) => ({ + ...errors, + username: 'Dieser Benutzername ist bereits vergeben.', + })); + } + } else { + this.errorMessage.set(err.error?.message || 'Failed to register. Please try again.'); + } }, }); } -- 2.47.2 From e7e43839eb3de8ffb29b63472dbe17fc83643519 Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 14 May 2025 10:37:08 +0200 Subject: [PATCH 2/3] refactor: fix linter, adjust errorhandling --- .../auth/register/register.component.ts | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/frontend/src/app/feature/auth/register/register.component.ts b/frontend/src/app/feature/auth/register/register.component.ts index a916388..4b240f5 100644 --- a/frontend/src/app/feature/auth/register/register.component.ts +++ b/frontend/src/app/feature/auth/register/register.component.ts @@ -16,7 +16,7 @@ export class RegisterComponent { registerForm: FormGroup; errorMessage = signal(''); isLoading = signal(false); - fieldErrors = signal<{ [key: string]: string }>({}); + fieldErrors = signal>({}); constructor( private fb: FormBuilder, @@ -51,7 +51,6 @@ export class RegisterComponent { this.authService.register(registerRequest).subscribe({ next: () => { - // After registration, log in the user this.authService .login({ usernameOrEmail: registerRequest.email, @@ -73,18 +72,20 @@ export class RegisterComponent { this.isLoading.set(false); if (err.status === 409) { - const errorResponse = err.error; - - if (errorResponse?.message === 'Email is already in use') { - this.fieldErrors.update((errors) => ({ - ...errors, - email: 'Diese E-Mail-Adresse wird bereits verwendet.', - })); - } else if (errorResponse?.message === 'Username is already taken') { - this.fieldErrors.update((errors) => ({ - ...errors, - username: 'Dieser Benutzername ist bereits vergeben.', - })); + const message = err.error?.message; + switch (message) { + case 'Email is already in use': + this.fieldErrors.update(errors => ({ + ...errors, + email: 'Diese E-Mail-Adresse wird bereits verwendet.' + })); + break; + case 'Username is already taken': + this.fieldErrors.update(errors => ({ + ...errors, + username: 'Dieser Benutzername ist bereits vergeben.' + })); + break; } } else { this.errorMessage.set(err.error?.message || 'Failed to register. Please try again.'); -- 2.47.2 From 0bab8a343c2ee48a1fac65f42f6406b89d309ddd Mon Sep 17 00:00:00 2001 From: Phan Huy Tran Date: Wed, 14 May 2025 10:40:32 +0200 Subject: [PATCH 3/3] style: run prettier --- .../src/app/feature/auth/register/register.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/app/feature/auth/register/register.component.ts b/frontend/src/app/feature/auth/register/register.component.ts index 4b240f5..1ccc15c 100644 --- a/frontend/src/app/feature/auth/register/register.component.ts +++ b/frontend/src/app/feature/auth/register/register.component.ts @@ -75,15 +75,15 @@ export class RegisterComponent { const message = err.error?.message; switch (message) { case 'Email is already in use': - this.fieldErrors.update(errors => ({ + this.fieldErrors.update((errors) => ({ ...errors, - email: 'Diese E-Mail-Adresse wird bereits verwendet.' + email: 'Diese E-Mail-Adresse wird bereits verwendet.', })); break; case 'Username is already taken': - this.fieldErrors.update(errors => ({ + this.fieldErrors.update((errors) => ({ ...errors, - username: 'Dieser Benutzername ist bereits vergeben.' + username: 'Dieser Benutzername ist bereits vergeben.', })); break; } -- 2.47.2