fix: remove reset for unauthorizedRequest

radixdlt · Mar 22, 2023 · bb575ae · bb575ae
1 parent f4cc5c4
commit bb575ae
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 4 deletions.
diff --git a/lib/IO/schemas.ts b/lib/IO/schemas.ts
@@ -299,7 +299,6 @@ const WalletUnauthorizedRequestItemsSchema = object({
   discriminator: literal('unauthorizedRequest'),
   oneTimeAccounts: OneTimeAccountsRequestItemSchema.optional(),
   oneTimePersonaData: OneTimePersonaDataRequestItemSchema.optional(),
-  reset: ResetRequestSchema.optional(),
 })
 
 export type WalletUnauthorizedRequestItems = z.infer<

diff --git a/lib/IO/transform-method-input.ts b/lib/IO/transform-method-input.ts
@@ -1,6 +1,11 @@
 import { ok } from 'neverthrow'
 import { requestMethodRequestType } from '../methods/request'
-import { NumberOfAccounts, WalletInteractionItems } from './schemas'
+import {
+  NumberOfAccounts,
+  ResetRequestItem,
+  WalletInteractionItems,
+  WalletUnauthorizedRequestItems,
+} from './schemas'
 
 export const provideDefaultNumberOfAccounts = (
   value: Partial<NumberOfAccounts>
@@ -9,6 +14,20 @@ export const provideDefaultNumberOfAccounts = (
   quantifier: value?.quantifier || 'atLeast',
 })
 
+const removeResetForUnauthorizedRequest = (value: WalletInteractionItems) => {
+  if (
+    value.discriminator === 'transaction' ||
+    value.discriminator === 'authorizedRequest'
+  )
+    return value
+
+  const { reset, ...rest } = value as WalletUnauthorizedRequestItems & {
+    reset: ResetRequestItem
+  }
+
+  return rest
+}
+
 export const transformMethodInput = <I extends {}>(input: I) =>
   ok(
     Object.entries(input).reduce<WalletInteractionItems>(
@@ -73,6 +92,7 @@ export const transformMethodInput = <I extends {}>(input: I) =>
 
           case requestMethodRequestType.reset: {
             const { accounts = false, personaData = false } = value
+            if (!accounts && !personaData) return acc
             return {
               ...acc,
               reset: { accounts, personaData },
@@ -96,4 +116,4 @@ export const transformMethodInput = <I extends {}>(input: I) =>
         discriminator: 'unauthorizedRequest',
       }
     )
-  )
+  ).map(removeResetForUnauthorizedRequest)
diff --git a/lib/__tests__/transform-method-input.spec.ts b/lib/__tests__/transform-method-input.spec.ts
@@ -279,7 +279,6 @@ describe('transformMethodInput', () => {
         {
           actual: requestItem.reset({ accounts: true }),
           expected: {
-            reset: { accounts: true, personaData: false },
             discriminator: 'unauthorizedRequest',
           },
         },