Added: managing API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP feature …

…flag in RegisterOIDCUserCommand
IQSS · Dec 11, 2024 · fac0dc3 · fac0dc3
1 parent f9283e8
commit fac0dc3
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommand.java b/src/main/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommand.java
@@ -164,7 +164,10 @@ private String getValueOrDefault(String oidcValue, String dtoValue) {
     private void validateUserFields(CommandContext ctxt, boolean provideMissingClaimsEnabled) throws InvalidFieldsCommandException {
         Map<String, String> fieldErrors = new HashMap<>();
 
-        validateTermsAccepted(fieldErrors);
+        if (!FeatureFlags.API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP.enabled()) {
+            validateTermsAccepted(fieldErrors);
+        }
+
         validateField(fieldErrors, FIELD_EMAIL_ADDRESS, userDTO.getEmailAddress(), ctxt, provideMissingClaimsEnabled);
         validateField(fieldErrors, FIELD_USERNAME, userDTO.getUsername(), ctxt, provideMissingClaimsEnabled);
         validateField(fieldErrors, FIELD_FIRST_NAME, userDTO.getFirstName(), ctxt, provideMissingClaimsEnabled);

diff --git a/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java b/src/main/java/edu/harvard/iq/dataverse/util/json/JsonParser.java
@@ -32,6 +32,7 @@
 import edu.harvard.iq.dataverse.harvest.client.HarvestingClient;
 import edu.harvard.iq.dataverse.license.License;
 import edu.harvard.iq.dataverse.license.LicenseServiceBean;
+import edu.harvard.iq.dataverse.settings.FeatureFlags;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
 import edu.harvard.iq.dataverse.workflow.Workflow;
@@ -1107,13 +1108,18 @@ private void validate(String objectName, JsonObject jobject, String fieldName, V
 
     public UserDTO parseUserDTO(JsonObject jobj) throws JsonParseException {
         UserDTO userDTO = new UserDTO();
+
         userDTO.setUsername(jobj.getString("username", null));
         userDTO.setEmailAddress(jobj.getString("emailAddress", null));
         userDTO.setFirstName(jobj.getString("firstName", null));
         userDTO.setLastName(jobj.getString("lastName", null));
-        userDTO.setTermsAccepted(getMandatoryBoolean(jobj, "termsAccepted"));
         userDTO.setAffiliation(jobj.getString("affiliation", null));
         userDTO.setPosition(jobj.getString("position", null));
+
+        if (!FeatureFlags.API_BEARER_AUTH_HANDLE_TOS_ACCEPTANCE_IN_IDP.enabled()) {
+            userDTO.setTermsAccepted(getMandatoryBoolean(jobj, "termsAccepted"));
+        }
+
         return userDTO;
     }
 }
diff --git a/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommandTest.java b/src/test/java/edu/harvard/iq/dataverse/engine/command/impl/RegisterOIDCUserCommandTest.java
@@ -29,6 +29,7 @@
 import static edu.harvard.iq.dataverse.mocks.MocksFactory.makeRequest;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.mockito.Mockito.*;
 
 @LocalJvmSettings
@@ -350,4 +351,21 @@ void execute_happyPath_withoutAffiliationAndPosition_blankClaimInProviderProvide
                 eq(true)
         );
     }
+
+    @Test
+    @JvmSetting(key = JvmSettings.FEATURE_FLAG, value = "true", varArgs = "api-bearer-auth-handle-tos-acceptance-in-idp")
+    void execute_doNotThrowUnacceptedTermsError_unacceptedTermsInUserDTOAndAllClaimsInProvider_handleTosAcceptanceInIdpFeatureFlagEnabled() throws AuthorizationException {
+        testUserDTO.setTermsAccepted(false);
+        testUserDTO.setEmailAddress(null);
+        testUserDTO.setUsername(null);
+        testUserDTO.setFirstName(null);
+        testUserDTO.setLastName(null);
+
+        when(authServiceStub.verifyOIDCBearerTokenAndGetOAuth2UserRecord(TEST_BEARER_TOKEN)).thenReturn(oAuth2UserRecordStub);
+
+        when(oAuth2UserRecordStub.getUsername()).thenReturn(TEST_USERNAME);
+        when(oAuth2UserRecordStub.getDisplayInfo()).thenReturn(TEST_VALID_DISPLAY_INFO);
+
+        assertDoesNotThrow(() -> sut.execute(contextStub));
+    }
 }