diff --git a/goofy-client/apps/goofy-e2e/src/integration/interceptor/interceptor.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/interceptor/interceptor.e2e-spec.ts index 8ed1d446b6432b2be1ff671ced809d2e689f3b1e..9661e715d704508ef0755d3a774ffad7880aedaa 100644 --- a/goofy-client/apps/goofy-e2e/src/integration/interceptor/interceptor.e2e-spec.ts +++ b/goofy-client/apps/goofy-e2e/src/integration/interceptor/interceptor.e2e-spec.ts @@ -30,7 +30,7 @@ describe('Interceptor', () => { describe('get Forbidden Status', () => { const statusCode: number = 403; - const snackbarMessage: string = 'Die Aktion konnte wegen einer fehlender Berechtigungen nicht durchgeführt werden'; + const snackbarMessage: string = 'Die Aktion konnte wegen fehlender Berechtigungen nicht durchgeführt werden'; beforeEach(() => { const url: string = BASE_PATH + vorgang._id.$oid; diff --git a/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.ts b/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.ts index 5f6ac2c668c43a1e344b7f06bf556df8d3b31c93..eb71ab0196dea1b9ca88812227a2d1e4f62726f6 100644 --- a/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.ts +++ b/goofy-client/libs/ui/src/lib/interceptor/http-error.interceptor.ts @@ -14,7 +14,7 @@ export class HttpErrorInterceptor implements HttpInterceptor { disableClose: true, panelClass: 'notification-dialog' } - readonly errorMessageOnForbidden: string = 'Die Aktion konnte wegen einer fehlender Berechtigungen nicht durchgeführt werden'; + readonly errorMessageOnForbidden: string = 'Die Aktion konnte wegen fehlender Berechtigungen nicht durchgeführt werden'; constructor(private dialog: MatDialog, private snackbarService: SnackBarService) { } diff --git a/goofy-server/src/main/java/de/itvsh/goofy/common/errorhandling/ExceptionController.java b/goofy-server/src/main/java/de/itvsh/goofy/common/errorhandling/ExceptionController.java index 2a59beb02ca89475023a85306fa8b9eecb557c99..c940c6b9aafd78229d9d073f111162463f6e0373 100644 --- a/goofy-server/src/main/java/de/itvsh/goofy/common/errorhandling/ExceptionController.java +++ b/goofy-server/src/main/java/de/itvsh/goofy/common/errorhandling/ExceptionController.java @@ -1,6 +1,5 @@ package de.itvsh.goofy.common.errorhandling; -import java.nio.file.AccessDeniedException; import java.util.Arrays; import java.util.HashSet; import java.util.Optional; @@ -15,6 +14,7 @@ import javax.validation.metadata.ConstraintDescriptor; import org.springframework.core.annotation.Order; import org.springframework.http.HttpStatus; +import org.springframework.security.access.AccessDeniedException; import org.springframework.web.bind.annotation.ControllerAdvice; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; diff --git a/goofy-server/src/test/java/de/itvsh/goofy/common/errorhandling/ExceptionControllerTest.java b/goofy-server/src/test/java/de/itvsh/goofy/common/errorhandling/ExceptionControllerTest.java index 22bb53b231ae2b664a44b22dc9bcea7873c4b21e..b63f01def4832b1e5f8979af8fff6dda09d31a73 100644 --- a/goofy-server/src/test/java/de/itvsh/goofy/common/errorhandling/ExceptionControllerTest.java +++ b/goofy-server/src/test/java/de/itvsh/goofy/common/errorhandling/ExceptionControllerTest.java @@ -3,7 +3,6 @@ package de.itvsh.goofy.common.errorhandling; import static org.assertj.core.api.Assertions.*; import static org.mockito.Mockito.*; -import java.nio.file.AccessDeniedException; import java.util.Collections; import javax.validation.ConstraintViolation; @@ -13,6 +12,7 @@ import javax.validation.Path; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.InjectMocks; +import org.springframework.security.access.AccessDeniedException; import com.thedeanda.lorem.LoremIpsum; diff --git a/pom.xml b/pom.xml index 2df14f87e964f4b3d8edede54f76d046c3bb3f46..1bf1ec20a4aed7a3d26adf13108d63e01772e03a 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <java.version>16</java.version> - <pluto.version>0.12.0-SNAPSHOT</pluto.version> + <pluto.version>${project.version}</pluto.version> <spring.boot.version>2.4.9</spring.boot.version>