configurable deletion of orcid sync settings when unlinking profile

uniba-ub · May 31, 2024 · 4bb32a8 · 4bb32a8
1 parent 11b68a0
commit 4bb32a8
Show file tree

Hide file tree

Showing 3 changed files with 93 additions and 8 deletions.
diff --git a/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java b/dspace-api/src/main/java/org/dspace/orcid/service/impl/OrcidSynchronizationServiceImpl.java
@@ -118,12 +118,8 @@ public void unlinkProfile(Context context, Item profile) throws SQLException {
         itemService.clearMetadata(context, profile, "dspace", "orcid", "scope", Item.ANY);
         itemService.clearMetadata(context, profile, "dspace", "orcid", "authenticated", Item.ANY);
 
-        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-mode", Item.ANY);
-        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-profile", Item.ANY);
-
-        for (OrcidEntityType entityType : OrcidEntityType.values()) {
-            itemService.clearMetadata(context, profile, "dspace", "orcid",
-                "sync-" + entityType.name().toLowerCase() + "s", Item.ANY);
+        if (!configurationService.getBooleanProperty("orcid.disconnection.remain-sync", false)) {
+            clearSynchronizationSettings(context, profile);
         }
 
         orcidTokenService.deleteByProfileItem(context, profile);
@@ -275,6 +271,17 @@ private boolean updatePreferenceForSynchronizingWithOrcid(Context context, Item
 
     }
 
+    private void clearSynchronizationSettings(Context context, Item profile)
+        throws SQLException {
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-mode", Item.ANY);
+        itemService.clearMetadata(context, profile, "dspace", "orcid", "sync-profile", Item.ANY);
+
+        for (OrcidEntityType entityType : OrcidEntityType.values()) {
+            itemService.clearMetadata(context, profile, "dspace", "orcid",
+                "sync-" + entityType.name().toLowerCase() + "s", Item.ANY);
+        }
+    }
+
     private boolean containsSameValues(List<String> firstList, List<String> secondList) {
         return new HashSet<>(firstList).equals(new HashSet<>(secondList));
     }

diff --git a/...ce-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java b/...ce-server-webapp/src/test/java/org/dspace/app/rest/ResearcherProfileRestRepositoryIT.java
@@ -2233,9 +2233,10 @@ public void testAnotherUserPatchToDisconnectProfileFromOrcidWithAdminAndOwnerCon
     }
 
     @Test
-    public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettings() throws Exception {
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettingsRemoved() throws Exception {
 
         configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+        configurationService.setProperty("orcid.disconnection.remain-sync", "false");
 
         context.turnOffAuthorisationSystem();
 
@@ -2306,6 +2307,80 @@ public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettings() throws
         assertThat(getOrcidAccessToken(profile), nullValue());
     }
 
+    @Test
+    public void testOwnerPatchToDisconnectProfileFromOrcidWithSyncSettingsRemain() throws Exception {
+
+        configurationService.setProperty("orcid.disconnection.allowed-users", "only_owner");
+
+        context.turnOffAuthorisationSystem();
+
+        EPerson ePerson = EPersonBuilder.createEPerson(context)
+            .withCanLogin(true)
+            .withOrcid("0000-1111-2222-3333")
+            .withOrcidScope("/read")
+            .withOrcidScope("/write")
+            .withEmail("[email protected]")
+            .withPassword(password)
+            .withNameInMetadata("Test", "User")
+            .build();
+
+        OrcidTokenBuilder.create(context, ePerson, "3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4").build();
+
+        Item profile = createProfile(ePerson);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), not(empty()));
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), not(empty()));
+        assertThat(getOrcidAccessToken(profile), is("3de2e370-8aa9-4bbe-8d7e-f5b1577bdad4"));
+
+        context.restoreAuthSystemState();
+
+        String authToken = getAuthToken(ePerson.getEmail(), password);
+        String ePersonId = ePerson.getID().toString();
+        List<Operation> operations = asList(new ReplaceOperation("/orcid/mode", "BATCH"),
+            new ReplaceOperation("/orcid/publications", "DISABLED"),
+            new ReplaceOperation("/orcid/fundings", "ALL"),
+            new ReplaceOperation("/orcid/profile", "BIOGRAPHICAL,IDENTIFIERS"));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(operations))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.orcidSynchronization.mode", is("BATCH")))
+            .andExpect(jsonPath("$.orcidSynchronization.profilePreferences",
+                containsInAnyOrder("IDENTIFIERS", "BIOGRAPHICAL")))
+            .andExpect(jsonPath("$.orcidSynchronization.fundingsPreference", is(ALL.name())))
+            .andExpect(jsonPath("$.orcidSynchronization.publicationsPreference", is(DISABLED.name())));
+
+        profile = context.reloadEntity(profile);
+        List<MetadataValue> metadata = profile.getMetadata();
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-mode","BATCH")));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-publications",DISABLED.name())));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-fundings",ALL.name())));
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), hasSize(2));
+
+        getClient(authToken).perform(patch("/api/eperson/profiles/{id}", ePersonId)
+                .content(getPatchContent(asList(new RemoveOperation("/orcid"))))
+                .contentType(MediaType.APPLICATION_JSON_VALUE))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("$.id", is(ePersonId)))
+            .andExpect(jsonPath("$.visible", is(false)))
+            .andExpect(jsonPath("$.type", is("profile")))
+            .andExpect(jsonPath("$.orcid").doesNotExist())
+            .andExpect(jsonPath("$.orcidSynchronization").doesNotExist());
+
+        profile = context.reloadEntity(profile);
+
+        assertThat(getMetadataValues(profile, "person.identifier.orcid"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.scope"), empty());
+        assertThat(getMetadataValues(profile, "dspace.orcid.authenticated"), empty());
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-mode","BATCH")));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-publications",DISABLED.name())));
+        assertThat(metadata, hasItem(with("dspace.orcid.sync-fundings",ALL.name())));
+        assertThat(getMetadataValues(profile, "dspace.orcid.sync-profile"), hasSize(2));
+        assertThat(getOrcidAccessToken(profile), nullValue());
+    }
+
 
     @Test
     public void testCloneFromExternalProfileAlreadyAssociated() throws Exception {

diff --git a/dspace/config/modules/orcid.cfg b/dspace/config/modules/orcid.cfg
@@ -7,6 +7,9 @@
 # Allowed values are disabled, only_admin, only_owner or admin_and_owner
 orcid.disconnection.allowed-users = admin_and_owner
 
+# Configuration if the orcid sync settings should be remain on he profile when it is disconnected from orcid or not
+orcid.disconnection.remain-sync = true
+
 #------------------------------------------------------------------#
 #--------------------ORCID CLIENT CONFIGURATIONS-------------------#
 #------------------------------------------------------------------#
@@ -163,4 +166,4 @@ orcid.external-data.mapping.publication.external-ids = dc.identifier.doi::doi
 orcid.external-data.mapping.publication.external-ids = dc.identifier.scopus::eid
 orcid.external-data.mapping.publication.external-ids = dc.identifier.pmid::pmid
 orcid.external-data.mapping.publication.external-ids = dc.identifier.isi::wosuid
-orcid.external-data.mapping.publication.external-ids = dc.identifier.issn::issn
+orcid.external-data.mapping.publication.external-ids = dc.identifier.issn::issn