fix: include challenge in reset dApp request

radixdlt · Sep 27, 2023 · d8fec0c · d8fec0c
1 parent 23a68fc
commit d8fec0c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 6 deletions.
diff --git a/src/data-request/transformations/shared-data.ts b/src/data-request/transformations/shared-data.ts
@@ -9,9 +9,21 @@ export const transformWalletRequestToSharedData = (
 ): SharedData => {
   if (walletDataRequest.discriminator === 'authorizedRequest')
     return produce({}, (draft: SharedData) => {
+      draft.persona = { proof: false }
+
+      draft.ongoingAccounts = {
+        proof: false,
+        numberOfAccounts: undefined,
+      }
+
+      if (walletDataRequest.auth.discriminator === 'loginWithChallenge')
+        draft.persona.proof = !!walletDataRequest.auth.challenge
+
       if (walletDataRequest.ongoingAccounts) {
-        draft.ongoingAccounts =
-          walletDataRequest.ongoingAccounts.numberOfAccounts
+        draft.ongoingAccounts = {
+          proof: !!walletDataRequest.ongoingAccounts.challenge,
+          numberOfAccounts: walletDataRequest.ongoingAccounts.numberOfAccounts,
+        }
       }
 
       if (walletDataRequest.ongoingPersonaData) {
@@ -28,8 +40,8 @@ export const transformSharedDataToDataRequestState = (
   produce({}, (draft: DataRequestState) => {
     if (sharedData.ongoingAccounts) {
       draft.accounts = {
-        numberOfAccounts: sharedData.ongoingAccounts,
-        withProof: false,
+        numberOfAccounts: sharedData.ongoingAccounts.numberOfAccounts!,
+        withProof: sharedData.ongoingAccounts.proof,
         reset: true,
       }
     }
@@ -44,4 +56,8 @@ export const transformSharedDataToDataRequestState = (
         reset: true,
       }
     }
+
+    if (sharedData.persona) {
+      draft.persona = { withProof: !!sharedData.persona.proof }
+    }
   })
diff --git a/src/state/types.ts b/src/state/types.ts
@@ -6,7 +6,15 @@ import {
   PersonaDataRequestItem,
   Proof,
 } from '@radixdlt/wallet-sdk'
-import { array, discriminatedUnion, literal, object, string, z } from 'zod'
+import {
+  array,
+  boolean,
+  discriminatedUnion,
+  literal,
+  object,
+  string,
+  z,
+} from 'zod'
 
 export const proofType = {
   persona: 'persona',
@@ -67,7 +75,11 @@ export const WalletData = object({
 
 export type SharedData = z.infer<typeof SharedData>
 export const SharedData = object({
-  ongoingAccounts: NumberOfValues.optional(),
+  persona: object({ proof: boolean() }).optional(),
+  ongoingAccounts: object({
+    numberOfAccounts: NumberOfValues.optional(),
+    proof: boolean(),
+  }).optional(),
   ongoingPersonaData: PersonaDataRequestItem.optional(),
 })