FIxing more tests

ORCID · Feb 27, 2025 · f5edf69 · f5edf69
1 parent 9af63cd
commit f5edf69
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 14 deletions.
diff --git a/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/ClientManagerImpl.java b/orcid-core/src/main/java/org/orcid/core/manager/v3/impl/ClientManagerImpl.java
@@ -30,12 +30,7 @@
 import org.orcid.persistence.dao.ClientSecretDao;
 import org.orcid.persistence.dao.ProfileDao;
 import org.orcid.persistence.dao.ProfileLastModifiedDao;
-import org.orcid.persistence.jpa.entities.ClientAuthorisedGrantTypeEntity;
-import org.orcid.persistence.jpa.entities.ClientDetailsEntity;
-import org.orcid.persistence.jpa.entities.ClientGrantedAuthorityEntity;
-import org.orcid.persistence.jpa.entities.ClientResourceIdEntity;
-import org.orcid.persistence.jpa.entities.ClientScopeEntity;
-import org.orcid.persistence.jpa.entities.ProfileEntity;
+import org.orcid.persistence.jpa.entities.*;
 import org.orcid.persistence.jpa.entities.keys.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -136,6 +131,10 @@ private Client create(Client newClient, boolean publicClient) {
         clientResourceIdEntities.add(clientResourceIdEntity);
         newEntity.setClientResourceIds(clientResourceIdEntities);
 
+        for(ClientRedirectUriEntity rUri : newEntity.getClientRegisteredRedirectUris()) {
+            rUri.setClientId(newEntity.getClientId());
+        }
+
         // Set ClientAuthorisedGrantTypeEntity
         Set<ClientAuthorisedGrantTypeEntity> clientAuthorisedGrantTypeEntities = new HashSet<ClientAuthorisedGrantTypeEntity>();
         for (String clientAuthorisedGrantType : Arrays.asList("client_credentials", "authorization_code", "refresh_token", "implicit")) {
@@ -175,7 +174,8 @@ private Client create(Client newClient, boolean publicClient) {
             throw e;
         }
 
-        return jpaJaxbClientAdapter.toClient(newEntity);
+        Client theNewClient = jpaJaxbClientAdapter.toClient(newEntity);
+        return theNewClient;
     }
 
     @Override
@@ -244,7 +244,7 @@ private void refreshGrantTypesForObo(ClientDetailsEntity clientDetails, boolean
         Iterator<ClientAuthorisedGrantTypeEntity> grantTypes = clientDetails.getClientAuthorizedGrantTypes().iterator();
         while (grantTypes.hasNext()) {
             ClientAuthorisedGrantTypeEntity g = grantTypes.next();
-            if (g != null && OrcidOauth2Constants.IETF_EXCHANGE_GRANT_TYPE.equals(g.getId().getGrantType())) {
+            if (g != null && OrcidOauth2Constants.IETF_EXCHANGE_GRANT_TYPE.equals(g.getGrantType())) {
                 oboAlreadyEnabled = true;
                 if (!enableObo) {
                     grantTypes.remove();                    

diff --git a/...persistence/src/main/java/org/orcid/persistence/jpa/entities/ClientRedirectUriEntity.java b/...persistence/src/main/java/org/orcid/persistence/jpa/entities/ClientRedirectUriEntity.java
@@ -108,7 +108,7 @@ public static Map<String, ClientRedirectUriEntity> mapByUriAndType(Set<ClientRed
     }
 
     public static String getUriAndTypeKey(ClientRedirectUriEntity rUri) {
-        return rUri.getId().getRedirectUri() + '-' + rUri.getId().getRedirectUriType();
+        return rUri.getRedirectUri() + '-' + rUri.getRedirectUriType();
     }
 
     public static String getUriAndTypeKey(String redirectUri, String redirectUriType) {

diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ClientsController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/ClientsController.java
@@ -172,6 +172,8 @@ public Client validateRedirectUris(Client client, boolean checkProtocol) {
                 newClient = clientManager.create(newClient);
             } catch (Exception e) {
                 LOGGER.error(e.getMessage());
+                System.out.println(e.getMessage());
+                System.out.println(e.getCause());
                 String errorDesciption = getMessage("manage.developer_tools.group.cannot_create_client") + " " + e.getMessage();
                 client.setErrors(new ArrayList<String>());
                 client.getErrors().add(errorDesciption);

diff --git a/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthRegistrationController.java b/orcid-web/src/main/java/org/orcid/frontend/web/controllers/OauthRegistrationController.java
@@ -48,6 +48,10 @@ public RegistrationController getRegistrationController() {
         return registrationController;
     }
 
+    public void setRequestInfoFormLocalCache(RequestInfoFormLocalCache requestInfoFormLocalCache) {
+        this.requestInfoFormLocalCache = requestInfoFormLocalCache;
+    }
+
     public void setRegistrationController(RegistrationController registrationController) {
         this.registrationController = registrationController;
     }

diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ClientsControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ClientsControllerTest.java
@@ -265,7 +265,6 @@ public void addClientTest() {
         Client client = new Client();
         client.setAllowAutoDeprecate(Checkbox.valueOf(true));
         client.setType(Text.valueOf(ClientType.CREATOR.name()));
-        client.setClientId(Text.valueOf("XXXXXX"));
         client.setDisplayName(Text.valueOf("My client name"));
         client.setMemberId(Text.valueOf("0000-0000-0000-0000"));
         client.setMemberName(Text.valueOf("My member name"));

diff --git a/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageMembersControllerTest.java b/orcid-web/src/test/java/org/orcid/frontend/web/controllers/ManageMembersControllerTest.java
@@ -308,7 +308,7 @@ public void editMemberTest() throws Exception {
     public void editMemberWithInvalidEmailTest() throws Exception {
         //Create one member
         Member group = new Member();
-        String email = "group" + System.currentTimeMillis() + "@email.com";
+        String email = "group1" + System.currentTimeMillis() + "@email.com";
         group.setEmail(Text.valueOf(email));
         group.setGroupName(Text.valueOf("Group Name"));
         group.setType(Text.valueOf("premium-institution"));

diff --git a/...web/src/test/java/org/orcid/frontend/web/controllers/OauthRegistrationControllerTest.java b/...web/src/test/java/org/orcid/frontend/web/controllers/OauthRegistrationControllerTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -30,6 +31,7 @@
 import org.mockito.stubbing.Answer;
 import org.orcid.core.oauth.OrcidOAuth2Authentication;
 import org.orcid.core.oauth.service.OrcidAuthorizationEndpoint;
+import org.orcid.frontend.util.RequestInfoFormLocalCache;
 import org.orcid.jaxb.model.message.CreationMethod;
 import org.orcid.pojo.ajaxForm.Checkbox;
 import org.orcid.pojo.ajaxForm.OauthRegistrationForm;
@@ -64,6 +66,9 @@ public class OauthRegistrationControllerTest {
 
     @Mock
     private HttpServletResponse servletResponse;
+
+    @Mock
+    private RequestInfoFormLocalCache requestInfoFormLocalCache;
 
     @Before
     public void before() {
@@ -75,12 +80,16 @@ public void before() {
 
     @Test
     public void testStripHtmlFromNames() throws UnsupportedEncodingException {
+        RequestInfoForm rf = new RequestInfoForm();
         HttpSession session = mock(HttpSession.class);
-        RequestInfoForm rf = new RequestInfoForm();                
+        requestInfoFormLocalCache = mock(RequestInfoFormLocalCache.class);
+        when(requestInfoFormLocalCache.get(any())).thenReturn(rf);
+        oauthRegistrationController.setRequestInfoFormLocalCache(requestInfoFormLocalCache);
         RedirectView mv = new RedirectView();
         when(servletRequest.getSession()).thenReturn(session);
-        when(authorizationEndpoint.approveOrDeny(Matchers.anyMap(), Matchers.anyMap(), Matchers.any(SessionStatus.class), Matchers.any(Principal.class))).thenReturn(mv);
-        when(authenticationManager.authenticate(Matchers.any(Authentication.class))).thenAnswer(new Answer<Authentication>(){
+        when(session.getId()).thenReturn("ID1");
+        when(authorizationEndpoint.approveOrDeny(Matchers.anyMap(), Matchers.anyMap(), any(SessionStatus.class), any(Principal.class))).thenReturn(mv);
+        when(authenticationManager.authenticate(any(Authentication.class))).thenAnswer(new Answer<Authentication>(){
             @Override
             public Authentication answer(InvocationOnMock invocation) throws Throwable {
                 OrcidOAuth2Authentication mockedAuthentication = mock(OrcidOAuth2Authentication.class);