diff --git a/pom.xml b/pom.xml index 5d791ff..1f86a8b 100644 --- a/pom.xml +++ b/pom.xml @@ -50,7 +50,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.4 + 3.5.5 @@ -59,10 +59,10 @@ ${java.version} 2.4.1 - 0.12.7 + 0.13.0 2.14.0 2.13.1 - 2.8.9 + 2.8.11 4.21.0 diff --git a/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java b/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java index 4c4902b..86b0f8e 100644 --- a/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java +++ b/src/main/java/com/switcherapi/ac/config/OpenAPIConfiguration.java @@ -15,7 +15,8 @@ public class OpenAPIConfiguration { private static final String SCHEME_NAME = "bearerScheme"; - private static final String SCHEME = "Bearer"; + private static final String BEARER_FORMAT = "JWT"; + private static final String SCHEME = "bearer"; private final ServiceConfig.Docs docs; @@ -70,9 +71,9 @@ private Components createComponents() { private SecurityScheme createSecurityScheme() { return new SecurityScheme() - .name(SCHEME_NAME) .type(SecurityScheme.Type.HTTP) - .scheme(SCHEME); + .scheme(SCHEME) + .bearerFormat(BEARER_FORMAT); } } \ No newline at end of file diff --git a/src/main/java/com/switcherapi/ac/controller/AdminController.java b/src/main/java/com/switcherapi/ac/controller/AdminController.java index 6043937..f3fe4ff 100644 --- a/src/main/java/com/switcherapi/ac/controller/AdminController.java +++ b/src/main/java/com/switcherapi/ac/controller/AdminController.java @@ -5,6 +5,7 @@ import com.switcherapi.ac.service.AccountService; import com.switcherapi.ac.service.AdminService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.security.SecurityRequirements; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseEntity; @@ -37,12 +38,14 @@ public Mono> gitHubAuth(@RequestParam String code) @Operation(summary = "Update JWT using your refresh token") @PostMapping(value = "/auth/refresh") public Mono> gitHubRefreshAuth( - @RequestHeader(HttpHeaders.AUTHORIZATION) String token, @RequestParam String refreshToken) { + @Parameter(hidden = true) @RequestHeader(HttpHeaders.AUTHORIZATION) String token, + @RequestParam String refreshToken) { return adminService.refreshToken(token, refreshToken).map(ResponseEntity::ok); } - + @PostMapping(value = "/logout") - public Mono> logout(@RequestHeader(HttpHeaders.AUTHORIZATION) String token) { + public Mono> logout( + @Parameter(hidden = true) @RequestHeader(HttpHeaders.AUTHORIZATION) String token) { return adminService.logout(token).map(ResponseEntity::ok); }