Skip to content

Commit 29a4d12

Browse files
committed
Added brinCode in the result of the pseudo batch
1 parent d42a1c6 commit 29a4d12

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

myconext-server/src/main/java/myconext/remotecreation/EduIDAssignedValue.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,7 @@ public class EduIDAssignedValue {
1717

1818
@Schema(description = "New assigned eduID pseudonym scoped on external remote API user")
1919
private String value;
20+
21+
@Schema(description = "The brinCode of the institution for the new assigned eduID pseudonym ")
22+
private String brinCode;
2023
}

myconext-server/src/main/java/myconext/remotecreation/RemoteCreationController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,9 @@ public ResponseEntity<List<EduIDAssignedValue>> eduIDForInstitutionBatch(
218218
List<EduIDAssignedValue> eduIDAssignedValues = eduIDInstitutionPseudonyms.stream()
219219
.map(eduIDInstitutionPseudonym -> {
220220
String eduID = eduIDInstitutionPseudonym.getEduID();
221+
String brinCode = eduIDInstitutionPseudonym.getBrinCode();
221222
String pseudonym = this.findUserByEduIDValue(eduID).map(user -> {
222-
IdentityProvider identityProvider = identityProviderMap.get(eduIDInstitutionPseudonym.getBrinCode());
223+
IdentityProvider identityProvider = identityProviderMap.get(brinCode);
223224
//It might be that no identityProvider was found for this BRIN code
224225
if (identityProvider == null) {
225226
return null;
@@ -228,7 +229,7 @@ public ResponseEntity<List<EduIDAssignedValue>> eduIDForInstitutionBatch(
228229
userRepository.save(user);
229230
return eduIDValue;
230231
}).orElse(null);
231-
return StringUtils.hasText(pseudonym) ? new EduIDAssignedValue(eduID, pseudonym) : null;
232+
return StringUtils.hasText(pseudonym) ? new EduIDAssignedValue(eduID, pseudonym, brinCode) : null;
232233
})
233234
.filter(Objects::nonNull)
234235
.toList();

myconext-server/src/test/java/myconext/remotecreation/RemoteCreationControllerTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,16 @@ void eduIDForInstitutionBatchHappyFlow() {
123123
.as(new TypeRef<>() {
124124
});
125125
assertEquals(1, eduIDAssignedValues.size());
126-
String value = eduIDAssignedValues.getFirst().getValue();
126+
EduIDAssignedValue eduIDAssignedValue= eduIDAssignedValues.getFirst();
127+
String value = eduIDAssignedValue.getValue();
127128
User user = this.findUserByEduIDValue(value).get();
128129
//See src/main/resources/manage/saml20_idp.json read by MockManage
129130
String institutionGUID = "8017e83f-bca7-e911-90f2-0050569571ea";
130131
EduID newEduID = user.getEduIDS().stream()
131132
.filter(anEduID -> anEduID.getServices().stream().anyMatch(service -> institutionGUID.equals(service.getInstitutionGuid())))
132133
.findFirst().get();
133134
assertEquals(value, newEduID.getValue());
135+
assertEquals("ST42", eduIDAssignedValue.getBrinCode());
134136
}
135137

136138
@Test

0 commit comments

Comments
 (0)