Merge pull request #8159 from QualitativeDataRepository/IQSS/8158-rem…

…ove_metadata_when_anonymous_access #8158 - Don't make metadata available in xml when anonymous access
IQSS · Oct 21, 2021 · 389373d · 389373d
2 parents 2f4a6ad + 03d1c8b
commit 389373d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 30 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java b/src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
@@ -5083,6 +5083,7 @@ public void setShowLinkingPopup(boolean showLinkingPopup) {
     }
 
     private boolean showLinkingPopup = false;
+    private Boolean anonymizedAccess = null;
 
     //
 
@@ -5119,11 +5120,14 @@ public String getPrivateUrlLink(PrivateUrl privateUrl) {
     }
 
     public boolean isAnonymizedAccess() {
-        if (session.getUser() instanceof PrivateUrlUser) {
-            return ((PrivateUrlUser)session.getUser()).hasAnonymizedAccess();
-        } else {
-            return false;
+        if (anonymizedAccess == null) {
+            if (session.getUser() instanceof PrivateUrlUser) {
+                anonymizedAccess = ((PrivateUrlUser) session.getUser()).hasAnonymizedAccess();
+            } else {
+                anonymizedAccess = false;
+            }
         }
+        return anonymizedAccess;
     }
 
     public boolean isAnonymizedPrivateUrl() {

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
@@ -45,38 +45,47 @@
             <ui:param name="releaseDraft" value="#{DatasetPage.releaseDraftPopup()}"/>
             <ui:param name="releaseBoth" value="#{DatasetPage.publishBothPopup()}"/>
             <ui:define name="meta_header">
-                <meta name="description" content="#{DatasetPage.description}"/>
+                <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
+                    <meta name="description" content="#{DatasetPage.description}"/>
+                </ui:fragment>
             </ui:define>
             <ui:define name="dc_meta_header">
-                <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
-                <meta name="DC.type" content="Dataset"/>
-                <meta name="DC.title" content="#{DatasetPage.title}"/>
-                <meta name="DC.date" content="#{DatasetPage.workingVersion.publicationDateAsString}"/>
-                <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
-                <meta name="DC.description" content="#{DatasetPage.description}" />
-                <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
-                    <meta name="DC.creator" content="#{author}"/>
-                </ui:repeat>
-                <ui:repeat var="subject" value="#{DatasetPage.workingVersion.datasetSubjects}">
-                    <meta name="DC.subject" content="#{subject}"/>
-                </ui:repeat>
+                <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
+                    <meta name="DC.identifier" content="#{DatasetPage.persistentId}"/>
+                    <meta name="DC.type" content="Dataset"/>
+                    <meta name="DC.title" content="#{DatasetPage.title}"/>
+                    <meta name="DC.date" content="#{DatasetPage.workingVersion.publicationDateAsString}"/>
+                    <meta name="DC.publisher" content="#{DatasetPage.publisher}" />
+                    <meta name="DC.description" content="#{DatasetPage.description}" />
+                    <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
+                        <meta name="DC.creator" content="#{author}"/>
+                    </ui:repeat>
+                    <ui:repeat var="subject" value="#{DatasetPage.workingVersion.datasetSubjects}">
+                        <meta name="DC.subject" content="#{subject}"/>
+                    </ui:repeat>
+                </ui:fragment>
             </ui:define>
+
             <ui:define name="jsonld_header">
-                <script type="application/ld+json">
-                    <h:outputText value="#{DatasetPage.jsonLd}"/>
-                </script>
+                <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
+                    <script type="application/ld+json">
+                        <h:outputText value="#{DatasetPage.jsonLd}"/>
+                    </script>
+                </ui:fragment>
             </ui:define>
             <ui:define name="og_header">
-                <meta property="og:title" content="#{DatasetPage.title}" />
-                <meta property="og:type" content="article" />
-                <meta property="og:url" content="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" />
-                <meta property="og:image" content="#{DatasetPage.dataverseSiteUrl.concat(resource['images/dataverse-icon-1200.png'])}" />
-                <meta property="og:site_name" content="#{DatasetPage.publisher}" />
-                <meta property="og:description" content="#{(DatasetPage.description.length()>150 ? DatasetPage.description.substring(0,147).concat('...') : DatasetPage.description)}" />
-                <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
-                    <meta property="article:author" content="#{author}" />
-                </ui:repeat>
-                <meta property="article:published_time" content="#{DatasetPage.workingVersion.publicationDateAsString}" />
+                <ui:fragment rendered="#{!DatasetPage.anonymizedAccess}">
+                    <meta property="og:title" content="#{DatasetPage.title}" />
+                    <meta property="og:type" content="article" />
+                    <meta property="og:url" content="#{DatasetPage.dataverseSiteUrl}/dataset.xhtml?persistentId=#{dataset.globalId}" />
+                    <meta property="og:image" content="#{DatasetPage.dataverseSiteUrl.concat(resource['images/dataverse-icon-1200.png'])}" />
+                    <meta property="og:site_name" content="#{DatasetPage.publisher}" />
+                    <meta property="og:description" content="#{(DatasetPage.description.length()>150 ? DatasetPage.description.substring(0,147).concat('...') : DatasetPage.description)}" />
+                    <ui:repeat var="author" value="#{DatasetPage.datasetAuthors}">
+                        <meta property="article:author" content="#{author}" />
+                    </ui:repeat>
+                    <meta property="article:published_time" content="#{DatasetPage.workingVersion.publicationDateAsString}" />
+                </ui:fragment>
             </ui:define>
             <ui:define name="body">
                 <o:importFunctions type="edu.harvard.iq.dataverse.util.MarkupChecker" />