feat: credential selection in proof request (#113)

Signed-off-by: Timo Glastra <[email protected]>
animo · Jul 13, 2024 · 09e6459 · 09e6459
1 parent e62a97a
commit 09e6459
Show file tree

Hide file tree

Showing 16 changed files with 653 additions and 358 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,3 +1,4 @@
 {
-	"typescript.tsdk": "node_modules/typescript/lib"
+	"typescript.tsdk": "node_modules/typescript/lib",
+	"editor.defaultFormatter": "biomejs.biome"
 }
diff --git a/apps/funke/app/_layout.tsx b/apps/funke/app/_layout.tsx
@@ -15,6 +15,7 @@ import { DefaultTheme, ThemeProvider } from '@react-navigation/native'
 import { Stack } from 'expo-router'
 import * as SplashScreen from 'expo-splash-screen'
 import { useEffect, useState } from 'react'
+import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
 import { initializeAppAgent } from '.'
@@ -102,57 +103,59 @@ export default function HomeLayout() {
 
   return (
     <Provider>
-      <AgentProvider agent={agent}>
-        <ThemeProvider value={DefaultTheme}>
-          <NoInternetToastProvider>
-            <DeeplinkHandler>
-              <Stack initialRouteName="index" screenOptions={{ headerShown: false }}>
-                <Stack.Screen
-                  options={{
-                    presentation: 'modal',
-                    // Extra modal options not needed for QR Scanner
-                  }}
-                  name="(home)/scan"
-                />
-                <Stack.Screen
-                  options={{ presentation: 'modal', ...headerModalOptions }}
-                  name="notifications/openIdCredential"
-                />
-                <Stack.Screen
-                  options={{ presentation: 'modal', ...headerModalOptions }}
-                  name="notifications/openIdPresentation"
-                />
-                <Stack.Screen
-                  options={{
-                    headerShown: true,
-                    headerStyle: {
-                      backgroundColor: config.tokens.color['grey-200'].val,
-                    },
-                    headerShadowVisible: false,
-                    headerTintColor: config.tokens.color['primary-500'].val,
-                    headerTitle: 'Inbox',
-                    headerTitleAlign: 'center',
-                    headerTitleStyle: {
-                      fontWeight: isAndroid() ? '700' : '500', // Match font weight on android to native back button style
-                      fontSize: 18,
-                    },
-                  }}
-                  name="notifications/inbox"
-                />
-                <Stack.Screen
-                  options={{
-                    headerShown: true,
-                    headerTransparent: true,
-                    headerTintColor: config.tokens.color['primary-500'].val,
-                    headerTitle: '',
-                  }}
-                  name="credentials/[id]"
-                />
-              </Stack>
-            </DeeplinkHandler>
-          </NoInternetToastProvider>
-        </ThemeProvider>
-      </AgentProvider>
+      <GestureHandlerRootView style={{ flex: 1 }}>
+        <AgentProvider agent={agent}>
+          <ThemeProvider value={DefaultTheme}>
+            <NoInternetToastProvider>
+              <DeeplinkHandler>
+                <Stack initialRouteName="index" screenOptions={{ headerShown: false }}>
+                  <Stack.Screen
+                    options={{
+                      presentation: 'modal',
+                      // Extra modal options not needed for QR Scanner
+                    }}
+                    name="(home)/scan"
+                  />
+                  <Stack.Screen
+                    options={{ presentation: 'modal', ...headerModalOptions }}
+                    name="notifications/openIdCredential"
+                  />
+                  <Stack.Screen
+                    options={{ presentation: 'modal', ...headerModalOptions }}
+                    name="notifications/openIdPresentation"
+                  />
+                  <Stack.Screen
+                    options={{
+                      headerShown: true,
+                      headerStyle: {
+                        backgroundColor: config.tokens.color['grey-200'].val,
+                      },
+                      headerShadowVisible: false,
+                      headerTintColor: config.tokens.color['primary-500'].val,
+                      headerTitle: 'Inbox',
+                      headerTitleAlign: 'center',
+                      headerTitleStyle: {
+                        fontWeight: isAndroid() ? '700' : '500', // Match font weight on android to native back button style
+                        fontSize: 18,
+                      },
+                    }}
+                    name="notifications/inbox"
+                  />
+                  <Stack.Screen
+                    options={{
+                      headerShown: true,
+                      headerTransparent: true,
+                      headerTintColor: config.tokens.color['primary-500'].val,
+                      headerTitle: '',
+                    }}
+                    name="credentials/[id]"
+                  />
+                </Stack>
+              </DeeplinkHandler>
+            </NoInternetToastProvider>
+          </ThemeProvider>
+        </AgentProvider>
+      </GestureHandlerRootView>
     </Provider>
   )
 }
diff --git a/apps/funke/babel.config.js b/apps/funke/babel.config.js
@@ -17,6 +17,8 @@ module.exports = (api) => {
           disableExtraction: process.env.NODE_ENV === 'development',
         },
       ],
+      // used for bottom sheet
+      'react-native-reanimated/plugin',
     ],
   }
 }
diff --git a/apps/funke/package.json b/apps/funke/package.json
@@ -10,6 +10,7 @@
 		"prebuild": "APP_VARIANT=development expo prebuild --no-install"
 	},
 	"dependencies": {
+		"@gorhom/bottom-sheet": "^4.6.3",
 		"@hyperledger/anoncreds-react-native": "^0.2.2",
 		"@hyperledger/aries-askar-react-native": "^0.2.0",
 		"@hyperledger/indy-vdr-react-native": "^0.2.0",
@@ -43,6 +44,7 @@
 		"react-native-fs": "^2.20.0",
 		"react-native-gesture-handler": "~2.16.2",
 		"react-native-get-random-values": "~1.11.0",
+		"react-native-reanimated": "~3.10.1",
 		"react-native-safe-area-context": "4.10.1",
 		"react-native-screens": "~3.31.1",
 		"react-native-svg": "15.2.0"

diff --git a/apps/paradym/app/_layout.tsx b/apps/paradym/app/_layout.tsx
@@ -19,6 +19,7 @@ import { useEffect, useState } from 'react'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { initializeAppAgent } from '.'
 
+import { GestureHandlerRootView } from 'react-native-gesture-handler'
 import { mediatorDid } from './constants'
 
 void SplashScreen.preventAutoHideAsync()
@@ -143,58 +144,63 @@ export default function HomeLayout() {
 
   return (
     <Provider>
-      <AgentProvider agent={agent}>
-        <ThemeProvider value={DefaultTheme}>
-          <NoInternetToastProvider>
-            <DeeplinkHandler>
-              <Stack initialRouteName="index" screenOptions={{ headerShown: false }}>
-                <Stack.Screen
-                  options={{
-                    presentation: 'modal',
-                    // Extra modal options not needed for QR Scanner
-                  }}
-                  name="(home)/scan"
-                />
-                <Stack.Screen
-                  options={{ presentation: 'modal', ...headerModalOptions }}
-                  name="notifications/openIdCredential"
-                />
-                <Stack.Screen
-                  options={{ presentation: 'modal', ...headerModalOptions }}
-                  name="notifications/openIdPresentation"
-                />
-                <Stack.Screen options={{ presentation: 'modal', ...headerModalOptions }} name="notifications/didcomm" />
-                <Stack.Screen
-                  options={{
-                    headerShown: true,
-                    headerStyle: {
-                      backgroundColor: config.tokens.color['grey-200'].val,
-                    },
-                    headerShadowVisible: false,
-                    headerTintColor: config.tokens.color['primary-500'].val,
-                    headerTitle: 'Inbox',
-                    headerTitleAlign: 'center',
-                    headerTitleStyle: {
-                      fontWeight: isAndroid() ? '700' : '500', // Match font weight on android to native back button style
-                      fontSize: 18,
-                    },
-                  }}
-                  name="notifications/inbox"
-                />
-                <Stack.Screen
-                  options={{
-                    headerShown: true,
-                    headerTransparent: true,
-                    headerTintColor: config.tokens.color['primary-500'].val,
-                    headerTitle: '',
-                  }}
-                  name="credentials/[id]"
-                />
-              </Stack>
-            </DeeplinkHandler>
-          </NoInternetToastProvider>
-        </ThemeProvider>
-      </AgentProvider>
+      <GestureHandlerRootView style={{ flex: 1 }}>
+        <AgentProvider agent={agent}>
+          <ThemeProvider value={DefaultTheme}>
+            <NoInternetToastProvider>
+              <DeeplinkHandler>
+                <Stack initialRouteName="index" screenOptions={{ headerShown: false }}>
+                  <Stack.Screen
+                    options={{
+                      presentation: 'modal',
+                      // Extra modal options not needed for QR Scanner
+                    }}
+                    name="(home)/scan"
+                  />
+                  <Stack.Screen
+                    options={{ presentation: 'modal', ...headerModalOptions }}
+                    name="notifications/openIdCredential"
+                  />
+                  <Stack.Screen
+                    options={{ presentation: 'modal', ...headerModalOptions }}
+                    name="notifications/openIdPresentation"
+                  />
+                  <Stack.Screen
+                    options={{ presentation: 'modal', ...headerModalOptions }}
+                    name="notifications/didcomm"
+                  />
+                  <Stack.Screen
+                    options={{
+                      headerShown: true,
+                      headerStyle: {
+                        backgroundColor: config.tokens.color['grey-200'].val,
+                      },
+                      headerShadowVisible: false,
+                      headerTintColor: config.tokens.color['primary-500'].val,
+                      headerTitle: 'Inbox',
+                      headerTitleAlign: 'center',
+                      headerTitleStyle: {
+                        fontWeight: isAndroid() ? '700' : '500', // Match font weight on android to native back button style
+                        fontSize: 18,
+                      },
+                    }}
+                    name="notifications/inbox"
+                  />
+                  <Stack.Screen
+                    options={{
+                      headerShown: true,
+                      headerTransparent: true,
+                      headerTintColor: config.tokens.color['primary-500'].val,
+                      headerTitle: '',
+                    }}
+                    name="credentials/[id]"
+                  />
+                </Stack>
+              </DeeplinkHandler>
+            </NoInternetToastProvider>
+          </ThemeProvider>
+        </AgentProvider>
+      </GestureHandlerRootView>
     </Provider>
   )
 }
diff --git a/apps/paradym/package.json b/apps/paradym/package.json
@@ -43,6 +43,7 @@
 		"react-native-fs": "^2.20.0",
 		"react-native-gesture-handler": "~2.16.2",
 		"react-native-get-random-values": "~1.11.0",
+		"react-native-reanimated": "~3.10.1",
 		"react-native-safe-area-context": "4.10.1",
 		"react-native-screens": "~3.31.1",
 		"react-native-svg": "15.2.0"

diff --git a/packages/agent/src/display.ts b/packages/agent/src/display.ts
@@ -202,6 +202,11 @@ function getW3cCredentialDisplay(
     }
   }
 
+  // Use background color from the JFF credential if not provided by the OID4VCI metadata
+  if (!credentialDisplay.backgroundColor && jffCredential.credentialBranding?.backgroundColor) {
+    credentialDisplay.backgroundColor = jffCredential.credentialBranding.backgroundColor
+  }
+
   return {
     ...credentialDisplay,
     // Last fallback, if there's really no name for the credential, we use a generic name

diff --git a/packages/agent/src/format/formatPresentation.ts b/packages/agent/src/format/formatPresentation.ts
@@ -12,51 +12,53 @@ export interface FormattedSubmission {
 }
 
 export interface FormattedSubmissionEntry {
-  name: string
+  /** can be either AnonCreds groupName or PEX inputDescriptorId */
+  inputDescriptorId: string
   isSatisfied: boolean
-  credentialName: string
-  issuerName?: string
+
+  name: string
   description?: string
-  requestedAttributes?: string[]
-  backgroundColor?: string
+
+  credentials: Array<{
+    id: string
+    credentialName: string
+    issuerName?: string
+    requestedAttributes?: string[]
+    backgroundColor?: string
+  }>
 }
 
 export function formatDifPexCredentialsForRequest(
   credentialsForRequest: DifPexCredentialsForRequest
 ): FormattedSubmission {
   const entries = credentialsForRequest.requirements.flatMap((requirement) => {
-    return requirement.submissionEntry.map((submission) => {
-      // FIXME: support credential selection from JFF branch
-      const [firstVerifiableCredential] = submission.verifiableCredentials
-      if (firstVerifiableCredential) {
-        // Credential can be satisfied
-        const { display, credential } = getCredentialForDisplay(firstVerifiableCredential.credentialRecord)
-
-        // TODO: support nesting
-        let requestedAttributes: string[]
-        if (firstVerifiableCredential.type === ClaimFormat.SdJwtVc) {
-          const { metadata, visibleProperties } = filterAndMapSdJwtKeys(firstVerifiableCredential.disclosedPayload)
-          requestedAttributes = [...Object.keys(visibleProperties), ...Object.keys(metadata)]
-        } else {
-          requestedAttributes = Object.keys(credential?.credentialSubject ?? {})
-        }
-
-        return {
-          name: submission.name ?? 'Unknown',
-          description: submission.purpose,
-          isSatisfied: true,
-          credentialName: display.name,
-          issuerName: display.issuer.name,
-          requestedAttributes,
-          backgroundColor: display.backgroundColor,
-        }
-      }
+    return requirement.submissionEntry.map((submission): FormattedSubmissionEntry => {
       return {
+        inputDescriptorId: submission.inputDescriptorId,
         name: submission.name ?? 'Unknown',
         description: submission.purpose,
-        isSatisfied: false,
-        // fallback to submission name because there is no credential
-        credentialName: submission.name ?? 'Credential name',
+        isSatisfied: submission.verifiableCredentials.length >= 1,
+
+        credentials: submission.verifiableCredentials.map((verifiableCredential) => {
+          const { display, credential } = getCredentialForDisplay(verifiableCredential.credentialRecord)
+
+          // TODO: support nesting
+          let requestedAttributes: string[]
+          if (verifiableCredential.type === ClaimFormat.SdJwtVc) {
+            const { metadata, visibleProperties } = filterAndMapSdJwtKeys(verifiableCredential.disclosedPayload)
+            requestedAttributes = [...Object.keys(visibleProperties), ...Object.keys(metadata)]
+          } else {
+            requestedAttributes = Object.keys(credential?.credentialSubject ?? {})
+          }
+
+          return {
+            id: verifiableCredential.credentialRecord.id,
+            credentialName: display.name,
+            issuerName: display.issuer.name,
+            requestedAttributes,
+            backgroundColor: display.backgroundColor,
+          }
+        }),
       }
     })
   })