fixed test cases

auth0 · Jan 16, 2025 · dc25fc6 · dc25fc6
1 parent cb38e8f
commit dc25fc6
Show file tree

Hide file tree

Showing 4 changed files with 322 additions and 327 deletions.
diff --git a/build.gradle b/build.gradle
@@ -20,7 +20,7 @@ oss {
     repository 'auth0-java-mvc-common'
     organization 'auth0'
     description 'Java library that simplifies the use of Auth0 for server-side MVC web apps'
-    baselineCompareVersion '1.5.0'
+//    baselineCompareVersion '1.5.0'
     skipAssertSigningConfiguration true
 
     developers {

diff --git a/src/test/java/com/auth0/AuthenticationControllerTest.java b/src/test/java/com/auth0/AuthenticationControllerTest.java
@@ -1,12 +1,7 @@
 package com.auth0;
 
-import com.auth0.client.HttpOptions;
 import com.auth0.client.auth.AuthAPI;
-import com.auth0.client.auth.AuthorizeUrlBuilder;
-import com.auth0.json.auth.TokenHolder;
 import com.auth0.jwk.JwkProvider;
-import com.auth0.net.Telemetry;
-import com.auth0.net.TokenRequest;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -80,25 +75,6 @@ public void setUp() {
 //
 //    }
 //
-//    @Test
-//    public void shouldCreateAuthAPIClientWithCustomHttpOptions() {
-//        HttpOptions options = new HttpOptions();
-//        options.setConnectTimeout(5);
-//        options.setReadTimeout(6);
-//
-//        ArgumentCaptor<HttpOptions> captor = ArgumentCaptor.forClass(HttpOptions.class);
-//        AuthenticationController.Builder spy = spy(AuthenticationController.newBuilder("domain", "clientId", "clientSecret")
-//                .withHttpOptions(options));
-//
-//        spy.build();
-//        verify(spy).createAPIClient(eq("domain"), eq("clientId"), eq("clientSecret"), captor.capture());
-//
-//        HttpOptions actual = captor.getValue();
-//        assertThat(actual, is(notNullValue()));
-//        assertThat(actual.getConnectTimeout(), is(5));
-//        assertThat(actual.getReadTimeout(), is(6));
-//    }
-
 //    @Test
 //    public void shouldDisableTelemetry() {
 //        AuthenticationController controller = builderSpy.build();

diff --git a/src/test/java/com/auth0/AuthorizeUrlTest.java b/src/test/java/com/auth0/AuthorizeUrlTest.java
@@ -1,10 +1,10 @@
 package com.auth0;
 
-import com.auth0.client.HttpOptions;
 import com.auth0.client.auth.AuthAPI;
 import com.auth0.exception.Auth0Exception;
 import com.auth0.json.auth.PushedAuthorizationResponse;
 import com.auth0.net.Request;
+import com.auth0.net.Response;
 import okhttp3.HttpUrl;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -244,67 +244,75 @@ public void shouldThrowWhenChangingTheNonceUsingCustomParameterSetter() {
         assertEquals("Please, use the dedicated methods for setting the 'nonce' and 'state' parameters.", e.getMessage());
     }
 
-//    @Test
-//    public void shouldGetAuthorizeUrlFromPAR() throws Exception {
-//        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
-//        Request requestMock = mock(Request.class);
-//
-//        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse("urn:example:bwc4JK-ESC0w8acc191e-Y1LTC2", 90));
-//
-//        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
-//        String url = new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
-//                .fromPushedAuthorizationRequest();
-//
-//        assertThat(url, is("https://domain.com/authorize?client_id=clientId&request_uri=urn%3Aexample%3Abwc4JK-ESC0w8acc191e-Y1LTC2"));
-//    }
-
-//    @Test
-//    public void fromPushedAuthorizationRequestThrowsWhenRequestUriIsNull() throws Exception {
-//        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
-//        Request requestMock = mock(Request.class);
-//        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse(null, 90));
-//
-//        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
-//
-//        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
-//            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
-//                    .fromPushedAuthorizationRequest();
-//        });
-//
-//        assertThat(exception.getMessage(), is("The PAR request returned a missing or empty request_uri value"));
-//    }
-
-//    @Test
-//    public void fromPushedAuthorizationRequestThrowsWhenRequestUriIsEmpty() throws Exception {
-//        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
-//        Request requestMock = mock(Request.class);
-//        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse("urn:example:bwc4JK-ESC0w8acc191e-Y1LTC2", null));
-//
-//        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
-//
-//        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
-//            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
-//                    .fromPushedAuthorizationRequest();
-//        });
-//
-//        assertThat(exception.getMessage(), is("The PAR request returned a missing expires_in value"));
-//    }
-
-//    @Test
-//    public void fromPushedAuthorizationRequestThrowsWhenExpiresInIsNull() throws Exception {
-//        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
-//        Request requestMock = mock(Request.class);
-//        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse(null, 90));
-//
-//        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
-//
-//        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
-//            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
-//                    .fromPushedAuthorizationRequest();
-//        });
-//
-//        assertThat(exception.getMessage(), is("The PAR request returned a missing or empty request_uri value"));
-//    }
+    @Test
+    public void shouldGetAuthorizeUrlFromPAR() throws Exception {
+        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
+        Request requestMock = mock(Request.class);
+
+        Response<PushedAuthorizationResponse> pushedAuthorizationResponseResponse = mock(Response.class);
+        when(requestMock.execute()).thenReturn(pushedAuthorizationResponseResponse);
+        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse("urn:example:bwc4JK-ESC0w8acc191e-Y1LTC2", 90));
+
+        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
+        String url = new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
+                .fromPushedAuthorizationRequest();
+
+        assertThat(url, is("https://domain.com/authorize?client_id=clientId&request_uri=urn%3Aexample%3Abwc4JK-ESC0w8acc191e-Y1LTC2"));
+    }
+
+    @Test
+    public void fromPushedAuthorizationRequestThrowsWhenRequestUriIsNull() throws Exception {
+        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
+        Request requestMock = mock(Request.class);
+        Response<PushedAuthorizationResponse> pushedAuthorizationResponseResponse = mock(Response.class);
+        when(requestMock.execute()).thenReturn(pushedAuthorizationResponseResponse);
+        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse(null, 90));
+
+        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
+
+        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
+            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
+                    .fromPushedAuthorizationRequest();
+        });
+
+        assertThat(exception.getMessage(), is("The PAR request returned a missing or empty request_uri value"));
+    }
+
+    @Test
+    public void fromPushedAuthorizationRequestThrowsWhenRequestUriIsEmpty() throws Exception {
+        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
+        Request requestMock = mock(Request.class);
+        Response<PushedAuthorizationResponse> pushedAuthorizationResponseResponse = mock(Response.class);
+        when(requestMock.execute()).thenReturn(pushedAuthorizationResponseResponse);
+        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse("urn:example:bwc4JK-ESC0w8acc191e-Y1LTC2", null));
+
+        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
+
+        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
+            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
+                    .fromPushedAuthorizationRequest();
+        });
+
+        assertThat(exception.getMessage(), is("The PAR request returned a missing expires_in value"));
+    }
+
+    @Test
+    public void fromPushedAuthorizationRequestThrowsWhenExpiresInIsNull() throws Exception {
+        AuthAPIStub authAPIStub = new AuthAPIStub("https://domain.com", "clientId", "clientSecret");
+        Request requestMock = mock(Request.class);
+        Response<PushedAuthorizationResponse> pushedAuthorizationResponseResponse = mock(Response.class);
+        when(requestMock.execute()).thenReturn(pushedAuthorizationResponseResponse);
+        when(requestMock.execute().getBody()).thenReturn(new PushedAuthorizationResponse(null, 90));
+
+        authAPIStub.pushedAuthorizationResponseRequest = requestMock;
+
+        InvalidRequestException exception = assertThrows(InvalidRequestException.class, () -> {
+            new AuthorizeUrl(authAPIStub, request, response, "https://domain.com/callback", "code")
+                    .fromPushedAuthorizationRequest();
+        });
+
+        assertThat(exception.getMessage(), is("The PAR request returned a missing or empty request_uri value"));
+    }
 
     @Test
     public void fromPushedAuthorizationRequestThrowsWhenRequestThrows() throws Exception {
@@ -329,10 +337,6 @@ static class AuthAPIStub extends AuthAPI {
 
         Request<PushedAuthorizationResponse> pushedAuthorizationResponseRequest;
 
-        public AuthAPIStub(String domain, String clientId, String clientSecret, HttpOptions options) {
-            super(domain, clientId, clientSecret, options);
-        }
-
         public AuthAPIStub(String domain, String clientId, String clientSecret) {
             super(domain, clientId, clientSecret);
         }