Split "DataverseSession.setUser" into "logIn" and "logOut" methods. r…

…emoved "setUser" method. Updated callers.
CeON · Jan 29, 2025 · f76ddc8 · f76ddc8
1 parent e0f2454
commit f76ddc8
Show file tree

Hide file tree

Showing 42 changed files with 86 additions and 78 deletions.
diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseHeaderFragment.java
@@ -188,7 +188,7 @@ public void initBreadcrumbs(DvObject dvObject, String subPage) {
 
     public String logout() {
         samlSessionRegistry.unregister(dataverseSession);
-        dataverseSession.setUser(null);
+        dataverseSession.logOut();
         dataverseSession.setStatusDismissed(false);
 
         String redirectPage = navigationWrapper.getPageFromContext();

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/DataverseSession.java
@@ -1,9 +1,11 @@
 package edu.harvard.iq.dataverse;
 
-import static edu.harvard.iq.dataverse.persistence.ActionLogRecord.ActionType.SessionManagement; 
+import static edu.harvard.iq.dataverse.persistence.ActionLogRecord.ActionType.SessionManagement;
+import static java.util.Objects.requireNonNull;
 
 import java.io.Serializable;
 import java.util.Locale;
+import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 
@@ -160,12 +162,18 @@ private String getBrowserLanguage() {
     }
 
     // -------------------- SETTERS --------------------
-
-    public void setUser(User aUser) {
-        logSvc.log(
-                new ActionLogRecord(SessionManagement, (aUser == null) ? "logout" : "login")
-                        .setUserIdentifier((aUser != null) ? aUser.getIdentifier() : (user != null ? user.getIdentifier() : "")));
-        this.user = aUser != null ? aUser : GuestUser.get();
+
+    public void logIn(final User user) {
+        requireNonNull(user);
+        this.logSvc.log(new ActionLogRecord(SessionManagement, "login")
+                .setUserIdentifier(user.getIdentifier()));
+        this.user = user;
+    }
+
+    public void logOut() {
+        this.logSvc.log(new ActionLogRecord(SessionManagement, "logout")
+                .setUserIdentifier(this.user.getIdentifier()));
+        this.user = GuestUser.get();
     }
 
     public void setLocaleCode(String localeCode) {

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/LoginPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/LoginPage.java
@@ -172,7 +172,7 @@ public String login() {
         try {
             AuthenticatedUser r = authSvc.getUpdateAuthenticatedUser(credentialsAuthProviderId, authReq);
             logger.log(Level.FINE, "User authenticated: {0}", r.getEmail());
-            session.setUser(r);
+            session.logIn(r);
 
             if ("dataverse.xhtml".equals(redirectPage)) {
                 redirectPage = redirectToRoot();

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/Shib.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/Shib.java
@@ -380,7 +380,7 @@ public String confirmAndConvertAccount() {
 
     private void logInUserAndSetShibAttributes(AuthenticatedUser au) {
         au.setShibIdentityProvider(shibIdp);
-        session.setUser(au);
+        session.logIn(au);
         logger.debug("Groups for user " + au.getId() + " (" + au.getIdentifier() + "): " + getGroups(au));
     }
 

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -1415,7 +1415,7 @@ public Response submitDatasetVersionToArchive(@PathParam("id") String dsid, @Pat
 
         try {
             AuthenticatedUser au = findAuthenticatedUserOrDie();
-            session.setUser(au);
+            session.logIn(au);
             Dataset ds = findDatasetOrDie(dsid);
 
             DatasetVersion dv = datasetversionService.findByFriendlyVersionNumber(ds.getId(), versionNumber);

diff --git a/...rse-webapp/src/main/java/edu/harvard/iq/dataverse/api/filters/ApiAuthorizationFilter.java b/...rse-webapp/src/main/java/edu/harvard/iq/dataverse/api/filters/ApiAuthorizationFilter.java
@@ -75,7 +75,7 @@ private FilterLogIn logInUserByTokenIfNeeded(HttpServletRequest request) {
                 if (!systemConfig.isReadonlyMode()) {
                     user = userService.updateLastApiUseTime(user);
                 }
-                session.setUser(user);
+                session.logIn(user);
                 return FilterLogIn.TOKEN_LOG_IN;
             }
         }
@@ -94,7 +94,7 @@ private enum FilterLogIn {
         NONE((r, ds) -> { }),
         TOKEN_LOG_IN((r, ds) -> {
             r.getSession().invalidate();
-            ds.setUser(null);
+            ds.logOut();
         });
 
         private final BiConsumer<HttpServletRequest, DataverseSession> logout;

diff --git a/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java b/...main/java/edu/harvard/iq/dataverse/authorization/providers/builtin/DataverseUserPage.java
@@ -393,7 +393,7 @@ public String save() {
 
             // Authenticated user registered. Save the new bulitin, and log in.
             builtinUserService.save(builtinUser);
-            session.setUser(au);
+            session.logIn(au);
             /**
              * @todo Move this to
              * AuthenticationServiceBean.createAuthenticatedUser
@@ -452,7 +452,7 @@ public String save() {
                 } catch (ConfirmEmailException ex) {
                     logger.log(Level.INFO, "Unable to send email confirmation link to user id {0}", savedUser.getId());
                 }
-                session.setUser(currentUser);
+                session.logIn(currentUser);
                 JsfHelper.addFlashSuccessMessage(BundleUtil.getStringFromBundle("confirmEmail.changed", currentUser.getEmail(), expTime));
             } else {
                 JsfHelper.addFlashSuccessMessage(msg.toString());

diff --git a/...va/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java b/...va/edu/harvard/iq/dataverse/authorization/providers/common/ExternalIdpFirstLoginPage.java
@@ -241,7 +241,7 @@ public String createNewAccount() {
         final AuthenticatedUser user = authenticationSvc.createAuthenticatedUser(newUser.toUserRecordIdentifier(),
                 getUsername(), newAuthenticatedUserDisplayInfo, true, preferredNotificationsLanguage).getOrNull();
 
-        session.setUser(user);
+        session.logIn(user);
         userNotificationService.sendNotificationWithEmail(user, new Timestamp(new Date().getTime()), NotificationType.CREATEACC,
                 null, NotificationObjectType.AUTHENTICATED_USER);
         consentService.executeActionsAndSaveAcceptedConsents(consents, user);
@@ -269,7 +269,7 @@ public String convertExistingAccount() {
             authenticationSvc.updateProvider(existingUser, newUser.getServiceId(), newUser.getIdInService());
             builtinUserSvc.removeUser(existingUser.getUserIdentifier());
 
-            session.setUser(existingUser);
+            session.logIn(existingUser);
             AuthenticationProvider newUserAuthProvider = authenticationSvc.getAuthenticationProvider(newUser.getServiceId());
             JsfHelper.addFlashSuccessMessage(
                     BundleUtil.getStringFromBundle("oauth2.convertAccount.success", newUserAuthProvider.getInfo().getTitle()));

diff --git a/.../java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java b/.../java/edu/harvard/iq/dataverse/authorization/providers/oauth2/OAuth2LoginBackingBean.java
@@ -107,7 +107,7 @@ public void exchangeCodeForToken() throws IOException {
 
             } else {
                 // login the user and redirect to HOME of intended page (if any).
-                session.setUser(dvUser);
+                session.logIn(dvUser);
 
                 if (!systemConfig.isReadonlyMode()) {
                     final OAuth2TokenData tokenData = oauthUser.getTokenData();

diff --git a/...java/edu/harvard/iq/dataverse/authorization/providers/saml/SamlAuthenticationServlet.java b/...java/edu/harvard/iq/dataverse/authorization/providers/saml/SamlAuthenticationServlet.java
@@ -177,7 +177,7 @@ private void login(HttpServletRequest request, HttpServletResponse response) thr
                 return;
             }
             AuthenticatedUser updatedUser = updateResult.get();
-            session.setUser(updatedUser);
+            session.logIn(updatedUser);
             String relayState = request.getParameter("RelayState");
             response.sendRedirect(StringUtils.isNotBlank(relayState)
                     ? relayState
@@ -247,7 +247,7 @@ private AuthenticatedUser findUserForLogout(String issuer, String nameId) {
     private void clearActiveSessionsForUser(AuthenticatedUser user) {
         List<DataverseSession> sessions = samlSessionRegistry.unregister(user);
         for (DataverseSession session : sessions) {
-            session.setUser(null);
+            session.logOut();
         }
     }
 

diff --git a/...in/java/edu/harvard/iq/dataverse/authorization/providers/saml/SamlConvertAccountPage.java b/...in/java/edu/harvard/iq/dataverse/authorization/providers/saml/SamlConvertAccountPage.java
@@ -112,7 +112,7 @@ public String confirmAndConvertAccount() {
         }
         authenticationService.updateAuthenticatedUser(authenticatedUser,
                 new AuthenticatedUserDisplayInfo(userData.getName(), userData.getSurname(), userData.getEmail(), null, null));
-        dataverseSession.setUser(authenticatedUser);
+        dataverseSession.logIn(authenticatedUser);
         consentService.executeActionsAndSaveAcceptedConsents(consents, authenticatedUser);
         logger.info("Local account validated and successfully converted to a Saml account. The old account username was "
                 + builtinUsername);

diff --git a/...rse-webapp/src/main/java/edu/harvard/iq/dataverse/mail/confirmemail/ConfirmEmailPage.java b/...rse-webapp/src/main/java/edu/harvard/iq/dataverse/mail/confirmemail/ConfirmEmailPage.java
@@ -55,7 +55,7 @@ public String init() {
             confirmEmailData = confirmEmailExecResponse.getConfirmEmailData();
             if (confirmEmailData != null) {
                 user = confirmEmailData.getAuthenticatedUser();
-                session.setUser(user);
+                session.logIn(user);
                 JsfHelper.addFlashSuccessMessage(BundleUtil.getStringFromBundle("confirmEmail.details.success"));
                 return "/dataverse.xhtml?faces-redirect=true";
             }

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/passwordreset/PasswordResetPage.java
@@ -165,7 +165,7 @@ public String resetPassword() {
                                                                           response.getMessageDetail()));
             String builtinAuthProviderId = BuiltinAuthenticationProvider.PROVIDER_ID;
             AuthenticatedUser au = authSvc.lookupUser(builtinAuthProviderId, user.getUserName());
-            session.setUser(au);
+            session.logIn(au);
             consentService.executeActionsAndSaveAcceptedConsents(consents, au);
             return "/dataverse.xhtml?alias=" + dataverseDao.findRootDataverse().getAlias() + "faces-redirect=true";
         } else {

diff --git a/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java b/dataverse-webapp/src/main/java/edu/harvard/iq/dataverse/privateurl/PrivateUrlPage.java
@@ -35,7 +35,7 @@ public String init() {
             PrivateUrlRedirectData privateUrlRedirectData = privateUrlService.getPrivateUrlRedirectDataFromToken(token);
             String datasetPageToBeRedirectedTo = privateUrlRedirectData.getDatasetPageToBeRedirectedTo() + "&faces-redirect=true";
             PrivateUrlUser privateUrlUser = privateUrlRedirectData.getPrivateUrlUser();
-            session.setUser(privateUrlUser);
+            session.logIn(privateUrlUser);
             logger.info("Redirecting PrivateUrlUser '" + privateUrlUser.getIdentifier() + "' to " + datasetPageToBeRedirectedTo);
             return datasetPageToBeRedirectedTo;
         } catch (Exception ex) {

diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/SendFeedbackDialogTest.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/SendFeedbackDialogTest.java
@@ -264,7 +264,7 @@ public void emailGetsSentToSystem_whenUserIsLoggedIn_andDataAreProvided()
         assertThat(this.dialog.getFormHeader())
                 .isEqualTo("Contact the Repository's Support");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -302,7 +302,7 @@ public void emailGetsSentToSystemAndUser_whenUserIsLoggedIn_andDataAreProvided_w
         assertThat(this.dialog.getFormHeader())
                 .isEqualTo("Contact the Repository's Support");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -368,7 +368,7 @@ public void emailGetsSentToDataverseContact_whenUserIsLoggedIn_andDataAreProvide
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -408,7 +408,7 @@ public void emailGetsSentToDataverseConctactAndUser_whenUserIsLoggedIn_andDataAr
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -459,7 +459,7 @@ public void emailGetsSentToDatasetContact_whenUserIsLoggedIn_andDataAreProvided(
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT, DATASET_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -498,7 +498,7 @@ public void emailGetsSentToDatasetConctactAndUser_whenUserIsLoggedIn_andDataAreP
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT, DATASET_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -549,7 +549,7 @@ public void emailGetsSentToFileDatasetContact_whenUserIsLoggedIn_andDataAreProvi
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT, DATASET_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -588,7 +588,7 @@ public void emailGetsSentToFileDatasetConctactAndUser_whenUserIsLoggedIn_andData
                 .containsExactly(SYSTEM_SUPPORT, DATAVERSE_CONTACT, DATASET_CONTACT);
         assertThat(this.dialog.getFormHeader()).isEqualTo("Send E-mail");
 
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         assertThat(this.dialog.isLoggedIn()).isTrue();
         assertThat(this.dialog.loggedInUserEmail()).isEqualTo(USER_EMAIL);
@@ -633,7 +633,7 @@ public void emailGetsSentToFileDatasetConctactAndUser_whenUserIsLoggedIn_andData
     @Test
     public void exceedingCombinedAttachmentSizeLimit_failsValidation()
             throws Exception {
-        this.dataverseSession.setUser(this.authenticatedUser);
+        this.dataverseSession.logIn(this.authenticatedUser);
 
         this.dialog.handleFileUpload(newEvent(attachment2));
 

diff --git a/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/api/EmbargoAccessServiceIT.java b/dataverse-webapp/src/test/java/edu/harvard/iq/dataverse/api/EmbargoAccessServiceIT.java
@@ -42,7 +42,7 @@ public void shouldCheckEmbargoRestriction_userWithPermissions() {
         // given
         Dataset dataset = datasetDao.find(57L);
         dataset.setEmbargoDate(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)));
-        dataverseSession.setUser(authenticationService.getAdminUser());
+        dataverseSession.logIn(authenticationService.getAdminUser());
 
         // when&then
         Assertions.assertFalse(embargoAccess.isRestrictedByEmbargo(dataset));
@@ -53,7 +53,7 @@ public void shouldCheckEmbargoRestriction_userWithoutPermissions() {
         // given
         Dataset dataset = datasetDao.find(57L);
         dataset.setEmbargoDate(Date.from(Instant.now().plus(1, ChronoUnit.DAYS)));
-        dataverseSession.setUser(GuestUser.get());
+        dataverseSession.logIn(GuestUser.get());
 
         // when&then
         Assertions.assertTrue(embargoAccess.isRestrictedByEmbargo(dataset));

diff --git a/...webapp/src/test/java/edu/harvard/iq/dataverse/api/filters/ApiAuthorizationFilterTest.java b/...webapp/src/test/java/edu/harvard/iq/dataverse/api/filters/ApiAuthorizationFilterTest.java
@@ -72,7 +72,7 @@ public void shouldDoNothingIfUserIsAlreadyLogged() throws IOException, ServletEx
         // then
         verify(authenticationService, never()).lookupUser(nullable(String.class));
         verify(userService, never()).updateLastApiUseTime(nullable(AuthenticatedUser.class));
-        verify(dataverseSession, never()).setUser(nullable(AuthenticatedUser.class));
+        verify(dataverseSession, never()).logIn(nullable(AuthenticatedUser.class));
         verify(httpSession, never()).invalidate();
     }
 
@@ -91,7 +91,7 @@ public void shouldLogAndLogoutUserWhenKeyIsPassedAndUserIsNotAlreadyLoggedIn()
         // then
         verify(authenticationService, times(1)).lookupUser(anyString());
         verify(userService, times(1)).updateLastApiUseTime(any(AuthenticatedUser.class));
-        verify(dataverseSession, times(1)).setUser(any(AuthenticatedUser.class));
+        verify(dataverseSession, times(1)).logIn(any(AuthenticatedUser.class));
         verify(httpSession, times(1)).invalidate();
     }
 
@@ -108,7 +108,7 @@ public void shouldNotUpdateLastApiUseTimeWhenLogIsByApiInReadonlyMode()
         filter.doFilter(request, null, filterChain);
 
         // then
-        verify(dataverseSession, times(1)).setUser(any(AuthenticatedUser.class));
+        verify(dataverseSession, times(1)).logIn(any(AuthenticatedUser.class));
         verify(userService, never()).updateLastApiUseTime(any(AuthenticatedUser.class));
     }
 
@@ -125,7 +125,7 @@ public void shouldDoNothingWhenNoKeyPassedAndUserIsNotAlreadyLoggedIn()
         // then
         verify(authenticationService, times(1)).lookupUser(nullable(String.class));
         verify(userService, never()).updateLastApiUseTime(any(AuthenticatedUser.class));
-        verify(dataverseSession, never()).setUser(any(AuthenticatedUser.class));
+        verify(dataverseSession, never()).logIn(any(AuthenticatedUser.class));
         verify(httpSession, never()).invalidate();
     }
 }
diff --git a/...erse-webapp/src/test/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersServiceIT.java b/...erse-webapp/src/test/java/edu/harvard/iq/dataverse/dashboard/DashboardUsersServiceIT.java
@@ -34,7 +34,7 @@ public class DashboardUsersServiceIT extends WebappArquillianDeployment {
 
     @BeforeEach
     public void setUp() {
-        dataverseSession.setUser(authenticationServiceBean.getAdminUser());
+        dataverseSession.logIn(authenticationServiceBean.getAdminUser());
     }
 
     @Test
@@ -57,7 +57,7 @@ public void shouldRevokeAllRolesForUser() {
     public void shouldRevokeAllRolesForUser_withPermissionsException() {
         // given
         AuthenticatedUser user = authenticationServiceBean.findByID(2L);
-        dataverseSession.setUser(authenticationServiceBean.findByID(4L));
+        dataverseSession.logIn(authenticationServiceBean.findByID(4L));
 
         // when & then
         assertThrows(PermissionException.class, () -> dashboardUsersService.revokeAllRolesForUser(user.getId()));
@@ -93,7 +93,7 @@ public void shouldChangeSuperuserStatus_grantSuperuserStatus() {
     public void shouldChangeSuperuserStatus_revokeSuperuserStatus_withPermissionException() {
         // given
         AuthenticatedUser user = authenticationServiceBean.findByID(2L);
-        dataverseSession.setUser(authenticationServiceBean.findByID(4L));
+        dataverseSession.logIn(authenticationServiceBean.findByID(4L));
 
         // when & then
         assertThrows(PermissionException.class, () -> dashboardUsersService.changeSuperuserStatus(user.getId()));
@@ -103,7 +103,7 @@ public void shouldChangeSuperuserStatus_revokeSuperuserStatus_withPermissionExce
     public void shouldChangeSuperuserStatus_grantSuperuserStatus_withPermissionException() {
         // given
         AuthenticatedUser user = authenticationServiceBean.findByID(3L);
-        dataverseSession.setUser(authenticationServiceBean.findByID(4L));
+        dataverseSession.logIn(authenticationServiceBean.findByID(4L));
 
         // when & then
         assertThrows(PermissionException.class, () -> dashboardUsersService.changeSuperuserStatus(user.getId()));

diff --git a/...erse-webapp/src/test/java/edu/harvard/iq/dataverse/datafile/FilePermissionsServiceIT.java b/...erse-webapp/src/test/java/edu/harvard/iq/dataverse/datafile/FilePermissionsServiceIT.java
@@ -64,7 +64,7 @@ public class FilePermissionsServiceIT extends WebappArquillianDeployment {
 
     @BeforeEach
     public void initBefore() {
-        dataverseSession.setUser(authenticationService.getAuthenticatedUser("superuser"));
+        dataverseSession.logIn(authenticationService.getAuthenticatedUser("superuser"));
     }
 
 
@@ -131,7 +131,7 @@ public void assignFileDownloadRole() {
     @Transactional(TransactionMode.ROLLBACK)
     public void assignFileDownloadRole__MISSING_MANAGE_DATASET_PERMISSIONS() {
         // given
-        dataverseSession.setUser(GuestUser.get());
+        dataverseSession.logIn(GuestUser.get());
         AuthenticatedUser user = authenticationService.getAuthenticatedUser("superuser");
         DataFile datafile = dataFileService.find(53L);
 
@@ -172,7 +172,7 @@ public void revokeFileDownloadRole() {
     @Transactional(TransactionMode.ROLLBACK)
     public void revokeFileDownloadRole__MISSING_MANAGE_DATASET_PERMISSIONS() {
         // given
-        dataverseSession.setUser(GuestUser.get());
+        dataverseSession.logIn(GuestUser.get());
         DataFile datafile = dataFileService.find(53L);
         AuthenticatedUser user = authenticationService.getAuthenticatedUser("filedownloader");