@bifold/core 2.1.3 → 2.1.4

package/lib/typescript/src/localization/pt-br/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/localization/pt-br/index.ts"],"names":[],"mappings":"AACA,QAAA,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAs3BhB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/localization/pt-br/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,cAAc,CAAA;AAE7B,eAAe,EAAE,CAAA"}

package/lib/typescript/src/services/keychain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../../src/services/keychain.ts"],"names":[],"mappings":"AACA,OAAO,QAAsC,MAAM,uBAAuB,CAAA;AAG1E,OAAO,EAAY,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAO7C,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,wBAAwB,YAAa,gBAAgB,8BAA0B,QAAQ,CAAC,OAoBpG,CAAA;AAED,eAAO,MAAM,YAAY,QAAe,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,YAAY,CAUnF,CAAA;AAED,eAAO,MAAM,aAAa,kBAAyB,OAAO,kBAGzD,CAAA;AAED,eAAO,MAAM,cAAc,WAAkB,SAAS,8BAA0B,OAAO,CAAC,OAAO,CAM9F,CAAA;AAED,eAAO,MAAM,eAAe,WAAkB,UAAU,KAAG,OAAO,CAAC,OAAO,CAKzE,CAAA;AAED,eAAO,MAAM,iBAAiB,iBAAwB,YAAY,KAAG,OAAO,CAAC,OAAO,CAKnF,CAAA;AAED,eAAO,MAAM,iBAAiB,WAAkB,YAAY,8BAA0B,OAAO,CAAC,OAAO,CASpG,CAAA;AAED,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,UAAU,GAAG,SAAS,CAsBrE,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,YAAY,GAAG,SAAS,CAWzE,CAAA;AAED,eAAO,MAAM,aAAa,WAAkB,MAAM,gBAAgB,MAAM,KAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAqBvG,CAAA;AAED,eAAO,MAAM,gBAAgB,WAAkB,MAAM,gBAAgB,MAAM,KAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAqB7G,CAAA;AAED,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,OAAO,CAG1D,CAAA"}
+{"version":3,"file":"keychain.d.ts","sourceRoot":"","sources":["../../../../src/services/keychain.ts"],"names":[],"mappings":"AACA,OAAO,QAAsC,MAAM,uBAAuB,CAAA;AAG1E,OAAO,EAAY,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAO7C,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;CACb;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,wBAAwB,YAAa,gBAAgB,8BAA0B,QAAQ,CAAC,OAoBpG,CAAA;AAED,eAAO,MAAM,YAAY,QAAe,MAAM,SAAS,MAAM,KAAG,OAAO,CAAC,YAAY,CAUnF,CAAA;AAED,eAAO,MAAM,aAAa,kBAAyB,OAAO,kBAGzD,CAAA;AAED,eAAO,MAAM,cAAc,WAAkB,SAAS,8BAA0B,OAAO,CAAC,OAAO,CAM9F,CAAA;AAED,eAAO,MAAM,eAAe,WAAkB,UAAU,KAAG,OAAO,CAAC,OAAO,CAKzE,CAAA;AAED,eAAO,MAAM,iBAAiB,iBAAwB,YAAY,KAAG,OAAO,CAAC,OAAO,CAKnF,CAAA;AAED,eAAO,MAAM,iBAAiB,WAAkB,YAAY,8BAA0B,OAAO,CAAC,OAAO,CASpG,CAAA;AAED,eAAO,MAAM,cAAc,QAAa,OAAO,CAAC,UAAU,GAAG,SAAS,CAsBrE,CAAA;AAED,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,YAAY,GAAG,SAAS,CAWzE,CAAA;AAED,eAAO,MAAM,aAAa,WAAkB,MAAM,gBAAgB,MAAM,KAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAqBvG,CAAA;AAED,eAAO,MAAM,gBAAgB,WAAkB,MAAM,gBAAgB,MAAM,KAAG,OAAO,CAAC,YAAY,GAAG,SAAS,CAqB7G,CAAA;AAKD,eAAO,MAAM,kBAAkB,QAAa,OAAO,CAAC,OAAO,CAG1D,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bifold/core",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
   "react-native": "src/index.ts",
@@ -33,8 +33,8 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/runtime": "^7.20.0",
-    "@bifold/oca": "2.1.3",
-    "@bifold/verifier": "2.1.3",
+    "@bifold/oca": "2.1.4",
+    "@bifold/verifier": "2.1.4",
     "@commitlint/cli": "^11.0.0",
     "@credo-ts/anoncreds": "0.5.13",
     "@credo-ts/askar": "0.5.13",
@@ -120,7 +120,7 @@
     "react-native-localize": "^2.2.4",
     "react-native-logs": "^5.1.0",
     "react-native-orientation-locker": "^1.6.0",
-    "react-native-permissions": "^4.0.1",
+    "react-native-permissions": "^5.4.0",
     "react-native-qrcode-svg": "6.2.0",
     "react-native-safe-area-context": "^4.8.2",
     "react-native-scalable-image": "^1.1.0",

package/src/components/inputs/BiometryControl.tsx

@@ -10,6 +10,7 @@ import { ThemedText } from '../texts/ThemedText'
 import { useAuth } from '../../contexts/auth'
 import { useTheme } from '../../contexts/theme'
 import { testIdWithKey } from '../../utils/testable'
+import { getSupportedBiometryType, BIOMETRY_TYPE } from 'react-native-keychain'
 
 const BIOMETRY_PERMISSION = PERMISSIONS.IOS.FACE_ID
 
@@ -43,7 +44,7 @@ const BiometryControl: React.FC<BiometryControlProps> = ({ biometryEnabled, onBi
   })
 
   useEffect(() => {
-    isBiometricsActive().then((result) => {
+    isBiometricsActive().then((result: boolean) => {
       setBiometryAvailable(result)
     })
   }, [isBiometricsActive])
@@ -97,6 +98,8 @@ const BiometryControl: React.FC<BiometryControlProps> = ({ biometryEnabled, onBi
     // If the user is turning it on, they need
     // to first authenticate the OS biometrics before this action is accepted
     const permissionResult: PermissionStatus = await onCheckSystemBiometrics()
+    const supported_type = await getSupportedBiometryType()
+
     switch (permissionResult) {
       case RESULTS.GRANTED:
       case RESULTS.LIMITED:
@@ -104,10 +107,18 @@ const BiometryControl: React.FC<BiometryControlProps> = ({ biometryEnabled, onBi
         onBiometryToggle(newValue)
         break
       case RESULTS.UNAVAILABLE:
-        setSettingsPopupConfig({
-          title: t('Biometry.SetupBiometricsTitle'),
-          description: t('Biometry.SetupBiometricsDesc'),
-        })
+        // Permission is unavailable/ not supported on this device
+        if (Platform.OS === 'ios' && supported_type === BIOMETRY_TYPE.TOUCH_ID) {
+          // if available, access to touch id can be granted without a request
+          onBiometryToggle(newValue)
+        } else {
+          // Not in iOS or no touch id available for iOS, send user to settings
+          // to enable biometrics
+          setSettingsPopupConfig({
+            title: t('Biometry.SetupBiometricsTitle'),
+            description: t('Biometry.SetupBiometricsDesc'),
+          })
+        }
         break
       case RESULTS.BLOCKED:
         // Previously denied

package/src/hooks/useBifoldAgentSetup.ts

@@ -2,16 +2,16 @@ import { Agent, HttpOutboundTransport, WsOutboundTransport } from '@credo-ts/cor
 import { IndyVdrPoolService } from '@credo-ts/indy-vdr/build/pool'
 import { agentDependencies } from '@credo-ts/react-native'
 import { GetCredentialDefinitionRequest, GetSchemaRequest } from '@hyperledger/indy-vdr-shared'
-import { useCallback, useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { Config } from 'react-native-config'
 import { CachesDirectoryPath } from 'react-native-fs'
 
 import { TOKENS, useServices } from '../container-api'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
-import { getAgentModules, createLinkSecretIfRequired } from '../utils/agent'
-import { migrateToAskar } from '../utils/migration'
 import { WalletSecret } from '../types/security'
+import { createLinkSecretIfRequired, getAgentModules } from '../utils/agent'
+import { migrateToAskar } from '../utils/migration'
 
 export type AgentSetupReturnType = {
   agent: Agent | null
@@ -21,6 +21,7 @@ export type AgentSetupReturnType = {
 
 const useBifoldAgentSetup = (): AgentSetupReturnType => {
   const [agent, setAgent] = useState<Agent | null>(null)
+  const agentInstanceRef = useRef<Agent | null>(null)
   const [store, dispatch] = useStore()
   const [cacheSchemas, cacheCredDefs, logger, indyLedgers] = useServices([
     TOKENS.CACHE_SCHEMAS,
@@ -29,6 +30,26 @@ const useBifoldAgentSetup = (): AgentSetupReturnType => {
     TOKENS.UTIL_LEDGERS,
   ])
 
+  const restartExistingAgent = useCallback(
+    async (agent: Agent, walletSecret: WalletSecret): Promise<Agent | undefined> => {
+      try {
+        await agent.wallet.open({
+          id: walletSecret.id,
+          key: walletSecret.key,
+        })
+        await agent.initialize()
+      } catch (error) {
+        logger.warn(`Agent restart failed with error ${error}`)
+        // if the existing agents wallet cannot be opened or initialize() fails it was
+        // again not a clean shutdown and the agent should be replaced, not restarted
+        return
+      }
+
+      return agent
+    },
+    [logger]
+  )
+
   const createNewAgent = useCallback(
     async (walletSecret: WalletSecret): Promise<Agent> => {
       const newAgent = new Agent({
@@ -97,7 +118,18 @@ const useBifoldAgentSetup = (): AgentSetupReturnType => {
 
   const initializeAgent = useCallback(
     async (walletSecret: WalletSecret): Promise<void> => {
-      logger.info('Creating agent')
+      logger.info('Checking for existing agent...')
+      if (agentInstanceRef.current) {
+        const restartedAgent = await restartExistingAgent(agentInstanceRef.current, walletSecret)
+        if (restartedAgent) {
+          logger.info('Successfully restarted existing agent...')
+          agentInstanceRef.current = restartedAgent
+          setAgent(restartedAgent)
+          return
+        }
+      }
+
+      logger.info('Creating new agent...')
       const newAgent = await createNewAgent(walletSecret)
 
       logger.info('Migrating if required...')
@@ -113,9 +145,10 @@ const useBifoldAgentSetup = (): AgentSetupReturnType => {
       await warmUpCache(newAgent)
 
       logger.info('Agent initialized successfully')
+      agentInstanceRef.current = newAgent
       setAgent(newAgent)
     },
-    [logger, createNewAgent, migrateIfRequired, warmUpCache]
+    [logger, restartExistingAgent, createNewAgent, migrateIfRequired, warmUpCache]
   )
 
   const shutdownAndClearAgentIfExists = useCallback(async () => {
@@ -124,10 +157,10 @@ const useBifoldAgentSetup = (): AgentSetupReturnType => {
         await agent.shutdown()
       } catch (error) {
         logger.error(`Error shutting down agent with shutdownAndClearAgentIfExists: ${error}`)
+      } finally {
+        setAgent(null)
       }
     }
-
-    setAgent(null)
   }, [agent, logger])
 
   return { agent, initializeAgent, shutdownAndClearAgentIfExists }

package/src/index.ts

@@ -51,7 +51,7 @@ import Splash from './screens/Splash'
 import Terms from './screens/Terms'
 import UpdateAvailable from './screens/UpdateAvailable'
 import Biometry from './screens/Biometry'
-import { loadLoginAttempt } from './services/keychain'
+import { loadLoginAttempt, isBiometricsActive } from './services/keychain'
 import { BifoldLogger } from './services/logger'
 import * as types from './types'
 import Scan from './screens/Scan'
@@ -216,6 +216,7 @@ export {
   Text,
   ThemedText,
   loadLoginAttempt,
+  isBiometricsActive,
   Button,
   BifoldLogger,
   LimitedTextInput,