fix(mdoc): shutdown when required and nfc 'working' (#236)

Signed-off-by: Berend Sliedrecht <[email protected]>
animo · Nov 26, 2024 · 0d27f52 · 0d27f52
1 parent a707da3
commit 0d27f52
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 13 deletions.
diff --git a/apps/easypid/index.ts b/apps/easypid/index.ts
@@ -1 +1,2 @@
+import 'fast-text-encoding'
 import 'expo-router/entry'
diff --git a/apps/easypid/package.json b/apps/easypid/package.json
@@ -14,6 +14,7 @@
 		"@animo-id/expo-ausweis-sdk": "catalog:",
 		"@animo-id/expo-mdoc-data-transfer": "catalog:",
 		"@animo-id/expo-secure-environment": "catalog:",
+		"@animo-id/mdoc": "catalog:",
 		"@credo-ts/core": "catalog:",
 		"@expo-google-fonts/open-sans": "^0.2.3",
 		"@expo-google-fonts/raleway": "^0.2.3",
@@ -26,7 +27,6 @@
 		"@package/secure-store": "workspace:*",
 		"@package/ui": "workspace:*",
 		"@package/utils": "workspace:*",
-		"@animo-id/mdoc": "catalog:",
 		"@react-native-community/blur": "^4.3.2",
 		"@react-native-community/netinfo": "11.3.1",
 		"@react-native-masked-view/masked-view": "0.3.1",
@@ -51,6 +51,7 @@
 		"expo-system-ui": "~3.0.6",
 		"expo-updates": "~0.25.16",
 		"expo-web-browser": "~13.0.3",
+		"fast-text-encoding": "^1.0.6",
 		"react": "catalog:",
 		"react-native": "catalog:",
 		"react-native-argon2": "^2.0.1",

diff --git a/apps/easypid/src/app/+native-intent.tsx b/apps/easypid/src/app/+native-intent.tsx
@@ -1,3 +1,5 @@
+import 'fast-text-encoding'
+
 import { parseInvitationUrl } from '@package/agent'
 import { deeplinkSchemes } from '@package/app'
 import * as Haptics from 'expo-haptics'

diff --git a/apps/easypid/src/app/_layout.tsx b/apps/easypid/src/app/_layout.tsx
@@ -1,3 +1,5 @@
+import 'fast-text-encoding'
+
 import { BackgroundLockProvider, NoInternetToastProvider, Provider, useTransparentNavigationBar } from '@package/app'
 import { SecureUnlockProvider } from '@package/secure-store/secureUnlock'
 import { DefaultTheme, ThemeProvider } from '@react-navigation/native'

diff --git a/apps/easypid/src/features/proximity/mdocProximity.ts b/apps/easypid/src/features/proximity/mdocProximity.ts
@@ -47,6 +47,7 @@ export const checkMdocPermissions = async () => {
 
 export const getMdocQrCode = async () => {
   const mdt = requireMdocDataTransfer().mdocDataTransfer.instance()
+  mdt.enableNfc()
   const qrData = await mdt.startQrEngagement()
   return qrData
 }
@@ -118,3 +119,8 @@ export const shareDeviceResponse = async (options: ShareDeviceResponseOptions) =
 
   await mdt.sendDeviceResponse(deviceResponse.encode())
 }
+
+export const shutdownDataTransfer = () => {
+  const mdt = requireMdocDataTransfer().mdocDataTransfer.instance()
+  mdt.shutdown()
+}
diff --git a/apps/easypid/src/features/share/FunkeMdocOfflineSharingScreen.tsx b/apps/easypid/src/features/share/FunkeMdocOfflineSharingScreen.tsx
@@ -4,7 +4,7 @@ import { usePushToWallet } from '@package/app/src/hooks/usePushToWallet'
 import { useToastController } from '@package/ui'
 import { useEffect, useState } from 'react'
 import { type ActivityStatus, addSharedActivityForCredentialsForRequest } from '../activity/activityRecord'
-import { shareDeviceResponse } from '../proximity'
+import { shareDeviceResponse, shutdownDataTransfer } from '../proximity'
 import { FunkeOfflineSharingScreen } from './FunkeOfflineSharingScreen'
 import type { PresentationRequestResult } from './components/utils'
 
@@ -101,10 +101,16 @@ export function FunkeMdocOfflineSharingScreen({
 
     setIsProcessing(false)
 
+    shutdownDataTransfer()
     pushToWallet()
     toast.show('Proof has been declined.', { customData: { preset: 'danger' } })
   }
 
+  const onProofComplete = () => {
+    shutdownDataTransfer()
+    pushToWallet('replace')
+  }
+
   const addActivity = async (status: ActivityStatus) => {
     if (!submission) return
     await addSharedActivityForCredentialsForRequest(
@@ -129,7 +135,7 @@ export function FunkeMdocOfflineSharingScreen({
       submission={submission}
       onAccept={onProofAccept}
       onDecline={onProofDecline}
-      onComplete={() => pushToWallet('replace')}
+      onComplete={onProofComplete}
     />
   )
 }
diff --git a/packages/agent/src/index.ts b/packages/agent/src/index.ts
@@ -1,5 +1,4 @@
 import 'react-native-get-random-values'
-import 'fast-text-encoding'
 
 import { Buffer } from '@credo-ts/core'
 export {

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -31,9 +31,9 @@ catalog:
   "@animo-id/oauth2": 0.1.4
   "@animo-id/oauth2-utils": 0.1.4
   "@animo-id/expo-secure-environment": 0.1.0-alpha.11
-  "@animo-id/expo-mdoc-data-transfer": 0.0.3-alpha.7
+  "@animo-id/expo-mdoc-data-transfer": 0.0.3-alpha.8
   "@animo-id/mdoc": 0.2.39
   "@unimodules/react-native-adapter": "./noop"
   "@unimodules/core": "./noop"
   expo: ~51.0.39
-  "@sphereon/pex-models": 2.3.2
+  "@sphereon/pex-models": 2.3.2
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		import 'fast-text-encoding'
		import 'expo-router/entry'