Merge pull request #1287 from ORCID/emptyOrcidLogging

added logging of empty orcid ids

Author: aromanovv

assertion-service/src/main/java/org/orcid/memberportal/service/assertion/services/AssertionService.java

@@ -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());
                     }
                 }
@@ -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);
         });

assertion-service/src/main/java/org/orcid/memberportal/service/assertion/services/OrcidRecordService.java

@@ -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());

assertion-service/src/main/java/org/orcid/memberportal/service/assertion/web/rest/AssertionResource.java

@@ -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());