Skip to content

Commit 34e83b6

Browse files
AYS-487 | Added exception handling for AysUserNotSuperAdminException class (#381)
Co-authored-by: agitrubard <demiragitrubar@gmail.com>
1 parent c6b1cd4 commit 34e83b6

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/main/java/org/ays/auth/util/exception/AysUserNotSuperAdminException.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package org.ays.auth.util.exception;
22

3-
import org.ays.common.util.exception.AysBadRequestException;
3+
import org.springframework.security.access.AccessDeniedException;
44

55
import java.io.Serial;
66

77
/**
88
* Exception to be thrown when a user is not a super admin but tries to perform an action that requires super admin privileges.
99
*/
10-
public final class AysUserNotSuperAdminException extends AysBadRequestException {
10+
public final class AysUserNotSuperAdminException extends AccessDeniedException {
1111

1212
/**
1313
* Unique identifier for serialization.

src/test/java/org/ays/auth/controller/AysRoleEndToEndTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ void givenValidRoleCreateRequest_whenRoleCreated_thenReturnSuccess() throws Exce
373373
}
374374

375375
@Test
376-
void givenRoleCreateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnBadRequestError() throws Exception {
376+
void givenRoleCreateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnForbiddenError() throws Exception {
377377

378378
// Initialize
379379
List<AysPermission> permissions = permissionReadPort.findAll();
@@ -392,11 +392,11 @@ void givenRoleCreateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin
392392
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
393393
.post(endpoint, adminToken.getAccessToken(), createRequest);
394394

395-
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.BAD_REQUEST;
395+
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.FORBIDDEN;
396396

397397
aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
398398
.andExpect(AysMockResultMatchersBuilders.status()
399-
.isBadRequest())
399+
.isForbidden())
400400
.andExpect(AysMockResultMatchersBuilders.subErrors()
401401
.doesNotHaveJsonPath());
402402

@@ -514,7 +514,7 @@ void givenValidRoleUpdateRequest_whenRoleUpdated_thenReturnSuccess() throws Exce
514514
}
515515

516516
@Test
517-
void givenValidIdAndRoleUpdateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnBadRequestError() throws Exception {
517+
void givenValidIdAndRoleUpdateRequest_whenRequestHasSuperPermissionsAndUserIsNotSuperAdmin_thenReturnForbiddenError() throws Exception {
518518

519519
// Initialize
520520
List<AysPermission> permissions = permissionReadPort.findAll();
@@ -543,11 +543,11 @@ void givenValidIdAndRoleUpdateRequest_whenRequestHasSuperPermissionsAndUserIsNot
543543
MockHttpServletRequestBuilder mockHttpServletRequestBuilder = AysMockMvcRequestBuilders
544544
.put(endpoint, adminToken.getAccessToken(), updateRequest);
545545

546-
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.BAD_REQUEST;
546+
AysErrorResponse mockErrorResponse = AysErrorResponseBuilder.FORBIDDEN;
547547

548548
aysMockMvc.perform(mockHttpServletRequestBuilder, mockErrorResponse)
549549
.andExpect(AysMockResultMatchersBuilders.status()
550-
.isBadRequest())
550+
.isForbidden())
551551
.andExpect(AysMockResultMatchersBuilders.subErrors()
552552
.doesNotHaveJsonPath());
553553

0 commit comments

Comments
 (0)