Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.5.4</version>
<version>3.5.5</version>
</parent>

<properties>
Expand All @@ -59,10 +59,10 @@
<maven.compiler.target>${java.version}</maven.compiler.target>

<switcher-client.version>2.4.1</switcher-client.version>
<jsonwebtoken.version>0.12.7</jsonwebtoken.version>
<jsonwebtoken.version>0.13.0</jsonwebtoken.version>
<joda-time.version>2.14.0</joda-time.version>
<gson.version>2.13.1</gson.version>
<springdoc.version>2.8.9</springdoc.version>
<springdoc.version>2.8.11</springdoc.version>

<!-- Test-->
<flapdoodle.embed.mongo.version>4.21.0</flapdoodle.embed.mongo.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -37,12 +38,14 @@ public Mono<ResponseEntity<GitHubAuthDTO>> gitHubAuth(@RequestParam String code)
@Operation(summary = "Update JWT using your refresh token")
@PostMapping(value = "/auth/refresh")
public Mono<ResponseEntity<GitHubAuthDTO>> 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<ResponseEntity<Object>> logout(@RequestHeader(HttpHeaders.AUTHORIZATION) String token) {
public Mono<ResponseEntity<Object>> logout(
@Parameter(hidden = true) @RequestHeader(HttpHeaders.AUTHORIZATION) String token) {
return adminService.logout(token).map(ResponseEntity::ok);
}

Expand Down