fix getProfileAfter sync

auth0 · Nov 24, 2016 · 59edd73 · 59edd73
1 parent 098c234
commit 59edd73
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/auth0/src/main/java/com/auth0/android/authentication/request/ProfileRequest.java b/auth0/src/main/java/com/auth0/android/authentication/request/ProfileRequest.java
@@ -97,7 +97,6 @@ public void start(final BaseCallback<Authentication, AuthenticationException> ca
             public void onSuccess(final Credentials credentials) {
                 userInfoRequest
                         .addHeader(HEADER_AUTHORIZATION, "Bearer " + credentials.getAccessToken())
-                        .addParameter(ACCESS_TOKEN_KEY, credentials.getAccessToken())
                         .start(new BaseCallback<UserProfile, AuthenticationException>() {
                             @Override
                             public void onSuccess(UserProfile profile) {
@@ -128,7 +127,7 @@ public void onFailure(AuthenticationException error) {
     public Authentication execute() throws Auth0Exception {
         Credentials credentials = credentialsRequest.execute();
         UserProfile profile = userInfoRequest
-                .addParameter(ACCESS_TOKEN_KEY, credentials.getAccessToken())
+                .addHeader(HEADER_AUTHORIZATION, "Bearer " + credentials.getAccessToken())
                 .execute();
         return new Authentication(profile, credentials);
     }

diff --git a/auth0/src/test/java/com/auth0/android/authentication/AuthenticationAPIClientTest.java b/auth0/src/test/java/com/auth0/android/authentication/AuthenticationAPIClientTest.java
@@ -1336,6 +1336,29 @@ public void shouldFetchProfileAfterLoginRequest() throws Exception {
         assertThat(callback, hasPayloadOfType(Authentication.class));
     }
 
+    @Test
+    public void shouldFetchProfileSyncAfterLoginRequest() throws Exception {
+        mockAPI.willReturnSuccessfulLogin()
+                .willReturnTokenInfo();
+
+        Authentication authentication = client.getProfileAfter(client.login(SUPPORT_AUTH0_COM, "voidpassword", MY_CONNECTION))
+                .execute();
+
+        final RecordedRequest firstRequest = mockAPI.takeRequest();
+        assertThat(firstRequest.getPath(), equalTo("/oauth/ro"));
+
+        Map<String, String> body = bodyFromRequest(firstRequest);
+        assertThat(body, hasEntry("username", SUPPORT_AUTH0_COM));
+        assertThat(body, hasEntry("password", "voidpassword"));
+        assertThat(body, hasEntry("connection", MY_CONNECTION));
+
+        final RecordedRequest secondRequest = mockAPI.takeRequest();
+        assertThat(secondRequest.getHeader("Authorization"), is("Bearer " + AuthenticationAPI.ACCESS_TOKEN));
+        assertThat(secondRequest.getPath(), equalTo("/userinfo"));
+
+        assertThat(authentication, is(notNullValue()));
+    }
+
     @Test
     public void shouldGetOAuthTokensUsingCodeVerifier() throws Exception {
         mockAPI.willReturnTokens()

diff --git a/auth0/src/test/java/com/auth0/android/authentication/request/ProfileRequestTest.java b/auth0/src/test/java/com/auth0/android/authentication/request/ProfileRequestTest.java
@@ -146,6 +146,7 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
         });
         final UserProfile userProfile = mock(UserProfile.class);
         when(userInfoMockRequest.addParameter(anyString(), anyObject())).thenReturn(userInfoMockRequest);
+        when(userInfoMockRequest.addHeader(anyString(), anyString())).thenReturn(userInfoMockRequest);
         when(userInfoMockRequest.execute()).thenAnswer(new Answer<Object>() {
             @Override
             public Object answer(InvocationOnMock invocation) throws Throwable {