@exodus/react-native-webview 11.26.1-exodus.33 → 11.26.1-exodus.35

package/android/src/main/java/com/reactnativecommunity/webview/RNCWebViewManager.java

@@ -226,14 +226,14 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     return  mDownloadingMessage == null ? DEFAULT_LACK_PERMISSION_TO_DOWNLOAD_MESSAGE : mLackPermissionToDownloadMessage;
   }
 
-  @ReactProp(name = "cameraPermissionWhitelist")
-  public void setCameraPermissionWhitelist(RNCWebView webView, ReadableArray whitelist) {
+  @ReactProp(name = "cameraPermissionOriginWhitelist")
+  public void setCameraPermissionOriginWhitelist(RNCWebView webView, ReadableArray whitelist) {
     Set<String> whitelistSet = new HashSet<>();
     for (int i = 0; i < whitelist.size(); i++) {
       whitelistSet.add(whitelist.getString(i));
     }
 
-    mWebChromeClient.setCameraPermissionWhitelist(whitelistSet);
+    mWebChromeClient.setCameraPermissionOriginWhitelist(whitelistSet);
   }
 
   @ReactProp(name = "javaScriptEnabled")
@@ -1002,15 +1002,15 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     // True if protected media should be allowed, false otherwise
     protected boolean mAllowsProtectedMedia = false;
-    private Set<String> cameraPermissionWhitelist = new HashSet<>();
+    private Set<String> cameraPermissionOriginWhitelist = new HashSet<>();
 
     public RNCWebChromeClient(ReactContext reactContext, WebView webView) {
       this.mReactContext = reactContext;
       this.mWebView = webView;
     }
 
-    public void setCameraPermissionWhitelist(Set<String> whitelist) {
-      this.cameraPermissionWhitelist = whitelist;
+    public void setCameraPermissionOriginWhitelist(Set<String> whitelist) {
+      this.cameraPermissionOriginWhitelist = whitelist;
     }
 
     @Override
@@ -1074,21 +1074,19 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       grantedPermissions = new ArrayList<>();
 
       ArrayList<String> requestedAndroidPermissions = new ArrayList<>();
-      String originUrl = request.getOrigin().toString();
-      String originHost;
-
-      try {
-        URL url = new URL(originUrl);
-        originHost = url.getHost();
-      } catch (MalformedURLException e) {
-        request.deny();
-        return;
+      final Uri originUri = request.getOrigin();
+      final String scheme = originUri.getScheme();
+      final int port = originUri.getPort();
+      String origin = scheme + "://" + originUri.getHost();
+
+      if (port > 0 && ((scheme == "http" && port != 80) || (scheme == "https" && port != 443))) {
+        origin += ":" + port;
       }
 
       for (String requestedResource : request.getResources()) {
         String androidPermission = null;
 
-        if (this.cameraPermissionWhitelist.contains(originHost)) {
+        if (this.cameraPermissionOriginWhitelist.contains(origin)) {
           if (requestedResource.equals(PermissionRequest.RESOURCE_VIDEO_CAPTURE)) {
             androidPermission = Manifest.permission.CAMERA;
           } else if (requestedResource.equals(PermissionRequest.RESOURCE_AUDIO_CAPTURE)) {

package/apple/RNCWebView.m

@@ -22,7 +22,7 @@ static NSString *const HistoryShimName = @"ReactNativeHistoryShim";
 static NSString *const MessageHandlerName = @"ReactNativeWebView";
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
-static NSSet *cameraPermissionWhitelist;
+static NSSet *cameraPermissionOriginWhitelist;
 
 NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 
@@ -71,7 +71,7 @@ RCTAutoInsetsProtocol>
 @property (nonatomic, strong) WKUserScript *postMessageScript;
 @property (nonatomic, strong) WKUserScript *atStartScript;
 @property (nonatomic, strong) WKUserScript *atEndScript;
-@property (nonatomic, strong) NSArray<NSString *> *cameraPermissionWhitelist;
+@property (nonatomic, strong) NSArray<NSString *> *cameraPermissionOriginWhitelist;
 @end
 
 @implementation RNCWebView
@@ -1056,24 +1056,16 @@ RCTAutoInsetsProtocol>
                         initiatedByFrame:(WKFrameInfo *)frame
                                     type:(WKMediaCaptureType)type
                          decisionHandler:(void (^)(WKPermissionDecision decision))decisionHandler {
-  if (![self.cameraPermissionWhitelist containsObject:origin.host]) {
-    decisionHandler(WKPermissionDecisionDeny);
-    return;
+  NSString *originString = [NSString stringWithFormat:@"%@://%@", origin.protocol, origin.host];
+
+  if (origin.port > 0 && (([origin.protocol isEqualToString:@"http"] && origin.port != 80) || ([origin.protocol isEqualToString:@"https"] && origin.port != 443))) {
+    originString = [originString stringByAppendingFormat:@":%ld", (long)origin.port];
   }
 
-  if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt || _mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElseDeny) {
-    if ([origin.host isEqualToString:webView.URL.host]) {
-      decisionHandler(WKPermissionDecisionGrant);
-    } else {
-      WKPermissionDecision decision = _mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_GrantIfSameHost_ElsePrompt ? WKPermissionDecisionPrompt : WKPermissionDecisionDeny;
-      decisionHandler(decision);
-    }
-  } else if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_Deny) {
-    decisionHandler(WKPermissionDecisionDeny);
-  } else if (_mediaCapturePermissionGrantType == RNCWebViewPermissionGrantType_Grant) {
+  if ([self.cameraPermissionOriginWhitelist containsObject:originString]) {
     decisionHandler(WKPermissionDecisionGrant);
   } else {
-    decisionHandler(WKPermissionDecisionPrompt);
+    decisionHandler(WKPermissionDecisionDeny);
   }
 }
 #endif

package/apple/RNCWebViewManager.m

@@ -78,7 +78,7 @@ RCT_EXPORT_VIEW_PROPERTY(pagingEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(cacheEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(allowsLinkPreview, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(basicAuthCredential, NSDictionary)
-RCT_EXPORT_VIEW_PROPERTY(cameraPermissionWhitelist, NSArray)
+RCT_EXPORT_VIEW_PROPERTY(cameraPermissionOriginWhitelist, NSArray)
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
 RCT_EXPORT_VIEW_PROPERTY(contentInsetAdjustmentBehavior, UIScrollViewContentInsetAdjustmentBehavior)

package/lib/WebView.android.js

@@ -5,7 +5,7 @@ import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
 import codegenNativeCommandsUntyped from 'react-native/Libraries/Utilities/codegenNativeCommands';
 import invariant from 'invariant';
 import RNCWebView from "./WebViewNativeComponent.android";
-import { defaultOriginWhitelist, defaultDeeplinkWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, removeHttpsFromOrigins, } from './WebViewShared';
+import { defaultOriginWhitelist, defaultDeeplinkWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, } from './WebViewShared';
 import styles from './WebView.styles';
 import validateProps from './validation';
 const { getWebViewDefaultUserAgent } = NativeModules.RNCWebViewUtils;
@@ -34,7 +34,7 @@ const mixedContentMode = 'never';
 const hardMinimumChromeVersion = '100.0'; // TODO: determinime a good lower bound
 const WebViewComponent = forwardRef((props, ref) => {
     var _a;
-    const { overScrollMode = 'always', javaScriptEnabled = true, thirdPartyCookiesEnabled = true, scalesPageToFit = true, saveFormDataDisabled = false, cacheEnabled = true, cameraPermissionWhitelist = [], androidHardwareAccelerationDisabled = false, androidLayerType = "none", originWhitelist = defaultOriginWhitelist, deeplinkWhitelist = defaultDeeplinkWhitelist, setBuiltInZoomControls = true, setDisplayZoomControls = false, nestedScrollEnabled = false, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, onOpenWindow: onOpenWindowProp, renderLoading, renderError, style, containerStyle, source, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, validateMeta, validateData, minimumChromeVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps } = validateProps(props);
+    const { overScrollMode = 'always', javaScriptEnabled = true, thirdPartyCookiesEnabled = true, scalesPageToFit = true, saveFormDataDisabled = false, cacheEnabled = true, androidHardwareAccelerationDisabled = false, androidLayerType = "none", originWhitelist = defaultOriginWhitelist, deeplinkWhitelist = defaultDeeplinkWhitelist, setBuiltInZoomControls = true, setDisplayZoomControls = false, nestedScrollEnabled = false, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, onOpenWindow: onOpenWindowProp, renderLoading, renderError, style, containerStyle, source, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, validateMeta, validateData, minimumChromeVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps } = validateProps(props);
     const messagingModuleName = useRef(`WebViewMessageHandler${uniqueRef += 1}`).current;
     const webViewRef = useRef(null);
     const onShouldStartLoadWithRequestCallback = useCallback((shouldStart, url, lockIdentifier) => {
@@ -124,7 +124,7 @@ const WebViewComponent = forwardRef((props, ref) => {
     }
     const safeSource = (typeof source === "object" && 'uri' in source && !passesWhitelist(source.uri)) ? { uri: 'about:blank' } : source;
     const NativeWebView = RNCWebView;
-    const webView = <NativeWebView key="webViewKey" {...otherProps} cameraPermissionWhitelist={removeHttpsFromOrigins(cameraPermissionWhitelist)} messagingEnabled={typeof onMessageProp === 'function'} messagingModuleName={messagingModuleName} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onOpenWindow={onOpenWindow} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} ref={webViewRef} 
+    const webView = <NativeWebView key="webViewKey" {...otherProps} messagingEnabled={typeof onMessageProp === 'function'} messagingModuleName={messagingModuleName} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onOpenWindow={onOpenWindow} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} ref={webViewRef} 
     // TODO: find a better way to type this.
     source={safeSource} style={webViewStyles} overScrollMode={overScrollMode} javaScriptEnabled={javaScriptEnabled} thirdPartyCookiesEnabled={thirdPartyCookiesEnabled} scalesPageToFit={scalesPageToFit} saveFormDataDisabled={saveFormDataDisabled} cacheEnabled={cacheEnabled} androidHardwareAccelerationDisabled={androidHardwareAccelerationDisabled} androidLayerType={androidLayerType} setSupportMultipleWindows={setSupportMultipleWindows} setBuiltInZoomControls={setBuiltInZoomControls} setDisplayZoomControls={setDisplayZoomControls} mixedContentMode={mixedContentMode} nestedScrollEnabled={nestedScrollEnabled} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction}/>;
     return (<View style={webViewContainerStyle}>

package/lib/WebView.ios.js

@@ -4,7 +4,7 @@ import invariant from 'invariant';
 // @ts-expect-error react-native doesn't have this type
 import codegenNativeCommandsUntyped from 'react-native/Libraries/Utilities/codegenNativeCommands';
 import RNCWebView from "./WebViewNativeComponent.ios";
-import { defaultOriginWhitelist, defaultDeeplinkWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, removeHttpsFromOrigins, } from './WebViewShared';
+import { defaultOriginWhitelist, defaultDeeplinkWhitelist, defaultRenderError, defaultRenderLoading, useWebWiewLogic, versionPasses, } from './WebViewShared';
 import styles from './WebView.styles';
 import validateProps from './validation';
 const codegenNativeCommands = codegenNativeCommandsUntyped;
@@ -41,7 +41,7 @@ const enableApplePay = false;
 const dataDetectorTypes = 'none';
 const hardMinimumIOSVersion = '12.5.6 <13, 13.6.1 <14, 14.8.1 <15, 15.7.1';
 const WebViewComponent = forwardRef((props, ref) => {
-    const { javaScriptEnabled = true, cacheEnabled = true, cameraPermissionWhitelist = [], originWhitelist = defaultOriginWhitelist, deeplinkWhitelist = defaultDeeplinkWhitelist, textInteractionEnabled = true, injectedJavaScript, injectedJavaScriptBeforeContentLoaded, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, renderLoading, renderError, style, containerStyle, source, incognito, validateMeta, validateData, decelerationRate: decelerationRateProp, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, minimumIOSVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps } = validateProps(props);
+    const { javaScriptEnabled = true, cacheEnabled = true, originWhitelist = defaultOriginWhitelist, deeplinkWhitelist = defaultDeeplinkWhitelist, textInteractionEnabled = true, injectedJavaScript, injectedJavaScriptBeforeContentLoaded, startInLoadingState, onLoadStart, onError, onLoad, onLoadEnd, onMessage: onMessageProp, renderLoading, renderError, style, containerStyle, source, incognito, validateMeta, validateData, decelerationRate: decelerationRateProp, onShouldStartLoadWithRequest: onShouldStartLoadWithRequestProp, minimumIOSVersion, unsupportedVersionComponent: UnsupportedVersionComponent, ...otherProps } = validateProps(props);
     const webViewRef = useRef(null);
     const onShouldStartLoadWithRequestCallback = useCallback((shouldStart, _url, lockIdentifier = 0) => {
         const viewManager = RNCWebViewManager;
@@ -105,7 +105,7 @@ const WebViewComponent = forwardRef((props, ref) => {
     const webViewContainerStyle = [styles.container, containerStyle];
     const decelerationRate = processDecelerationRate(decelerationRateProp);
     const NativeWebView = RNCWebView;
-    const webView = (<NativeWebView key="webViewKey" {...otherProps} enableApplePay={enableApplePay} javaScriptEnabled={javaScriptEnabled} cacheEnabled={cacheEnabled} cameraPermissionWhitelist={removeHttpsFromOrigins(cameraPermissionWhitelist)} dataDetectorTypes={dataDetectorTypes} useSharedProcessPool={useSharedProcessPool} textInteractionEnabled={textInteractionEnabled} decelerationRate={decelerationRate} messagingEnabled={typeof onMessageProp === 'function'} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} injectedJavaScript={injectedJavaScript} injectedJavaScriptBeforeContentLoaded={injectedJavaScriptBeforeContentLoaded} allowsInlineMediaPlayback={allowsInlineMediaPlayback} incognito={incognito} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction} ref={webViewRef} sharedCookiesEnabled={sharedCookiesEnabled} 
+    const webView = (<NativeWebView key="webViewKey" {...otherProps} enableApplePay={enableApplePay} javaScriptEnabled={javaScriptEnabled} cacheEnabled={cacheEnabled} dataDetectorTypes={dataDetectorTypes} useSharedProcessPool={useSharedProcessPool} textInteractionEnabled={textInteractionEnabled} decelerationRate={decelerationRate} messagingEnabled={typeof onMessageProp === 'function'} onLoadingError={onLoadingError} onLoadingFinish={onLoadingFinish} onLoadingProgress={onLoadingProgress} onLoadingStart={onLoadingStart} onMessage={onMessage} onShouldStartLoadWithRequest={onShouldStartLoadWithRequest} injectedJavaScript={injectedJavaScript} injectedJavaScriptBeforeContentLoaded={injectedJavaScriptBeforeContentLoaded} allowsInlineMediaPlayback={allowsInlineMediaPlayback} incognito={incognito} mediaPlaybackRequiresUserAction={mediaPlaybackRequiresUserAction} ref={webViewRef} sharedCookiesEnabled={sharedCookiesEnabled} 
     // TODO: find a better way to type this.
     source={source} style={webViewStyles}/>);
     return (<View style={webViewContainerStyle}>

package/lib/WebViewShared.d.ts

@@ -34,5 +34,4 @@ export declare const useWebWiewLogic: ({ startInLoadingState, onLoadStart, onLoa
     lastErrorEvent: WebViewError | null;
 };
 export declare const versionPasses: (version: string | undefined, minimum: string | undefined) => boolean;
-export declare const removeHttpsFromOrigins: (whitelist: string[]) => string[];
 //# sourceMappingURL=WebViewShared.d.ts.map

package/lib/WebViewShared.js

@@ -144,9 +144,15 @@ export const useWebWiewLogic = ({ startInLoadingState, onLoadStart, onLoad, onLo
         if (!passesWhitelistUse(nativeEvent.url))
             return;
         // TODO: can/should we perform any other validation?
-        const data = JSON.stringify(validateData(JSON.parse(nativeEvent.data)));
-        const meta = validateMeta(extractMeta(nativeEvent));
-        onMessageProp === null || onMessageProp === void 0 ? void 0 : onMessageProp({ ...meta, data });
+        try {
+            const parsedData = JSON.parse(nativeEvent.data);
+            const data = JSON.stringify(validateData(parsedData));
+            const meta = validateMeta(extractMeta(nativeEvent));
+            onMessageProp === null || onMessageProp === void 0 ? void 0 : onMessageProp({ ...meta, data });
+        }
+        catch (err) {
+            console.error('Error parsing WebView message', err);
+        }
     }, [onMessageProp, passesWhitelistUse, validateData, validateMeta]);
     const onLoadingProgress = useCallback((event) => {
         const { nativeEvent: { progress } } = event;
@@ -215,6 +221,3 @@ export const versionPasses = (version, minimum) => {
     }
     return true; // equals
 };
-export const removeHttpsFromOrigins = (whitelist) => {
-    return whitelist.map((origin) => origin.replace('https://', ''));
-};

package/lib/WebViewTypes.d.ts

@@ -145,7 +145,7 @@ export interface BasicAuthCredential {
 }
 export interface CommonNativeWebViewProps extends ViewProps {
     cacheEnabled?: boolean;
-    cameraPermissionWhitelist?: string[];
+    cameraPermissionOriginWhitelist?: string[];
     incognito?: boolean;
     injectedJavaScript?: string;
     injectedJavaScriptBeforeContentLoaded?: string;
@@ -639,7 +639,7 @@ export interface WebViewSharedProps extends ViewProps {
     /**
      * Defines a list of domain origins that can access camera.
      */
-    readonly cameraPermissionWhitelist?: string[];
+    readonly cameraPermissionOriginWhitelist?: string[];
     /**
      * Stylesheet object to set the style of the container view.
      */

package/package.json

@@ -9,7 +9,7 @@
     "Thibault Malbranche <malbranche.thibault@gmail.com>"
   ],
   "license": "MIT",
-  "version": "11.26.1-exodus.33",
+  "version": "11.26.1-exodus.35",
   "homepage": "https://github.com/ExodusMovement/react-native-webview#readme",
   "scripts": {
     "android": "react-native run-android",
@@ -72,6 +72,7 @@
   "files": [
     "android",
     "!android/.gradle",
+    "!android/build",
     "apple",
     "ios",
     "lib",

package/android/build/.transforms/bd1c9282aaabf4a0d1b6bb39aff484a4/results.bin

@@ -1 +0,0 @@
-o/classes

package/android/build/generated/source/buildConfig/debug/com/reactnativecommunity/webview/BuildConfig.java

@@ -1,10 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.reactnativecommunity.webview;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String LIBRARY_PACKAGE_NAME = "com.reactnativecommunity.webview";
-  public static final String BUILD_TYPE = "debug";
-}

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.reactnativecommunity.webview" >
-
-    <uses-sdk
-        android:minSdkVersion="23"
-        android:targetSdkVersion="29" />
-
-    <uses-feature android:name="android.hardware.camera.any" />
-
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
-    <application>
-        <provider
-            android:name="com.reactnativecommunity.webview.RNCWebViewFileProvider"
-            android:authorities="dollar_openBracket_applicationId_closeBracket.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true" >
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_provider_paths" />
-        </provider>
-    </application>
-
-</manifest>

package/android/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json

@@ -1,18 +0,0 @@
-{
-  "version": 3,
-  "artifactType": {
-    "type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
-    "kind": "Directory"
-  },
-  "applicationId": "com.reactnativecommunity.webview",
-  "variantName": "debug",
-  "elements": [
-    {
-      "type": "SINGLE",
-      "filters": [],
-      "attributes": [],
-      "outputFile": "AndroidManifest.xml"
-    }
-  ],
-  "elementType": "File"
-}

package/android/build/intermediates/aar_metadata/debug/aar-metadata.properties

@@ -1,4 +0,0 @@
-aarFormatVersion=1.0
-aarMetadataVersion=1.0
-minCompileSdk=1
-minAndroidGradlePluginVersion=1.0.0

package/android/build/intermediates/annotation_processor_list/debug/annotationProcessors.json

@@ -1 +0,0 @@
-{}