Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove bearer prefix from token #17

Merged
merged 2 commits into from
Feb 13, 2024
Merged

feat: remove bearer prefix from token #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa2c98
feat: remove bearer prefix
andrejpetras Feb 13, 2024
858a6fc
tests: update bearer token test
andrejpetras Feb 13, 2024
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
9 changes: 8 additions & 1 deletion src/main/java/org/tkit/onecx/permission/common/services/TokenService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.tkit.quarkus.rs.context.token.TokenParserRequest;
import org.tkit.quarkus.rs.context.token.TokenParserService;

import io.quarkus.oidc.common.runtime.OidcConstants;
import lombok.extern.slf4j.Slf4j;

@Slf4j
Expand All @@ -25,11 +26,17 @@ public class TokenService {
@Inject
TokenParserService tokenParserService;

private static final String BEARER_PREFIX = OidcConstants.BEARER_SCHEME + " ";

public List<String> getTokenRoles(String tokenData) {

try {
var token = tokenData;
if (token.startsWith(BEARER_PREFIX)) {
token = token.substring(BEARER_PREFIX.length());
}

var request = new TokenParserRequest(tokenData)
var request = new TokenParserRequest(token)
.verify(config.verified())
.issuerEnabled(config.publicKeyEnabled())
.issuerSuffix(config.publicKeyLocationSuffix());
Expand Down
21 changes: 19 additions & 2 deletions src/test/java/org/tkit/onecx/permission/rs/external/v1/PermissionRestControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ class PermissionRestControllerTest extends AbstractTest {
@Test
void getApplicationPermissionsTest() {

var accessToken = createToken(List.of("n3"));
// bearer prefix
var accessToken = createTokenBearer(List.of("n3"));

var dto = given()
.contentType(APPLICATION_JSON)
Expand All @@ -44,6 +45,22 @@ void getApplicationPermissionsTest() {
assertThat(dto.getPermissions()).isNotNull().hasSize(1);
assertThat(dto.getPermissions().get("o1")).isNotNull().hasSize(1).containsExactly("a3");

// without bearer prefix
accessToken = createToken(null, List.of("n3"));

dto = given()
.contentType(APPLICATION_JSON)
.body(new PermissionRequestDTOV1().token(accessToken))
.post("app1")
.then()
.statusCode(OK.getStatusCode())
.extract()
.body().as(ApplicationPermissionsDTOV1.class);

assertThat(dto).isNotNull();
assertThat(dto.getPermissions()).isNotNull().hasSize(1);
assertThat(dto.getPermissions().get("o1")).isNotNull().hasSize(1).containsExactly("a3");

}

private static Stream<Arguments> badRequestData() {
Expand Down Expand Up @@ -83,7 +100,7 @@ void getApplicationPermissionsWrongTongTest() {
@Test
void getApplicationsPermissionsTest() {

var accessToken = createToken(List.of("n3"));
var accessToken = createTokenBearer(List.of("n3"));

var dto = given()
.contentType(APPLICATION_JSON)
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/tkit/onecx/permission/test/AbstractTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ protected static String createToken(String organizationId) {
return createToken(organizationId, null);
}

protected static String createToken(List<String> roles) {
return createToken(null, roles);
protected static String createTokenBearer(List<String> roles) {
return "Bearer " + createToken(null, roles);
}

protected static String createToken(String organizationId, List<String> roles) {
Expand Down
Loading