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
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,9 @@ public Assertion createAssertion(Assertion assertion, AssertionServiceUser owner
if (tokenDeniedStatus == null) {
String activeToken = record.getToken(assertion.getSalesforceId(), false);
if (activeToken != null && !activeToken.isBlank()) {
if (StringUtils.isBlank(record.getOrcid())) {
LOG.warn("Setting empty orcid id '{}' in affiliation {} for email {} when creating assertion", record.getOrcid(), assertion.getId(), email);
}
assertion.setOrcidId(record.getOrcid());
}
}
Expand Down Expand Up @@ -719,9 +722,15 @@ public void markPendingAssertionsAsNotificationRequested(String salesforceId) {

public void updateOrcidIdsForEmailAndSalesforceId(String email, String salesforceId) {
Optional<OrcidRecord> record = orcidRecordService.findOneByEmail(email);
if (record.isEmpty()) {
throw new IllegalArgumentException("Can't find orcid record for email " + email);
}
final String orcid = record.get().getOrcid();
List<Assertion> assertions = assertionRepository.findAllByEmail(email);
assertions.stream().filter(a -> a.getOrcidId() == null && salesforceId.equals(a.getSalesforceId())).forEach(a -> {
if (StringUtils.isBlank(orcid)) {
LOG.warn("Setting empty orcid id '{}' in affiliation {} for email {} after granting permission", orcid, a.getId(), email);
}
a.setOrcidId(orcid);
assertionRepository.save(a);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void deleteOrcidRecord(OrcidRecord orcidRecord) {

public void storeIdToken(String emailInStatus, String idToken, String orcidIdInJWT, String salesforceId) {
OrcidRecord orcidRecord = orcidRecordRepository.findOneByEmail(emailInStatus)
.orElseThrow(() -> new IllegalArgumentException("Unable to find userInfo for email: " + emailInStatus));
.orElseThrow(() -> new IllegalArgumentException("Unable to find orcidRecord for email: " + emailInStatus));

OrcidToken newToken = new OrcidToken(salesforceId, idToken);
List<OrcidToken> tokens = orcidRecord.getTokens().stream().filter(t -> !salesforceId.equals(t.getSalesforceId())).collect(Collectors.toList());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ public ResponseEntity<String> storeIdToken(@RequestBody ObjectNode json) throws
}
}
} else {
LOG.warn("User {} have denied access", emailInStatus);
LOG.info("User {} denied access", emailInStatus);
orcidRecordService.storeUserDeniedAccess(emailInStatus, salesforceId);
}
return ResponseEntity.ok().body(responseData.toString());
Expand Down
Loading