Skip to content

Fix amrs comparison #81

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

Merged
merged 1 commit into from
Jul 3, 2025
Merged

Fix amrs comparison #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions src/main/java/com/onegini/examples/resourcegateway/service/TokenTypeValidationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,10 @@

import static com.onegini.examples.resourcegateway.model.TokenType.IMPLICIT_AUTHENTICATION;

import java.util.Collection;

import com.onegini.examples.resourcegateway.model.exception.InvalidAccessTokenException;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import com.onegini.examples.resourcegateway.model.exception.InvalidAccessTokenException;
import java.util.Collection;

@Service
public class TokenTypeValidationService {
Expand All @@ -25,7 +23,7 @@ public void validateNoImplicitAuthenticationToken(final Collection<String> amrs)
}

private boolean isImplicitAuthenticationToken(final Collection<String> amrs) {
return CollectionUtils.containsInstance(amrs, IMPLICIT_AUTHENTICATION.name());
return amrs != null && amrs.contains(IMPLICIT_AUTHENTICATION.name());
}

private boolean isNoImplicitAuthenticationToken(final Collection<String> tokenTypes) {
Expand Down
6 changes: 3 additions & 3 deletions ...est/java/com/onegini/examples/resourcegateway/service/TokenTypeValidationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

class TokenTypeValidationServiceTest {

private static final String TYPE_IMPLICIT_AUTHENTICATION = "IMPLICIT_AUTHENTICATION";
private static final String NOT_IMPLICIT_TYPE = "DEFAULT_TOKEN";

private final TokenTypeValidationService service = new TokenTypeValidationService();

Expand All @@ -30,7 +30,7 @@ void should_validate_null_or_empty_as_no_implicit_authentication_token(final Set
service.validateNoImplicitAuthenticationToken(tokenTypes);
}

@ValueSource(strings = TYPE_IMPLICIT_AUTHENTICATION)
@ValueSource(strings = NOT_IMPLICIT_TYPE)
@ParameterizedTest
void should_validate_as_no_implicit_authentication_token(final String tokenTypes) {
service.validateNoImplicitAuthenticationToken(Set.of(tokenTypes));
Expand All @@ -43,7 +43,7 @@ void should_throw_exception_when_validating_null_or_empty_as_implicit_authentica
.isInstanceOf(InvalidAccessTokenException.class);
}

@ValueSource(strings = TYPE_IMPLICIT_AUTHENTICATION)
@ValueSource(strings = NOT_IMPLICIT_TYPE)
@ParameterizedTest
void should_throw_exception_when_validating_other_input_as_implicit_authentication_token(final String tokenType) {
final Set<String> tokenTypes = Set.of(tokenType);
Expand Down