Merge pull request #543 from GetStream/fix-expo-image-upload

nhannah · web-flow · commit 5a2d0e827dd4 · 2021-03-08T11:12:05.000-07:00
CRNS-270: Fix image upload for expo and assets-library
diff --git a/examples/ExpoMessaging/package.json b/examples/ExpoMessaging/package.json
@@ -17,10 +17,10 @@
     "expo-document-picker": "8.4.1",
     "expo-file-system": "9.3.0",
     "expo-haptics": "8.4.0",
-    "expo-image-picker": "9.2.0",
+    "expo-image-picker": "10.0.0",
     "expo-image-manipulator": "9.0.0",
-    "expo-media-library": "10.0.0",
-    "expo-permissions": "10.0.0",
+    "expo-media-library": "11.0.0",
+    "expo-permissions": "11.0.0",
     "expo-sharing": "8.5.0",
     "react": "16.13.1",
     "react-dom": "16.13.1",
diff --git a/examples/ExpoMessaging/yarn.lock b/examples/ExpoMessaging/yarn.lock
@@ -976,13 +976,20 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
   version "7.12.5"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
   integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.12.13":
+  version "7.13.9"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.9.tgz#97dbe2116e2630c489f22e0656decd60aaa1fcee"
+  integrity sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/template@^7.0.0", "@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.8.6":
   version "7.12.7"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
@@ -1063,6 +1070,26 @@
     xcode "^2.1.0"
     xml2js "^0.4.23"
 
+"@expo/config-plugins@~1.0.13":
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/@expo/config-plugins/-/config-plugins-1.0.20.tgz#b1964daf063d7ce07c3f135aa92ccf1c60cd6e46"
+  integrity sha512-BucZQbi7edu8Pin8zFUNsaQeZAj/8ga7Ei3PKivKZKd5F53DdFU6Yb+ZDyQ0UeOGDi0hZlZWdaBzmQqHEg37TQ==
+  dependencies:
+    "@expo/config-types" "^40.0.0-beta.2"
+    "@expo/configure-splash-screen" "0.3.4"
+    "@expo/image-utils" "0.3.10"
+    "@expo/json-file" "8.2.28-alpha.0"
+    "@expo/plist" "0.0.11"
+    find-up "~5.0.0"
+    fs-extra "9.0.0"
+    getenv "0.7.0"
+    glob "7.1.6"
+    resolve-from "^5.0.0"
+    slash "^3.0.0"
+    slugify "^1.3.4"
+    xcode "^2.1.0"
+    xml2js "^0.4.23"
+
 "@expo/config-types@^40.0.0-beta.2":
   version "40.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/@expo/config-types/-/config-types-40.0.0-beta.2.tgz#4fea4ef5654d02218b02b0b3772529a9ce5b0471"
@@ -1103,6 +1130,22 @@
     xcode "^3.0.0"
     xml-js "^1.6.11"
 
+"@expo/configure-splash-screen@0.3.4":
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/@expo/configure-splash-screen/-/configure-splash-screen-0.3.4.tgz#b91d8f08fd96272bd3d7aaa9b51d6189b932c7cc"
+  integrity sha512-HsukM03X5/EXSucVsLN/oLqyFq/1jAjpADkgU1HLaezFpkr+TOquI6yDwdDp1450kcm891PE/SYJ+mCdPxzDLw==
+  dependencies:
+    color-string "^1.5.3"
+    commander "^5.1.0"
+    core-js "^3.6.5"
+    deep-equal "^2.0.3"
+    fs-extra "^9.0.0"
+    glob "^7.1.6"
+    lodash "^4.17.15"
+    pngjs "^5.0.0"
+    xcode "^3.0.0"
+    xml-js "^1.6.11"
+
 "@expo/image-utils@0.3.10":
   version "0.3.10"
   resolved "https://registry.yarnpkg.com/@expo/image-utils/-/image-utils-0.3.10.tgz#bdb9d6a2a7280680dd56d7f9dd283863b58d1e1e"
@@ -1131,6 +1174,16 @@
     lodash "^4.17.15"
     write-file-atomic "^2.3.0"
 
+"@expo/json-file@8.2.28-alpha.0":
+  version "8.2.28-alpha.0"
+  resolved "https://registry.yarnpkg.com/@expo/json-file/-/json-file-8.2.28-alpha.0.tgz#0e5280c82a17165be12c6a95cd95ec108c6dfe7b"
+  integrity sha512-cCQdw/Nfw8doXjN3onvUnWkuJjtVxx2iUjSOLMydvgI87YpW3x05uUXOVs4P+77YFVoFS6xbki+fmKK2JSCf8w==
+  dependencies:
+    "@babel/code-frame" "~7.10.4"
+    fs-extra "9.0.0"
+    json5 "^1.0.1"
+    write-file-atomic "^2.3.0"
+
 "@expo/plist@0.0.11":
   version "0.0.11"
   resolved "https://registry.yarnpkg.com/@expo/plist/-/plist-0.0.11.tgz#5d7900dc31df57d45a3524c061dde34aacc8dabf"
@@ -3196,12 +3249,13 @@ expo-image-manipulator@9.0.0:
   resolved "https://registry.yarnpkg.com/expo-image-manipulator/-/expo-image-manipulator-9.0.0.tgz#0b6ad350b79e40a44164b6333e806a2ef6fc9708"
   integrity sha512-hziIcUONz7JtsonEehuYvXk8xCSGDHR6A4ynZcUTbZQCzxWYu7Xq2wahREz/DBdu0vz0LBw38wFLuSpfgaFojQ==
 
-expo-image-picker@9.2.0:
-  version "9.2.0"
-  resolved "https://registry.yarnpkg.com/expo-image-picker/-/expo-image-picker-9.2.0.tgz#e6cd4845c9e3d573d78cbdbdde9799a4c5c562f5"
-  integrity sha512-GC9rbbXg8fyuSvX8WFogGpJjrQ9lSdg17Lqimghm1o7fxjmObiRh7RMky4FB/KkoiRZAdwXN1/NDtjjTWCukSA==
+expo-image-picker@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/expo-image-picker/-/expo-image-picker-10.0.0.tgz#24a3fd7335094191f148c3d2fbf9b496c500658f"
+  integrity sha512-smANMTtxqPDxGYPVQrppJAKxla2/UN4bTGfcmX7c8X8psaNUd4Bh8z9Uk/NUz00SGUWrU0Oa1K/rVrX1e0c2Hw==
   dependencies:
-    expo-permissions "~10.0.0"
+    "@expo/config-plugins" "~1.0.13"
+    expo-permissions "~11.0.0"
     uuid "7.0.2"
 
 expo-keep-awake@~8.4.0:
@@ -3228,12 +3282,19 @@ expo-location@~10.0.0:
   resolved "https://registry.yarnpkg.com/expo-location/-/expo-location-10.0.0.tgz#2923411649434f2f079343b163b13c5c9eee8b2d"
   integrity sha512-QLEb0iaBv4/blLxxfKRj2/HPisY+1t+g6MgegqZ1j1U/0qih4dvzUQrxie9ZOZyQB9gnXFCRnZv3QzHEb52dcA==
 
-expo-media-library@10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-10.0.0.tgz#44ab985fa684a9cf5b23d50ac5874b61bfe779c7"
-  integrity sha512-/edgaLU8ClYEgwmiMknpNbkouTNZlL/FNAxcSpPlTmXuRAqd2YmE5BpNOe1demDrR1VWTrZ8/ekS/RwQAWQU2g==
+expo-media-library@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/expo-media-library/-/expo-media-library-11.0.0.tgz#e37f1ff0c5a19c14a3989ad2b4f8b9f26522c23f"
+  integrity sha512-yRCce1tmn0WuVC64E+eS4Ez0w8jO4UVf0wz/rAYxJHquSOOC40HRQhzvmAhvAhfzeNGrVvQW/5j+IX+yzwq2QA==
+  dependencies:
+    "@expo/config-plugins" "~1.0.13"
+
+expo-permissions@11.0.0, expo-permissions@~11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-11.0.0.tgz#10889073121fea42bbfc35f09a35fa17a316b233"
+  integrity sha512-5+sFdU1HS/4aK9O7AsoLSNjG4f0UzlA3/nBHOPnWxxY2HRFnQp764tSsfSJRnGhM89Qxort6n2RzOusMoNP5ig==
 
-expo-permissions@10.0.0, expo-permissions@~10.0.0:
+expo-permissions@~10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/expo-permissions/-/expo-permissions-10.0.0.tgz#5b31c54d561d00c7e46cd02321bc3704c51c584b"
   integrity sha512-b6oitd4JmFdQ7DxczZ2WRS9aDyqgVM7lEhy3JyKZ2dbU19C6NyHyLCcwssZgfzOfGnp2owoaWn3KU4zdrF5MIA==
@@ -3670,7 +3731,7 @@ getenv@0.7.0:
   resolved "https://registry.yarnpkg.com/getenv/-/getenv-0.7.0.tgz#39b91838707e2086fd1cf6ef8777d1c93e14649e"
   integrity sha1-ObkYOHB+IIb9HPbvh3fRyT4UZJ4=
 
-glob@7.1.6, glob@^7.1.2, glob@^7.1.3:
+glob@7.1.6, glob@^7.1.2, glob@^7.1.3, glob@^7.1.6:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -6461,24 +6522,39 @@ stream-buffers@~2.2.0:
   version "0.0.0"
   uid ""
 
-"stream-chat-react-native-core@link:../..":
-  version "0.0.0"
-  uid ""
-
-stream-chat@3.0.0-beta.0:
-  version "3.0.0-beta.0"
-  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-3.0.0-beta.0.tgz#1ee82715c053a368abd0cdec5a7e49b6149cdde3"
-  integrity sha512-/HTp9x3LNG5/SAM9MmmQVnfUXBaxB0SaP6THy2nVza5aZ2NoLHaCb0i2MNOYz9MjkWLorLmRu4/Q4opcGnOZJw==
+stream-chat-react-native-core@v3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stream-chat-react-native-core/-/stream-chat-react-native-core-3.0.0.tgz#63424f643070ba4743c9746224310641e278df16"
+  integrity sha512-2oLmMS8RsoHEl6P46PT4Cp0wp86nLwgpAi+8sMCGFlwuAi9fIZb9jyEIJwlJkiHCn6Vj452zaWKfFo1QZK+2ag==
+  dependencies:
+    "@babel/runtime" "7.12.13"
+    "@gorhom/bottom-sheet" "3.0.0-alpha.0"
+    anchorme "^1.1.2"
+    dayjs "1.10.4"
+    file-loader "6.2.0"
+    i18next "19.8.7"
+    lodash-es "4.17.20"
+    metro-react-native-babel-preset "0.65.0"
+    mime-types "2.1.28"
+    path "0.12.7"
+    react-art "^16.8.6"
+    react-native-markdown-package "1.8.1"
+    stream-chat "3.0.0"
+
+stream-chat@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/stream-chat/-/stream-chat-3.0.0.tgz#470a648b24d3d905ebc67b61805c1c95377dbc7e"
+  integrity sha512-DyTcGm7iBdAftEbCzxu3cT/iDEuUeLL0AosOTeLZU7MCVwSWdlAhyhKSNB06YC7v6FhAatWOn1kwdJJpkBTUVg==
   dependencies:
-    "@babel/runtime" "^7.12.5"
+    "@babel/runtime" "^7.12.13"
     "@types/jsonwebtoken" "^8.5.0"
     "@types/ws" "^7.4.0"
     axios "^0.21.1"
     base64-js "^1.5.1"
     form-data "^3.0.0"
     isomorphic-ws "^4.0.1"
     jsonwebtoken "^8.5.1"
-    ws "^7.4.2"
+    ws "^7.4.3"
 
 strict-uri-encode@^2.0.0:
   version "2.0.0"
@@ -7064,11 +7140,16 @@ ws@^1.1.0, ws@^1.1.5:
     options ">=0.0.5"
     ultron "1.0.x"
 
-ws@^7, ws@^7.4.2:
+ws@^7:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
   integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
 
+ws@^7.4.3:
+  version "7.4.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd"
+  integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==
+
 xcode@^2.0.0, xcode@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/xcode/-/xcode-2.1.0.tgz#bab64a7e954bb50ca8d19da7e09531c65a43ecfe"
diff --git a/expo-package/package.json b/expo-package/package.json
@@ -20,9 +20,9 @@
     "expo-file-system": "^9.3.0",
     "expo-haptics": "^8.4.0",
     "expo-image-manipulator": "^9.0.0",
-    "expo-image-picker": "^9.2.0",
-    "expo-media-library": "^10.0.0",
-    "expo-permissions": "^10.0.0",
+    "expo-image-picker": "^10.0.0",
+    "expo-media-library": "^11.0.0",
+    "expo-permissions": "^11.0.0",
     "expo-sharing": "^8.5.0"
   },
   "scripts": {
diff --git a/expo-package/src/index.js b/expo-package/src/index.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { FlatList, Platform } from 'react-native';
+import { FlatList } from 'react-native';
 import NetInfo from '@react-native-community/netinfo';
 import { BlurView as ExpoBlurView } from 'expo-blur';
 import * as DocumentPicker from 'expo-document-picker';
@@ -35,15 +35,19 @@ registerNativeHandlers({
     }
   },
   FlatList,
+  getLocalAssetUri: async (assetId) => {
+    try {
+      const { localUri } = await MediaLibrary.getAssetInfoAsync(assetId);
+      return localUri;
+    } catch {
+      throw new Error('getLocalAssetUri Error');
+    }
+  },
   getPhotos: async ({ after, first }) => {
     try {
-      if (Platform.OS === 'android') {
-        const { status } = await Permissions.askAsync(
-          Permissions.MEDIA_LIBRARY,
-        );
-        if (status !== 'granted') {
-          throw new Error('getPhotos Error');
-        }
+      const { status } = await Permissions.askAsync(Permissions.MEDIA_LIBRARY);
+      if (status !== 'granted') {
+        throw new Error('getPhotos Error');
       }
       const results = await MediaLibrary.getAssetsAsync({
         after,
@@ -52,6 +56,7 @@ registerNativeHandlers({
       });
       const assets = results.assets.map((asset) => ({
         height: asset.height,
+        id: asset.id,
         source: 'picker',
         uri: asset.uri,
         width: asset.width,
@@ -138,8 +143,16 @@ registerNativeHandlers({
   },
   takePhoto: async ({ compressImageQuality = 1 }) => {
     try {
-      const { status } = ImagePicker.getCameraPermissionsAsync();
-      if (status === 'granted') {
+      const permissionCheck = await ImagePicker.getCameraPermissionsAsync();
+      const permissionGranted =
+        permissionCheck?.status === 'granted'
+          ? permissionCheck
+          : await Permissions.askAsync(Permissions.CAMERA);
+
+      if (
+        permissionGranted?.status === 'granted' ||
+        permissionGranted?.granted === true
+      ) {
         const photo = await ImagePicker.launchCameraAsync({
           quality: Math.min(Math.max(0, compressImageQuality), 1),
         });
diff --git a/jest-setup.js b/jest-setup.js
@@ -20,6 +20,7 @@ registerNativeHandlers({
   compressImage: () => null,
   deleteFile: () => null,
   FlatList: () => null,
+  getLocalAssetUri: () => null,
   getPhotos: () => null,
   NetInfo: {
     addEventListener: () => {},
diff --git a/native-package/src/index.js b/native-package/src/index.js
@@ -46,6 +46,14 @@ registerNativeHandlers({
     }
   },
   FlatList,
+  getLocalAssetUri: async (remoteUri) => {
+    try {
+      const localUri = await CameraRoll.save(remoteUri);
+      return localUri;
+    } catch {
+      throw new Error('getLocalAssetUri Error');
+    }
+  },
   getPhotos: async ({ after, first }) => {
     try {
       if (Platform.OS === 'android') {
diff --git a/src/contexts/messageInputContext/MessageInputContext.tsx b/src/contexts/messageInputContext/MessageInputContext.tsx
diff --git a/src/native.ts b/src/native.ts
