diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckGrpcService.java b/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckGrpcService.java
index 2b19192b0b09107cfacfb3970165b06f57f4931b..7027ae1cbbbbd4e3ec5f0ca52e4da574f305e90a 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckGrpcService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckGrpcService.java
@@ -37,11 +37,11 @@ public class TokenCheckGrpcService extends TokenCheckServiceGrpc.TokenCheckServi
@Override
public void checkToken(GrpcCheckTokenRequest request, StreamObserver<GrpcCheckTokenResponse> responseStreamObserver) {
var result = samlTokenService.validate(request.getToken());
- responseStreamObserver.onNext(buildResponse(result));
+ responseStreamObserver.onNext(buildCheckResponse(result));
responseStreamObserver.onCompleted();
}
- GrpcCheckTokenResponse buildResponse(TokenValidationResult result) {
+ GrpcCheckTokenResponse buildCheckResponse(TokenValidationResult result) {
return result.isValid() ? buildValidCheckTokenResponse(result) : buildInvalidCheckTokenResponse(result);
}
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckService.java b/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckService.java
index 82b191b70d9037ec77df9e38673557ea378c91d1..e0920b69121760f4e4a611685c3399c800f3f00e 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/TokenCheckService.java
@@ -69,7 +69,7 @@ public class TokenCheckService {
.build();
}
- String getPostfachId(final SamlSetting samlSetting, final Response response, final List<TokenAttribute> decryptedAttributes) {
+ String getPostfachId(final SamlSetting samlSetting, final Response response, final List<TokenField> decryptedAttributes) {
if (samlSetting.isIdIsPostfachId()) {
return response.getID();
} else {
@@ -77,10 +77,10 @@ public class TokenCheckService {
}
}
- String findAttributeByKey(String key, List<TokenAttribute> attributes, SamlSetting samlSetting) {
+ String findAttributeByKey(String key, List<TokenField> attributes, SamlSetting samlSetting) {
var name = samlSetting.getMappings().get(key);
return attributes.stream().filter(attribute -> attribute.getName().equals(name))
- .findFirst().map(TokenAttribute::getValue).orElse(StringUtils.EMPTY);
+ .findFirst().map(TokenField::getValue).orElse(StringUtils.EMPTY);
}
}
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/TokenAttribute.java b/token-checker-server/src/main/java/de/ozgcloud/token/TokenField.java
similarity index 91%
rename from token-checker-server/src/main/java/de/ozgcloud/token/TokenAttribute.java
rename to token-checker-server/src/main/java/de/ozgcloud/token/TokenField.java
index 322c41ae2cf5cfa736b1cc9e4e31d1510c05522f..34e8156652a6b2d00e40bc7ef0000b420a3506c6 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/TokenAttribute.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/TokenField.java
@@ -21,13 +21,13 @@
package de.ozgcloud.token;
import lombok.Builder;
-import lombok.EqualsAndHashCode;
import lombok.Getter;
@Builder
@Getter
-@EqualsAndHashCode
-public class TokenAttribute {
+public class TokenField {
+
private String name;
private String value;
+
}
diff --git a/token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2DecryptionService.java b/token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2DecryptionService.java
index e12eaddb0fe96d391218220637973969f5f5fc9d..18a81ddf7c022942563ae20526768bd787aa6f6c 100644
--- a/token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2DecryptionService.java
+++ b/token-checker-server/src/main/java/de/ozgcloud/token/saml/Saml2DecryptionService.java
@@ -38,7 +38,7 @@ import org.opensaml.xmlsec.encryption.support.DecryptionException;
import org.springframework.security.saml2.Saml2Exception;
import org.springframework.stereotype.Service;
-import de.ozgcloud.token.TokenAttribute;
+import de.ozgcloud.token.TokenField;
import lombok.NoArgsConstructor;
import lombok.extern.log4j.Log4j2;
@@ -47,7 +47,7 @@ import lombok.extern.log4j.Log4j2;
@NoArgsConstructor
public class Saml2DecryptionService {
- public List<TokenAttribute> decryptAttributes(Response response, SamlSetting samlSetting) {
+ public List<TokenField> decryptAttributes(Response response, SamlSetting samlSetting) {
decryptResponseElements(response, samlSetting.getDecrypter());
return getAttributes(response);
@@ -67,7 +67,7 @@ public class Saml2DecryptionService {
}
}
- List<TokenAttribute> getAttributes(Response response) {
+ List<TokenField> getAttributes(Response response) {
return getAttributeStatement(response).getAttributes().stream().map(this::extractNameAndValue)
.toList();
}
@@ -76,8 +76,8 @@ public class Saml2DecryptionService {
return (AttributeStatement) response.getAssertions().getFirst().getStatements().get(1);
}
- private TokenAttribute extractNameAndValue(Attribute attribute) {
- return TokenAttribute.builder().name(attribute.getName()).value(getAttributeValues(attribute)).build();
+ private TokenField extractNameAndValue(Attribute attribute) {
+ return TokenField.builder().name(attribute.getName()).value(getAttributeValues(attribute)).build();
}
String getAttributeValues(Attribute attribute) {
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/CheckTokenResultTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/CheckTokenResultTestFactory.java
index 642d0bf71cb53a744fcd0255d76a740c11da862e..338631ac640a535900ed02e45939c95efd622e55 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/CheckTokenResultTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/CheckTokenResultTestFactory.java
@@ -23,6 +23,8 @@ package de.ozgcloud.token;
import java.util.List;
import java.util.UUID;
+import de.ozgcloud.token.TokenValidationResult.TokenValidationResultBuilder;
+import de.ozgcloud.token.common.errorhandling.TokenVerificationExceptionTestFactory;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
@@ -31,16 +33,24 @@ public class CheckTokenResultTestFactory {
public static final String POSTFACH_ID = UUID.randomUUID().toString();
public static final String TRUST_LEVEL = "LOW";
- public static final TokenAttribute OTHER_FIELD = TokenAttributeTestFactory.create();
+ public static final TokenField OTHER_FIELD = TokenAttributeTestFactory.create();
+ public static final String ERROR_MESSAGE = TokenVerificationExceptionTestFactory.MESSAGE;
- static TokenValidationResult create() {
- return createBuilder().build();
+ static TokenValidationResult createValid() {
+ return createBuilder().valid(true).build();
}
- static TokenValidationResult.CheckTokenResultBuilder createBuilder() {
- return new TokenValidationResult.CheckTokenResultBuilder()
+ public static TokenValidationResultBuilder createBuilder() {
+ return TokenValidationResult.builder()
.postfachId(POSTFACH_ID)
.trustLevel(TRUST_LEVEL)
.attributes(List.of(OTHER_FIELD));
}
+
+ public static TokenValidationResult createInvalid() {
+ return createBuilder()
+ .valid(false)
+ .errorMesssage(ERROR_MESSAGE)
+ .build();
+ }
}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckErrorTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckErrorTestFactory.java
index 8d8af197b195b68ebaeba0853bba2d1d6d78bc52..c6835eb30bb9cb907b17d66087a6b8548e873003 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckErrorTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckErrorTestFactory.java
@@ -6,16 +6,13 @@ import de.ozgcloud.token.common.errorhandling.TokenVerificationExceptionTestFact
public class GrpcCheckErrorTestFactory {
public static final String ERROR_MESSAGE = TokenVerificationExceptionTestFactory.MESSAGE;
- public static final GrpcSamlError SAML_ERROR = GrpcSamlErrorTestFactory.create();
public static GrpcCheckError create() {
return createBuilder().build();
}
public static Builder createBuilder() {
- return GrpcCheckError.newBuilder()
- .setMessage(ERROR_MESSAGE)
- .addSamlError(SAML_ERROR);
+ return GrpcCheckError.newBuilder().setMessage(ERROR_MESSAGE);
}
}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckTokenResponseTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckTokenResponseTestFactory.java
index 29018f7df075d32253623835dfa4f01574cd7363..aadcc22f9b0d4afa249343b518e883d171e10764 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckTokenResponseTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcCheckTokenResponseTestFactory.java
@@ -26,7 +26,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
class GrpcCheckTokenResponseTestFactory {
- public static final GrpcCheckTokenResponse CHECK_TOKEN_RESULT = GrpcTokenCheckResultTestFactory.create();
+ public static final GrpcTokenAttributes CHECK_TOKEN_RESULT = GrpcTokenCheckResultTestFactory.create();
public static GrpcCheckTokenResponse createValid() {
return createValidBuilder().build();
@@ -35,7 +35,7 @@ class GrpcCheckTokenResponseTestFactory {
public static GrpcCheckTokenResponse.Builder createValidBuilder() {
return GrpcCheckTokenResponse.newBuilder()
.setTokenValid(true)
- .setTokenCheckResult(CHECK_TOKEN_RESULT);
+ .setTokenAttributes(CHECK_TOKEN_RESULT);
}
public static GrpcCheckTokenResponse createInvalid() {
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenAttributeTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcOtherFieldsTestFactory.java
similarity index 52%
rename from token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenAttributeTestFactory.java
rename to token-checker-server/src/test/java/de/ozgcloud/token/GrpcOtherFieldsTestFactory.java
index 14125e2528eae983725cfce7753a965369fdc97f..f3f7e22d78503426f1adb8cd1280145f138dbc87 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenAttributeTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcOtherFieldsTestFactory.java
@@ -1,18 +1,16 @@
package de.ozgcloud.token;
-import de.ozgcloud.token.GrpcTokenAttribute.Builder;
-
-public class GrpcTokenAttributeTestFactory {
+public class GrpcOtherFieldsTestFactory {
private static final String VALUE = TokenAttributeTestFactory.VALUE;
private static final String NAME = TokenAttributeTestFactory.NAME;
- public static GrpcTokenAttribute create() {
+ public static GrpcOtherFields create() {
return createBuilder().build();
}
- private static Builder createBuilder() {
- return GrpcTokenAttribute.newBuilder()
+ private static GrpcOtherFields.Builder createBuilder() {
+ return GrpcOtherFields.newBuilder()
.setName(NAME)
.setValue(VALUE);
}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcSamlErrorTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcSamlErrorTestFactory.java
deleted file mode 100644
index d9c64e53c6eab5dba3596b3cc78831d46e092c59..0000000000000000000000000000000000000000
--- a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcSamlErrorTestFactory.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.ozgcloud.token;
-
-import de.ozgcloud.token.GrpcSamlError.Builder;
-import de.ozgcloud.token.common.errorhandling.TokenVerificationExceptionTestFactory;
-
-public class GrpcSamlErrorTestFactory {
-
- public static final String ERROR_CODE = TokenVerificationExceptionTestFactory.ERROR_CODE;
- public static final String DESCRIPTION = TokenVerificationExceptionTestFactory.ERROR_DESCRIPTION;
-
- public static GrpcSamlError create() {
- return createBuilder().build();
- }
-
- public static Builder createBuilder() {
- return GrpcSamlError.newBuilder()
- .setDescription(DESCRIPTION)
- .setErrorCode(ERROR_CODE);
- }
-}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckResultTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckResultTestFactory.java
index 80b62354fa818b7333449b166c16016948ae31f6..78ab7a4c15eff8d5995dc1962d0937b88878da55 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckResultTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/GrpcTokenCheckResultTestFactory.java
@@ -28,14 +28,14 @@ class GrpcTokenCheckResultTestFactory {
public static final String POSTFACH_ID = CheckTokenResultTestFactory.POSTFACH_ID;
public static final String TRUST_LEVEL = CheckTokenResultTestFactory.TRUST_LEVEL;
- public static final GrpcTokenAttribute TOKEN_ATTRIBUTE = GrpcTokenAttributeTestFactory.create();
+ public static final GrpcOtherFields TOKEN_ATTRIBUTE = GrpcOtherFieldsTestFactory.create();
- public static GrpcCheckTokenResult create() {
+ public static GrpcTokenAttributes create() {
return createBuilder().build();
}
- public static GrpcCheckTokenResult.Builder createBuilder() {
- return GrpcCheckTokenResult.newBuilder()
+ public static GrpcTokenAttributes.Builder createBuilder() {
+ return GrpcTokenAttributes.newBuilder()
.setPostfachId(POSTFACH_ID)
.setTrustLevel(TRUST_LEVEL)
.addOtherFields(TOKEN_ATTRIBUTE);
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/TokenAttributeTestFactory.java b/token-checker-server/src/test/java/de/ozgcloud/token/TokenAttributeTestFactory.java
index 7eda681e56dd3386591afe31f57dbcaca396190e..7a0c83db09fcb6ff2c7ef5e3c4e7ab249659b0af 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/TokenAttributeTestFactory.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/TokenAttributeTestFactory.java
@@ -2,19 +2,17 @@ package de.ozgcloud.token;
import com.thedeanda.lorem.LoremIpsum;
-import de.ozgcloud.token.TokenAttribute.TokenAttributeBuilder;
-
public class TokenAttributeTestFactory {
public static final String NAME = LoremIpsum.getInstance().getWords(1);
public static final String VALUE = LoremIpsum.getInstance().getWords(1);
- public static TokenAttribute create() {
+ public static TokenField create() {
return createBuilder().build();
}
- public static TokenAttributeBuilder createBuilder() {
- return TokenAttribute.builder()
+ public static TokenField.TokenFieldBuilder createBuilder() {
+ return TokenField.builder()
.name(NAME)
.value(VALUE);
}
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckGrpcServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckGrpcServiceTest.java
index 26538c8c2811500519ca97485696e5d1357f33d3..1284b08265bda88a1e4b0c82e65dc6cb9332aa0f 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckGrpcServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckGrpcServiceTest.java
@@ -31,12 +31,11 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.ozgcloud.token.common.errorhandling.TokenVerificationException;
-import de.ozgcloud.token.common.errorhandling.TokenVerificationExceptionTestFactory;
import de.ozgcloud.token.saml.SamlTokenService;
import io.grpc.stub.StreamObserver;
class TokenCheckGrpcServiceTest {
+
@Spy
@InjectMocks
private TokenCheckGrpcService service;
@@ -49,95 +48,114 @@ class TokenCheckGrpcServiceTest {
@Mock
private StreamObserver<GrpcCheckTokenResponse> tokenStreamObserver;
+ @Mock
+ private GrpcCheckTokenResponse grpcCheckTokenResponse;
@Nested
class TestCheckToken {
- private final TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.create();
+ @Mock
+ private TokenValidationResult tokenCheckResult;
+
+ @BeforeEach
+ void init() {
+ when(samlTokenService.validate(any())).thenReturn(tokenCheckResult);
+ doReturn(grpcCheckTokenResponse).when(service).buildValidCheckTokenResponse(any());
+ }
+
+ @Test
+ void shouldCallSamlTokenService() {
+ checkToken();
+
+ verify(samlTokenService).validate(GrpcCheckTokenRequestTestFactory.TOKEN);
+ }
+
+ @Test
+ void shouldCallBuildCheckTokenResponse() {
+ checkToken();
+
+ verify(service).buildValidCheckTokenResponse(tokenCheckResult);
+ }
@Test
- void shouldCallTokenCheckerService() {
- doReturn(GrpcCheckTokenResponseTestFactory.createValid()).when(service).buildValidCheckTokenResponse(any());
+ void shouldCallOnNext() {
+ checkToken();
+
+ verify(tokenStreamObserver).onNext(grpcCheckTokenResponse);
+ }
+ @Test
+ void shouldCallOnCompleted() {
checkToken();
- verify(samlTokenService).checkToken(GrpcCheckTokenRequestTestFactory.TOKEN);
+ verify(tokenStreamObserver).onCompleted();
+ }
+
+ private void checkToken() {
+ service.checkToken(GrpcCheckTokenRequestTestFactory.create(), tokenStreamObserver);
}
+ }
+
+ @Nested
+ class TestBuildCheckResponse {
@Nested
- class OnValidToken {
- private final GrpcCheckTokenResponse validResponse = GrpcCheckTokenResponseTestFactory.createValid();
+ class TestValidToken {
+
+ private final TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.createValid();
@BeforeEach
- void givenValidToken() {
- when(samlTokenService.checkToken(any())).thenReturn(tokenCheckResult);
- doReturn(validResponse).when(service).buildValidCheckTokenResponse(any());
+ void mock() {
+ doReturn(grpcCheckTokenResponse).when(service).buildValidCheckTokenResponse(any());
}
@Test
void shouldCallBuildValidCheckTokenResponse() {
- checkToken();
+ service.buildCheckResponse(tokenCheckResult);
verify(service).buildValidCheckTokenResponse(tokenCheckResult);
+ verify(service, never()).buildInvalidCheckTokenResponse(any());
}
@Test
- void shouldCallOnNext() {
- checkToken();
-
- verify(tokenStreamObserver).onNext(validResponse);
- }
-
- @Test
- void shouldCallOnCompleted() {
- checkToken();
+ void shouldReturnResponse() {
+ var result = service.buildCheckResponse(tokenCheckResult);
- verify(tokenStreamObserver).onCompleted();
+ assertThat(result).isEqualTo(grpcCheckTokenResponse);
}
}
@Nested
- class TestOnInvalid {
- private final GrpcCheckTokenResponse invalidResponse = GrpcCheckTokenResponseTestFactory.createInvalid();
- private final TokenVerificationException exception = TokenVerificationExceptionTestFactory.create();
+ class TestInvalidToken {
+
+ private final TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.createInvalid();
@BeforeEach
- void givenValidToken() {
- doThrow(exception).when(samlTokenService).checkToken(any());
- doReturn(invalidResponse).when(service).buildInvalidCheckTokenResponse(exception);
+ void mock() {
+ doReturn(grpcCheckTokenResponse).when(service).buildInvalidCheckTokenResponse(any());
}
@Test
void shouldCallBuildInvalidCheckTokenResponse() {
- checkToken();
-
- verify(service).buildInvalidCheckTokenResponse(exception);
- }
-
- @Test
- void shouldCallOnNext() {
- checkToken();
+ service.buildCheckResponse(tokenCheckResult);
- verify(tokenStreamObserver).onNext(invalidResponse);
+ verify(service).buildInvalidCheckTokenResponse(tokenCheckResult);
+ verify(service, never()).buildValidCheckTokenResponse(any());
}
@Test
- void shouldCallOnCompleted() {
- checkToken();
+ void shouldReturnResponse() {
+ var result = service.buildCheckResponse(tokenCheckResult);
- verify(tokenStreamObserver).onCompleted();
+ assertThat(result).isEqualTo(grpcCheckTokenResponse);
}
}
-
- private void checkToken() {
- service.checkToken(GrpcCheckTokenRequestTestFactory.create(), tokenStreamObserver);
- }
}
@Nested
class TestBuildValidCheckTokenResponse {
- private TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.create();
+ private final TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.createValid();
@BeforeEach
void mock() {
@@ -166,18 +184,18 @@ class TokenCheckGrpcServiceTest {
@Nested
class TestBuildInvalidCheckTokenResponse {
- private final TokenVerificationException exception = TokenVerificationExceptionTestFactory.create();
+ private final TokenValidationResult tokenCheckResult = CheckTokenResultTestFactory.createInvalid();
@BeforeEach
void mock() {
- when(checkErrorMapper.toCheckError(any())).thenReturn(GrpcCheckErrorTestFactory.create());
+ when(tokenCheckMapper.toCheckError(any())).thenReturn(GrpcCheckErrorTestFactory.create());
}
@Test
void shouldCallMapper() {
buildCheckTokenResponse();
- verify(checkErrorMapper).toCheckError(exception);
+ verify(tokenCheckMapper).toCheckError(tokenCheckResult);
}
@Test
@@ -188,7 +206,7 @@ class TokenCheckGrpcServiceTest {
}
private GrpcCheckTokenResponse buildCheckTokenResponse() {
- return service.buildInvalidCheckTokenResponse(exception);
+ return service.buildInvalidCheckTokenResponse(tokenCheckResult);
}
}
}
\ No newline at end of file
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceITCase.java b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceITCase.java
index ae4912de8c1117067b58284a87435ab68c829f33..2498987faa45e1435313b04bcc111255b30cfe6e 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceITCase.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceITCase.java
@@ -97,7 +97,7 @@ class TokenCheckServiceITCase {
@Test
void shouldGetPostfachHandleFromBayernIdToken() {
- var attributes = List.of(new TokenAttribute(POSTFACH_ID_NAME_BAYERN_ID, POSTFACH_ID_BAYERN_ID));
+ var attributes = List.of(new TokenField(POSTFACH_ID_NAME_BAYERN_ID, POSTFACH_ID_BAYERN_ID));
when(decryptionService.decryptAttributes(any(), any(SamlSetting.class))).thenReturn(
attributes);
@@ -108,7 +108,7 @@ class TokenCheckServiceITCase {
@Test
void shouldGetTrustLevel() {
- var attributes = List.of(new TokenAttribute(TRUST_LEVEL_NAME_BAYERN_ID, TRUST_LEVEL));
+ var attributes = List.of(new TokenField(TRUST_LEVEL_NAME_BAYERN_ID, TRUST_LEVEL));
when(decryptionService.decryptAttributes(any(), any(SamlSetting.class))).thenReturn(
attributes);
diff --git a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceTest.java b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceTest.java
index 934e77cc674f0b8517b8ad8e7d434e9bca989024..66809ad4feb83960b87ff5ba46f3f5f053dd2180 100644
--- a/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceTest.java
+++ b/token-checker-server/src/test/java/de/ozgcloud/token/TokenCheckServiceTest.java
@@ -189,8 +189,8 @@ class TokenCheckServiceTest {
@Mock
private Response response;
- private final TokenAttribute tokenAttribute = TokenAttributeTestFactory.create();
- private final List<TokenAttribute> decryptedAttributes = List.of(tokenAttribute);
+ private final TokenField tokenField = TokenAttributeTestFactory.create();
+ private final List<TokenField> decryptedAttributes = List.of(tokenField);
@BeforeEach
void mock() {
@@ -240,8 +240,8 @@ class TokenCheckServiceTest {
@Mock
private Response response;
- private final TokenAttribute tokenAttribute = TokenAttributeTestFactory.create();
- private final List<TokenAttribute> decryptedAttributes = List.of(tokenAttribute);
+ private final TokenField tokenField = TokenAttributeTestFactory.create();
+ private final List<TokenField> decryptedAttributes = List.of(tokenField);
@Test
void shouldCheckIsIdIsPostfachId() {
@@ -309,12 +309,12 @@ class TokenCheckServiceTest {
private final String attributeValue = LoremIpsum.getInstance().getWords(1);
private final Map<String, String> mappings = Map.of(existingKey, attributeName, nonExistingKey, nonExistingName);
- private final TokenAttribute tokenAttribute1 = TokenAttributeTestFactory.create();
- private final TokenAttribute tokenAttribute2 = TokenAttributeTestFactory.createBuilder()
+ private final TokenField tokenField1 = TokenAttributeTestFactory.create();
+ private final TokenField tokenField2 = TokenAttributeTestFactory.createBuilder()
.name(attributeName)
.value(attributeValue)
.build();
- private final List<TokenAttribute> attributes = List.of(tokenAttribute1, tokenAttribute2);
+ private final List<TokenField> attributes = List.of(tokenField1, tokenField2);
@BeforeEach
void setUp() {