status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-28 10:14:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix cookies not being sent with <Image> network requests

Browse Source 
Reviewed By: pvulgaris

Differential Revision: D4669967

fbshipit-source-id: d26da8d3a60f71cf3751eb1c73974b0e57e59bed
This commit is contained in:
Oleg Lokhvitsky 2017-03-09 13:50:34 -08:00 committed by Facebook Github Bot
parent 231bf7c68b
commit d2796ea4ed
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ReactAndroid/src/main/java/com/facebook/react/modules/fresco/BUCK
View File

@ -19,6 +19,7 @@ android_library(
react_native_dep("third-party/android/support-annotations:android-support-annotations"), react_native_dep("third-party/android/support-annotations:android-support-annotations"),
react_native_dep("third-party/java/jsr-305:jsr-305"), react_native_dep("third-party/java/jsr-305:jsr-305"),
react_native_dep("third-party/java/okhttp:okhttp3"), react_native_dep("third-party/java/okhttp:okhttp3"),
react_native_dep("third-party/java/okhttp:okhttp3-urlconnection"),
react_native_target("java/com/facebook/react/bridge:bridge"), react_native_target("java/com/facebook/react/bridge:bridge"),
react_native_target("java/com/facebook/react/common:common"), react_native_target("java/com/facebook/react/common:common"),
react_native_target("java/com/facebook/react/module/annotations:annotations"), react_native_target("java/com/facebook/react/module/annotations:annotations"),

23
ReactAndroid/src/main/java/com/facebook/react/modules/fresco/FrescoModule.java
View File

@ -14,20 +14,24 @@ import java.util.HashSet;
import android.content.Context; import android.content.Context;
import android.support.annotation.Nullable; import android.support.annotation.Nullable;
import com.facebook.common.soloader.SoLoaderShim;
import com.facebook.common.logging.FLog; import com.facebook.common.logging.FLog;
import com.facebook.common.soloader.SoLoaderShim;
import com.facebook.drawee.backends.pipeline.Fresco; import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory; import com.facebook.imagepipeline.backends.okhttp3.OkHttpImagePipelineConfigFactory;
import com.facebook.imagepipeline.core.ImagePipelineConfig; import com.facebook.imagepipeline.core.ImagePipelineConfig;
import com.facebook.imagepipeline.listener.RequestListener; import com.facebook.imagepipeline.listener.RequestListener;
import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.common.ReactConstants; import com.facebook.react.common.ReactConstants;
import com.facebook.react.module.annotations.ReactModule; import com.facebook.react.module.annotations.ReactModule;
import com.facebook.react.modules.common.ModuleDataCleaner; import com.facebook.react.modules.common.ModuleDataCleaner;
import com.facebook.react.modules.network.CookieJarContainer;
import com.facebook.react.modules.network.ForwardingCookieHandler;
import com.facebook.react.modules.network.OkHttpClientProvider; import com.facebook.react.modules.network.OkHttpClientProvider;
import com.facebook.soloader.SoLoader; import com.facebook.soloader.SoLoader;
import okhttp3.JavaNetCookieJar;
import okhttp3.OkHttpClient; import okhttp3.OkHttpClient;
/** /**
@ -112,7 +116,7 @@ public class FrescoModule extends ReactContextBaseJavaModule implements
return sHasBeenInitialized; return sHasBeenInitialized;
} }
private static ImagePipelineConfig getDefaultConfig(Context context) { private static ImagePipelineConfig getDefaultConfig(ReactContext context) {
return getDefaultConfigBuilder(context).build(); return getDefaultConfigBuilder(context).build();
} }
@ -122,14 +126,21 @@ public class FrescoModule extends ReactContextBaseJavaModule implements
* *
* @return {@link ImagePipelineConfig.Builder} that has been initialized with default values * @return {@link ImagePipelineConfig.Builder} that has been initialized with default values
*/ */
public static ImagePipelineConfig.Builder getDefaultConfigBuilder(Context context) { public static ImagePipelineConfig.Builder getDefaultConfigBuilder(ReactContext context) {
HashSet<RequestListener> requestListeners = new HashSet<>(); HashSet<RequestListener> requestListeners = new HashSet<>();
requestListeners.add(new SystraceRequestListener()); requestListeners.add(new SystraceRequestListener());
OkHttpClient okHttpClient = OkHttpClientProvider.getOkHttpClient(); OkHttpClient client = OkHttpClientProvider.createClient();
// make sure to forward cookies for any requests via the okHttpClient
// so that image requests to endpoints that use cookies still work
CookieJarContainer container = (CookieJarContainer) client.cookieJar();
ForwardingCookieHandler handler = new ForwardingCookieHandler(context);
container.setCookieJar(new JavaNetCookieJar(handler));
return OkHttpImagePipelineConfigFactory return OkHttpImagePipelineConfigFactory
.newBuilder(context.getApplicationContext(), okHttpClient) .newBuilder(context.getApplicationContext(), client)
.setNetworkFetcher(new ReactOkHttpNetworkFetcher(okHttpClient)) .setNetworkFetcher(new ReactOkHttpNetworkFetcher(client))
.setDownsampleEnabled(false) .setDownsampleEnabled(false)
.setRequestListeners(requestListeners); .setRequestListeners(requestListeners);
} }