Replace outdated "React Native Encrypted Storage" with "Expo Secure Store" (#762)

Author: bennycode

example/app.json

@@ -21,7 +21,8 @@
           "photosPermission": "The app accesses your photos to let you attach them as messages.",
           "cameraPermission": "The app accesses your camera to let you attach photos as messages."
         }
-      ]
+      ],
+      "expo-secure-store"
     ],
     "ios": {
       "supportsTablet": true,

example/package.json

@@ -32,6 +32,7 @@
     "expo-document-picker": "~13.0.3",
     "expo-file-system": "~18.0.12",
     "expo-image-picker": "~16.0.6",
+    "expo-secure-store": "~14.0.1",
     "expo-splash-screen": "~0.29.24",
     "expo-status-bar": "~2.0.1",
     "expo-system-ui": "~4.0.9",
@@ -42,7 +43,6 @@
     "react-native-blob-util": "^0.19.0",
     "react-native-config": "^1.5.1",
     "react-native-crypto": "^2.2.0",
-    "react-native-encrypted-storage": "^4.0.3",
     "react-native-fs": "^2.20.0",
     "react-native-get-random-values": "^1.11.0",
     "react-native-mmkv": "^2.8.0",

example/src/hooks.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useRef, useState } from 'react'
-import EncryptedStorage from 'react-native-encrypted-storage'
+import * as SecureStore from 'expo-secure-store'
 import RNFS from 'react-native-fs'
 import crypto from 'react-native-quick-crypto'
 import { useMutation, useQuery, UseQueryResult } from 'react-query'
@@ -762,16 +762,16 @@ export function useSavedAddress(): {
 } {
   const { data: address, refetch } = useQuery<string | null>(
     ['xmtp', 'address'],
-    () => EncryptedStorage.getItem('xmtp.address')
+    () => SecureStore.getItemAsync('xmtp.address')
   )
   return {
     address,
     save: async (address: string) => {
-      await EncryptedStorage.setItem('xmtp.address', address)
+      await SecureStore.setItemAsync('xmtp.address', address)
       await refetch()
     },
     clear: async () => {
-      await EncryptedStorage.removeItem('xmtp.address')
+      await SecureStore.deleteItemAsync('xmtp.address')
       await refetch()
     },
   }
@@ -784,11 +784,11 @@ export async function getDbEncryptionKey(
   try {
     const key = `xmtp-${network}`
 
-    const result = await EncryptedStorage.getItem(key)
+    const result = await SecureStore.getItemAsync(key)
     if ((result && clear === true) || !result) {
       if (result) {
         console.log('Removing existing dbEncryptionKey', key)
-        await EncryptedStorage.removeItem(key)
+        await SecureStore.deleteItemAsync(key)
       }
 
       // Generate random bytes for the encryption key
@@ -797,7 +797,7 @@ export async function getDbEncryptionKey(
 
       // Convert to string for storage
       const randomBytesString = uint8ArrayToHexString(randomBytes)
-      await EncryptedStorage.setItem(key, randomBytesString)
+      await SecureStore.setItemAsync(key, randomBytesString)
 
       return randomBytes
     } else {

example/yarn.lock

@@ -4196,6 +4196,11 @@ [email protected]:
   dependencies:
     invariant "^2.2.4"
 
+expo-secure-store@~14.0.1:
+  version "14.0.1"
+  resolved "https://registry.yarnpkg.com/expo-secure-store/-/expo-secure-store-14.0.1.tgz#8953d5966430f5ff262f4d99e7551205870078d7"
+  integrity sha512-QUS+j4+UG4jRQalgnpmTvvrFnMVLqPiUZRzYPnG3+JrZ5kwVW2w6YS3WWerPoR7C6g3y/a2htRxRSylsDs+TaQ==
+
 expo-splash-screen@~0.29.24:
   version "0.29.24"
   resolved "https://registry.yarnpkg.com/expo-splash-screen/-/expo-splash-screen-0.29.24.tgz#4e5f6d576d3fbb37c5e3e4ee6d3f3b3ece350f75"
@@ -6955,11 +6960,6 @@ react-native-crypto@^2.2.0:
     public-encrypt "^4.0.0"
     randomfill "^1.0.3"
 
-react-native-encrypted-storage@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.npmjs.org/react-native-encrypted-storage/-/react-native-encrypted-storage-4.0.3.tgz#2a4d65459870511e8f4ccd22f02433dab7fa5e91"
-  integrity sha512-0pJA4Aj2S1PIJEbU7pN/Qvf7JIJx3hFywx+i+bLHtgK0/6Zryf1V2xVsWcrD50dfiu3jY1eN2gesQ5osGxE7jA==
-
 react-native-fs@^2.20.0:
   version "2.20.0"
   resolved "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz#05a9362b473bfc0910772c0acbb73a78dbc810f6"