Merge branch 'develop' of github.com:IQSS/dataverse into dependabot/maven/conf/keycloak/builtin-users-spi/org.keycloak-keycloak-services-26.3.0

Author: GPortas

.github/workflows/deploy_beta_testing.yml

@@ -50,7 +50,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Download war artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: built-app
           path: ./

.github/workflows/maven_unit_test.yml

@@ -112,7 +112,7 @@ jobs:
                   cache: maven
 
             # Get the build output from the unit test job
-            - uses: actions/download-artifact@v4
+            - uses: actions/download-artifact@v5
               with:
                   name: java-artifacts
             - run: |
@@ -145,7 +145,7 @@ jobs:
                 cache: maven
 
           # Get the build output from the integration test job
-          - uses: actions/download-artifact@v4
+          - uses: actions/download-artifact@v5
             with:
                 name: java-reportdir
           - run: tar -xvf java-reportdir.tar

conf/keycloak/builtin-users-spi/src/main/java/edu/harvard/iq/keycloak/auth/spi/services/DataverseUserService.java

@@ -27,11 +27,16 @@ public DataverseUser getUserById(String id) {
 
         DataverseBuiltinUser builtinUser = em.find(DataverseBuiltinUser.class, persistenceId);
         if (builtinUser == null) {
-            logger.debugf("User not found for external ID: %s", persistenceId);
+            logger.debugf("Builtin user not found for external ID: %s", persistenceId);
             return null;
         }
 
-        DataverseAuthenticatedUser authenticatedUser = getAuthenticatedUserByUsername(builtinUser.getUsername());
+        String username = builtinUser.getUsername();
+        DataverseAuthenticatedUser authenticatedUser = getAuthenticatedUserByUsername(username);
+        if (authenticatedUser == null) {
+            logger.debugf("Authenticated user not found by username: %s", username);
+            return null;
+        }
 
         return new DataverseUser(authenticatedUser, builtinUser);
     }
@@ -43,11 +48,15 @@ public DataverseUser getUserByUsername(String username) {
                 .getResultList();
 
         if (users.isEmpty()) {
-            logger.debugf("User not found by username: %s", username);
+            logger.debugf("Builtin user not found by username: %s", username);
             return null;
         }
 
         DataverseAuthenticatedUser authenticatedUser = getAuthenticatedUserByUsername(username);
+        if (authenticatedUser == null) {
+            logger.debugf("Authenticated user not found by username: %s", username);
+            return null;
+        }
 
         return new DataverseUser(authenticatedUser, users.get(0));
     }
@@ -59,7 +68,7 @@ public DataverseUser getUserByEmail(String email) {
                 .getResultList();
 
         if (authUsers.isEmpty()) {
-            logger.debugf("User not found by email: %s", email);
+            logger.debugf("Authenticated user not found by email: %s", email);
             return null;
         }
 
@@ -68,6 +77,11 @@ public DataverseUser getUserByEmail(String email) {
                 .setParameter("username", username)
                 .getResultList();
 
+        if (builtinUsers.isEmpty()) {
+            logger.debugf("Builtin user not found by username: %s", username);
+            return null;
+        }
+
         return new DataverseUser(authUsers.get(0), builtinUsers.get(0));
     }
 

conf/solr/schema.xml

@@ -242,6 +242,7 @@
 
     <field name="license" type="string" stored="true" indexed="true" multiValued="false"/>
     <field name="fileCount" type="plong" stored="true" indexed="true" multiValued="false"/>
+    <field name="datasetCount" type="plong" stored="true" indexed="true" multiValued="false"/>
 
     <!--
         METADATA SCHEMA FIELDS

conf/solr/update-fields.sh

@@ -68,10 +68,10 @@ while getopts ":hp" opt; do
 done
 
 # Check for ed and bc being present
-exists ed || error "Please ensure ed, bc, sed + awk are installed"
-exists bc || error "Please ensure ed, bc, sed + awk are installed"
-exists awk || error "Please ensure ed, bc, sed + awk are installed"
-exists sed || error "Please ensure ed, bc, sed + awk are installed"
+exists ed || error "Please ensure ed, bc, sed + awk are installed (ed is missing)"
+exists bc || error "Please ensure ed, bc, sed + awk are installed (bc is missing)"
+exists awk || error "Please ensure ed, bc, sed + awk are installed (awk is missing)"
+exists sed || error "Please ensure ed, bc, sed + awk are installed (sed is missing)"
 
 # remove all the parsed options
 shift $((OPTIND-1))

doc/release-notes/10190-dataset-count.md

@@ -0,0 +1,2 @@
+The search index now includes datasetCount for each collection, counting published, linked, and harvested datasets.
+Collections can be filtered using datasetCount (e.g., `datasetCount:[1000 TO *]`), and the value is returned in Dataverse search results via the Search API.

doc/release-notes/11465-api-fetch-download-size-file-count.md

@@ -0,0 +1,3 @@
+Linking or unlinking a dataset or dataverse now requires the new "Link Dataset/Dataverse" permission.
+Previously, this action was covered by the "Publish Dataset/Dataverse" permission.
+Linking and publishing permissions can now be granted separately, allowing for more fine-grained access control.

doc/release-notes/11534-link-permissions.md

@@ -0,0 +1 @@
+Implemented a new feature flag ``dataverse.feature.api-bearer-auth-use-shib-user-on-id-match``, which supports the use of the new Dataverse client in instances that have historically allowed login via Shibboleth. Specifically, with this flag enabled, when an OIDC bridge is configured to allow OIDC login with validation by the bridged Shibboleth providers, users with existing Shibboleth-based accounts in Dataverse can log in to those accounts, thereby maintaining access to their existing content and retaining their roles. (For security reasons, Dataverse's current support for direct login via Shibboleth cannot be used in browser-based clients.)

doc/release-notes/11605-existing-shib-external-users-auth.md

@@ -0,0 +1,4 @@
+Due to changes in how the commons-lang3 library handles a non-ascii chararacter, two keys in the citation.properties and citation.tsv files have changed to include i instead of ɨ. Translations will need to address this.
+
+controlledvocabulary.language.magɨ_(madang_province) => controlledvocabulary.language.magi_(madang_province)
+controlledvocabulary.language.magɨyi =>  controlledvocabulary.language.magiyi