Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BREAKING: Android: Support withCredentials flag in XHRs #12276

Closed
wants to merge 2 commits into from
Closed

BREAKING: Android: Support withCredentials flag in XHRs #12276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cded45
Breaking Change: Android: Support withCredentials flag in XHRs
Feb 8, 2017
b2d15e5
Merge branch 'master' into rigdern/androidXhrWithCreds
ericnakagawa Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Libraries/Network/RCTNetworking.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ class RCTNetworking extends NativeEventEmitter {
responseType: 'text' | 'base64',
incrementalUpdates: boolean,
timeout: number,
callback: (requestId: number) => any
callback: (requestId: number) => any,
withCredentials: boolean
) {
const body = convertRequestBody(data);
if (body && body.formData) {
Expand All @@ -74,7 +75,8 @@ class RCTNetworking extends NativeEventEmitter {
{...body, trackingName},
responseType,
incrementalUpdates,
timeout
timeout,
withCredentials
);
callback(requestId);
}
Expand Down
8 changes: 7 additions & 1 deletion ReactAndroid/src/main/java/com/facebook/react/modules/network/NetworkingModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@

import okhttp3.Call;
import okhttp3.Callback;
import okhttp3.CookieJar;
import okhttp3.Headers;
import okhttp3.Interceptor;
import okhttp3.JavaNetCookieJar;
Expand Down Expand Up @@ -167,7 +168,8 @@ public void sendRequest(
ReadableMap data,
final String responseType,
final boolean useIncrementalUpdates,
int timeout) {
int timeout,
boolean withCredentials) {
Request.Builder requestBuilder = new Request.Builder().url(url);

if (requestId != 0) {
Expand All @@ -177,6 +179,10 @@ public void sendRequest(
final RCTDeviceEventEmitter eventEmitter = getEventEmitter(executorToken);
OkHttpClient.Builder clientBuilder = mClient.newBuilder();

if (!withCredentials) {
clientBuilder.cookieJar(CookieJar.NO_COOKIES);
}

// If JS is listening for progress updates, install a ProgressResponseBody that intercepts the
// response and counts bytes received.
if (useIncrementalUpdates) {
Expand Down
30 changes: 20 additions & 10 deletions ReactAndroid/src/test/java/com/facebook/react/modules/network/NetworkingModuleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
/* body */ null,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
verify(httpClient).newCall(argumentCaptor.capture());
Expand Down Expand Up @@ -135,7 +136,8 @@ public void testFailGetWithInvalidHeadersStruct() throws Exception {
/* body */ null,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

verifyErrorEmit(emitter, 0);
}
Expand Down Expand Up @@ -166,7 +168,8 @@ public void testFailPostWithoutContentType() throws Exception {
body,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

verifyErrorEmit(emitter, 0);
}
Expand Down Expand Up @@ -227,7 +230,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
body,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
verify(httpClient).newCall(argumentCaptor.capture());
Expand Down Expand Up @@ -270,7 +274,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
null,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);
ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
verify(httpClient).newCall(argumentCaptor.capture());
Headers requestHeaders = argumentCaptor.getValue().headers();
Expand Down Expand Up @@ -324,7 +329,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
body,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

// verify url, method, headers
ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
Expand Down Expand Up @@ -389,7 +395,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
body,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

// verify url, method, headers
ArgumentCaptor<Request> argumentCaptor = ArgumentCaptor.forClass(Request.class);
Expand Down Expand Up @@ -492,7 +499,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
body,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
/* timeout */ 0);
/* timeout */ 0,
/* withCredentials */ false);

// verify RequestBodyPart for image
PowerMockito.verifyStatic(times(1));
Expand Down Expand Up @@ -556,7 +564,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
null,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
0);
/* timeout */ 0,
/* withCredentials */ false);
}
verify(httpClient, times(3)).newCall(any(Request.class));

Expand Down Expand Up @@ -606,7 +615,8 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
null,
/* responseType */ "text",
/* useIncrementalUpdates*/ true,
0);
/* timeout */ 0,
/* withCredentials */ false);
}
verify(httpClient, times(3)).newCall(any(Request.class));

Expand Down