@exodus/react-native-webview 11.26.1-exodus.32 → 11.26.1-exodus.34

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

@@ -166,13 +166,7 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
   protected @Nullable String mDownloadingMessage = null;
   protected @Nullable String mLackPermissionToDownloadMessage = null;
 
-  private static Set<String> cameraPermissionOriginWhitelist;
-
   public RNCWebViewManager() {
-    cameraPermissionOriginWhitelist = new HashSet<>();
-    cameraPermissionOriginWhitelist.add("https://alchemy.veriff.com/");
-    cameraPermissionOriginWhitelist.add("https://magic.veriff.me/");
-
     mWebViewConfig = new WebViewConfig() {
       public void configWebView(WebView webView) {
       }
@@ -232,6 +226,16 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
     return  mDownloadingMessage == null ? DEFAULT_LACK_PERMISSION_TO_DOWNLOAD_MESSAGE : mLackPermissionToDownloadMessage;
   }
 
+  @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.setCameraPermissionOriginWhitelist(whitelistSet);
+  }
+
   @ReactProp(name = "javaScriptEnabled")
   public void setJavaScriptEnabled(WebView view, boolean enabled) {
     view.getSettings().setJavaScriptEnabled(enabled);
@@ -998,12 +1002,17 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
 
     // True if protected media should be allowed, false otherwise
     protected boolean mAllowsProtectedMedia = false;
+    private Set<String> cameraPermissionOriginWhitelist = new HashSet<>();
 
     public RNCWebChromeClient(ReactContext reactContext, WebView webView) {
       this.mReactContext = reactContext;
       this.mWebView = webView;
     }
 
+    public void setCameraPermissionOriginWhitelist(Set<String> whitelist) {
+      this.cameraPermissionOriginWhitelist = whitelist;
+    }
+
     @Override
     public boolean onCreateWindow(WebView view, boolean isDialog, boolean isUserGesture, Message resultMsg) {
 
@@ -1065,11 +1074,19 @@ public class RNCWebViewManager extends SimpleViewManager<WebView> {
       grantedPermissions = new ArrayList<>();
 
       ArrayList<String> requestedAndroidPermissions = new ArrayList<>();
+      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 (cameraPermissionOriginWhitelist.contains(request.getOrigin().toString())) {
+        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,6 +22,7 @@ static NSString *const HistoryShimName = @"ReactNativeHistoryShim";
 static NSString *const MessageHandlerName = @"ReactNativeWebView";
 static NSURLCredential* clientAuthenticationCredential;
 static NSDictionary* customCertificatesForHost;
+static NSSet *cameraPermissionOriginWhitelist;
 
 NSString *const CUSTOM_SELECTOR = @"_CUSTOM_SELECTOR_";
 
@@ -70,6 +71,7 @@ RCTAutoInsetsProtocol>
 @property (nonatomic, strong) WKUserScript *postMessageScript;
 @property (nonatomic, strong) WKUserScript *atStartScript;
 @property (nonatomic, strong) WKUserScript *atEndScript;
+@property (nonatomic, strong) NSArray<NSString *> *cameraPermissionOriginWhitelist;
 @end
 
 @implementation RNCWebView
@@ -1054,19 +1056,16 @@ RCTAutoInsetsProtocol>
                         initiatedByFrame:(WKFrameInfo *)frame
                                     type:(WKMediaCaptureType)type
                          decisionHandler:(void (^)(WKPermissionDecision decision))decisionHandler {
-  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) {
+  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 ([self.cameraPermissionOriginWhitelist containsObject:originString]) {
     decisionHandler(WKPermissionDecisionGrant);
   } else {
-    decisionHandler(WKPermissionDecisionPrompt);
+    decisionHandler(WKPermissionDecisionDeny);
   }
 }
 #endif

package/apple/RNCWebViewManager.m

@@ -78,6 +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(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/WebViewShared.js

@@ -99,7 +99,7 @@ export const useWebWiewLogic = ({ startInLoadingState, onLoadStart, onLoad, onLo
     const extractMeta = (nativeEvent) => ({
         url: String(nativeEvent.url),
         loading: Boolean(nativeEvent.loading),
-        title: String(nativeEvent.title),
+        title: String(nativeEvent.title).slice(0, 512),
         canGoBack: Boolean(nativeEvent.canGoBack),
         canGoForward: Boolean(nativeEvent.canGoForward),
         lockIdentifier: Number(nativeEvent.lockIdentifier),

package/lib/WebViewTypes.d.ts

@@ -145,6 +145,7 @@ export interface BasicAuthCredential {
 }
 export interface CommonNativeWebViewProps extends ViewProps {
     cacheEnabled?: boolean;
+    cameraPermissionOriginWhitelist?: string[];
     incognito?: boolean;
     injectedJavaScript?: string;
     injectedJavaScriptBeforeContentLoaded?: string;
@@ -635,6 +636,10 @@ export interface WebViewSharedProps extends ViewProps {
      * @platform android
      */
     javaScriptEnabled?: boolean;
+    /**
+     * Defines a list of domain origins that can access camera.
+     */
+    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.32",
+  "version": "11.26.1-exodus.34",
   "homepage": "https://github.com/ExodusMovement/react-native-webview#readme",
   "scripts": {
     "android": "react-native run-android",

package/.all-contributorsrc

@@ -1,185 +0,0 @@
-{
-  "projectName": "react-native-webview",
-  "projectOwner": "react-native-webview",
-  "repoType": "github",
-  "repoHost": "https://github.com",
-  "files": [
-    "README.md"
-  ],
-  "imageSize": 100,
-  "commit": false,
-  "contributors": [
-    {
-      "login": "titozzz",
-      "name": "Thibault Malbranche",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/6181446?v=4",
-      "profile": "https://twitter.com/titozzz",
-      "contributions": [
-        "code",
-        "ideas",
-        "review",
-        "doc",
-        "maintenance",
-        "test",
-        "infra",
-        "question"
-      ]
-    },
-    {
-      "login": "jamonholmgren",
-      "name": "Jamon Holmgren",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/1479215?v=4",
-      "profile": "https://jamonholmgren.com",
-      "contributions": [
-        "code",
-        "ideas",
-        "review",
-        "doc",
-        "maintenance",
-        "test",
-        "example",
-        "question"
-      ]
-    },
-    {
-      "login": "andreipfeiffer",
-      "name": "Andrei Pfeiffer",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/2570562?v=4",
-      "profile": "https://github.com/andreipfeiffer",
-      "contributions": [
-        "code",
-        "review",
-        "ideas"
-      ]
-    },
-    {
-      "login": "Salakar",
-      "name": "Michael Diarmid",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/5347038?v=4",
-      "profile": "https://twitter.com/mikediarmid",
-      "contributions": [
-        "code",
-        "review",
-        "ideas",
-        "tool"
-      ]
-    },
-    {
-      "login": "smathson",
-      "name": "Scott Mathson",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/932981?v=4",
-      "profile": "http://smathson.github.io",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "YangXiaomei",
-      "name": "Margaret",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/8221990?v=4",
-      "profile": "https://github.com/YangXiaomei",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "jordansexton",
-      "name": "Jordan Sexton",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/1173161?v=4",
-      "profile": "https://stylisted.com",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "MalcolmScruggs",
-      "name": "Malcolm Scruggs",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/22333355?v=4",
-      "profile": "https://github.com/MalcolmScruggs",
-      "contributions": [
-        "code",
-        "tool",
-        "test"
-      ]
-    },
-    {
-      "login": "Momazo7u7",
-      "name": "Momazo7u7",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/42069617?v=4",
-      "profile": "https://github.com/Momazo7u7",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "marconett",
-      "name": "Marco",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/3315507?v=4",
-      "profile": "https://marco-nett.de",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "jeluard",
-      "name": "Julien Eluard",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/359723?v=4",
-      "profile": "https://github.com/jeluard",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "CubeSugar",
-      "name": "Jian Wei",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/3667305?v=4",
-      "profile": "https://github.com/CubeSugar",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "svbutko",
-      "name": "Sergei Butko",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/14828004?v=4",
-      "profile": "https://www.linkedin.com/in/svbutko/",
-      "contributions": [
-        "doc"
-      ]
-    },
-    {
-      "login": "TMomemt",
-      "name": "TMomemt",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/42024947?v=4",
-      "profile": "https://github.com/TMomemt",
-      "contributions": [
-        "code"
-      ]
-    },
-    {
-      "login": "ericlewis",
-      "name": "Eric Lewis",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/674503?v=4",
-      "profile": "http://www.try.com",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    },
-    {
-      "login": "dvicory",
-      "name": "Daniel Vicory",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/1542454?v=4",
-      "profile": "https://bzfx.net",
-      "contributions": [
-        "code",
-        "doc"
-      ]
-    }
-  ],
-  "contributorsPerLine": 7
-}

package/.circleci/config.yml

@@ -1,66 +0,0 @@
-defaults: &defaults
-  working_directory: ~/code
-  docker:
-    - image: cimg/node:16.13.0-browsers
-
-version: 2
-jobs:
-  setup:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          name: Restore node modules
-          keys:
-            - node_modules-{{ arch }}-{{ checksum "yarn.lock" }}
-
-      - run:
-          name: Install dependencies
-          command: yarn --pure-lockfile
-
-      - save_cache:
-          name: Save node modules
-          key: node_modules-{{ arch }}-{{ checksum "yarn.lock" }}
-          paths:
-            - node_modules
-
-  tests:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          name: Restore node modules
-          keys:
-            - node_modules-{{ arch }}-{{ checksum "yarn.lock" }}
-
-      - run:
-          name: Lint checks
-          command: yarn ci
-
-  publish:
-    <<: *defaults
-    steps:
-      - checkout
-      - restore_cache:
-          name: Restore node modules
-          keys:
-            - node_modules-{{ arch }}-{{ checksum "yarn.lock" }}
-
-      - run:
-          name: Publish to NPM
-          command: yarn ci:publish
-
-workflows:
-  version: 2
-  ci:
-    jobs:
-      - setup
-      - tests:
-          requires:
-            - setup
-      - publish:
-          requires:
-            - tests
-          filters:
-            branches:
-              only: master

package/.eslintignore

@@ -1,2 +0,0 @@
-lib/
-babel.config.js

package/.eslintrc.js

@@ -1,94 +0,0 @@
-module.exports = {
-  // Airbnb is the base, prettier is here so that eslint doesn't conflict with prettier
-  extends: ['airbnb', 'prettier', 'prettier/react', 'plugin:react-hooks/recommended'],
-  parser: '@typescript-eslint/parser',
-  plugins: ['react', 'react-native', 'import', '@typescript-eslint'],
-  rules: {
-    'no-console': 'off',
-    'no-underscore-dangle': 'off',
-    // Lines will be broken before binary operators
-    'operator-linebreak': ['error', 'before'],
-    // Allow imports from dev and peer dependencies
-    'import/no-extraneous-dependencies': [
-      'error',
-      { devDependencies: true, peerDependencies: true },
-    ],
-    'react/jsx-filename-extension': ['error', { extensions: ['.tsx'] }],
-    // This rule doesn't play nice with Prettier
-    'react/jsx-one-expression-per-line': 'off',
-    // This rule doesn't play nice with Prettier
-    'react/jsx-wrap-multilines': 'off',
-    // Remove this rule because we only destructure props, but never state
-    'react/destructuring-assignment': 'off',
-    'react/prop-types': 'off',
-    'react/jsx-props-no-spreading': 'off',
-    'react/static-property-placement': 'off',
-    'react/state-in-constructor': 'off',
-    '@typescript-eslint/adjacent-overload-signatures': 'error',
-    '@typescript-eslint/array-type': [
-      'error',
-      {
-        default: 'array',
-      },
-    ],
-    '@typescript-eslint/generic-type-naming': ['error', '^[a-zA-Z]+$'],
-    '@typescript-eslint/no-array-constructor': 'error',
-    '@typescript-eslint/no-empty-interface': 'error',
-    '@typescript-eslint/no-explicit-any': 'error',
-    '@typescript-eslint/no-extraneous-class': 'error',
-    '@typescript-eslint/no-inferrable-types': 'error',
-    '@typescript-eslint/no-misused-new': 'error',
-    '@typescript-eslint/no-namespace': 'error',
-    '@typescript-eslint/no-non-null-assertion': 'error',
-    '@typescript-eslint/consistent-type-assertions': [
-      'error',
-      {
-        assertionStyle: 'as',
-      },
-    ],
-    '@typescript-eslint/no-parameter-properties': 'error',
-    '@typescript-eslint/no-this-alias': 'error',
-    '@typescript-eslint/triple-slash-reference': [
-      'error',
-      { path: 'never', types: 'never', lib: 'never' },
-    ],
-    '@typescript-eslint/no-type-alias': [
-      'error',
-      {
-        allowAliases: 'always',
-        allowCallbacks: 'always',
-        allowMappedTypes: 'always',
-      },
-    ],
-    '@typescript-eslint/no-unused-vars': [
-      'error',
-      { ignoreRestSiblings: true },
-    ],
-    '@typescript-eslint/consistent-type-definitions': [
-      'error',
-      'interface',
-    ],
-    '@typescript-eslint/prefer-namespace-keyword': 'error',
-    '@typescript-eslint/type-annotation-spacing': 'error',
-  },
-  settings: {
-    'import/resolver': {
-      node: {
-        extensions: [
-          '.js',
-          '.android.js',
-          '.ios.js',
-          '.jsx',
-          '.android.jsx',
-          '.ios.jsx',
-          '.tsx',
-          '.ts',
-          '.android.tsx',
-          '.android.ts',
-          '.ios.tsx',
-          '.ios.ts',
-        ],
-      },
-    },
-  },
-};

package/.flowconfig

@@ -1,88 +0,0 @@
-[ignore]
-; This flowconfig is forked by platform - the only difference between them is which suffix is ignored.
-.*/*[.]android.js
-;.*/*[.]ios.js
-
-; Ignore templates for 'react-native init'
-.*/local-cli/templates/.*
-
-; Ignore the Dangerfile
-node_modules/react-native/bots/dangerfile.js
-
-; Ignore "BUCK" generated dirs
-node_modules/react-native/\.buckd/
-
-; Ignore unexpected extra "@providesModule"
-.*/node_modules/.*/node_modules/fbjs/.*
-
-; Ignore duplicate module providers
-; For RN Apps installed via npm, "Libraries" folder is inside
-; "node_modules/react-native" but in the source repo it is in the root
-.*/Libraries/react-native/React.js
-
-; Ignore polyfills
-.*/Libraries/polyfills/.*
-
-; Ignore metro
-.*/node_modules/metro/.*
-
-; Ignore "config-chain"'s test folder - it has a corrupt JSON file that's tripping flow
-.*/node_modules/config-chain/test/*.
-
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/invariant')
-.*/node_modules/invariant/.*
-.*/node_modules/warning/.*
-
-[include]
-
-[libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
-node_modules/react-native/flow-github/
-
-[lints]
-
-[options]
-emoji=true
-
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
-module.system=haste
-module.system.haste.use_name_reducers=true
-# keep the following in sync with server/haste/hasteImpl.js
-# get basename
-module.system.haste.name_reducers='^.*/\([a-zA-Z0-9$_.-]+\.js\(\.flow\)?\)$' -> '\1'
-# strip .js or .js.flow suffix
-module.system.haste.name_reducers='^\(.*\)\.js\(\.flow\)?$' -> '\1'
-# strip platform suffix
-module.system.haste.name_reducers='^\(.*\)\.ios$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.android$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/js/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-; Surpress error `Duplicate module provider` until the slimmening is done
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Components/WebView/*.
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Components/WKWebView/*.
-
-munge_underscores=true
-
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
-
-suppress_type=$FlowIssue
-suppress_type=$FlowFixMe
-suppress_type=$FlowFixMeProps
-suppress_type=$FlowFixMeState
-
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native\\(_android\\)?_oss|react_native\\(_android\\)?_fb][a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*[react_native\\(_android\\)?_oss|react_native\\(_android\\)?_fb][a-z,_]*\\)?)\\)?:? #[0-9]+
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
-suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
-
-[strict]