From 772daa6ec2e7d956c6a66cd5bec05fca7e60cc7a Mon Sep 17 00:00:00 2001
From: Dawid Sowa <dawid.sowa@rdx.works>
Date: Wed, 13 Nov 2024 13:23:58 +0100
Subject: [PATCH] fix: add preauth request resolver

---
 examples/simple-dapp/src/main.ts              | 55 ++++++++++++++++++-
 .../request-resolver/resolvers/index.ts       |  1 +
 .../resolvers/pre-authorization-response.ts   | 46 ++++++++++++++++
 .../modules/wallet-request/wallet-request.ts  |  9 ++-
 packages/dapp-toolkit/src/schemas/index.ts    |  8 +--
 5 files changed, 108 insertions(+), 11 deletions(-)
 create mode 100644 packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/pre-authorization-response.ts

diff --git a/examples/simple-dapp/src/main.ts b/examples/simple-dapp/src/main.ts
index c88491bd..401fcaa8 100644
--- a/examples/simple-dapp/src/main.ts
+++ b/examples/simple-dapp/src/main.ts
@@ -36,7 +36,58 @@ content.innerHTML = `
     <button id="proof-of-ownership-request">Send proof of ownership request</button>
   </div>
   <hr/>
-    <textarea id="subintentManifest">YIELD_TO_PARENT;</textarea>
+    <textarea id="subintentManifest" cols="50" rows="10">ASSERT_WORKTOP_RESOURCES_INCLUDE
+    Map<Address, Enum>(
+        Address("resource_tdx_2_1t5cjs290gd2v4pm5rys02ty372zapefjejqm3w6ktcxj9aw3e7t4jw") => Enum<ResourceConstraint::General>(
+            Tuple(
+                Array<NonFungibleLocalId>(),
+                Enum<LowerBound::NonZero>(),
+                Enum<UpperBound::Unbounded>(),
+                Enum<AllowedIds::Any>()
+            )
+        ),
+        Address("resource_tdx_2_1t5dapa24l4xvwqtqe2jrdphtn7ga46gw67wr9fwn4gp532myfjqpck") => Enum<ResourceConstraint::General>(
+            Tuple(
+                Array<NonFungibleLocalId>(),
+                Enum<LowerBound::Inclusive>(Decimal("6")),
+                Enum<UpperBound::Unbounded>(),
+                Enum<AllowedIds::Any>()
+            )
+        ),
+        Address("resource_tdx_2_1th9k30slgu9uekfu42llstgcq80dx8d59hxgexe5hdaqzyp8etc2dv") => Enum<ResourceConstraint::General>(
+            Tuple(
+                Array<NonFungibleLocalId>(),
+                Enum<LowerBound::NonZero>(),
+                Enum<UpperBound::Inclusive>(Decimal("10")),
+                Enum<AllowedIds::Any>()
+            )
+        ),
+        Address("resource_tdx_2_1tknxxxxxxxxxradxrdxxxxxxxxx009923554798xxxxxxxxxtfd2jc") => Enum<ResourceConstraint::General>(
+            Tuple(
+                Array<NonFungibleLocalId>(),
+                Enum<LowerBound::Inclusive>(Decimal("2")),
+                Enum<UpperBound::Inclusive>(Decimal("5")),
+                Enum<AllowedIds::Any>()
+            )
+        ),
+        Address("resource_tdx_2_1thjlp88pc28eyfg3f2alq8zkggnr273j0saye4nj70vfnga6ldy7ru") => Enum<ResourceConstraint::General>(
+            Tuple(
+                Array<NonFungibleLocalId>(),
+                Enum<LowerBound::Inclusive>(Decimal("3")),
+                Enum<UpperBound::Inclusive>(Decimal("3")),
+                Enum<AllowedIds::Any>()
+            )
+        ),
+    )
+;
+
+CALL_METHOD
+    Address("account_tdx_2_12xuly5lqj0vzqctehs7a3c9wdjduh5sjelp2ywydw2ur4v3kjwlaly")
+    "deposit_batch"
+    Expression("ENTIRE_WORKTOP")
+;
+
+YIELD_TO_PARENT;</textarea>
 
   <div class="mt-25">
     <label>
@@ -125,7 +176,7 @@ subintentButton.onclick = async () => {
       ),
   )
 
-  console.log(result)
+  console.log('result', result.isOk() && result.value)
 }
 
 addCb.onclick = () => {
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/index.ts b/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/index.ts
index c3965723..5ce32902 100644
--- a/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/index.ts
+++ b/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/index.ts
@@ -1,3 +1,4 @@
 export * from './data-response'
 export * from './failed-response'
 export * from './send-transaction-response'
+export * from './pre-authorization-response'
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/pre-authorization-response.ts b/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/pre-authorization-response.ts
new file mode 100644
index 00000000..d04cf7f8
--- /dev/null
+++ b/packages/dapp-toolkit/src/modules/wallet-request/request-resolver/resolvers/pre-authorization-response.ts
@@ -0,0 +1,46 @@
+import { err, okAsync } from 'neverthrow'
+import { WalletInteractionResponse } from '../../../../schemas'
+import { RequestItemModule } from '../../request-items'
+import { SdkError } from '../../../../error'
+import { UpdateConnectButtonStatus, WalletResponseResolver } from '../type'
+
+const matchResponse = (
+  input: WalletInteractionResponse,
+): string | undefined => {
+  console.log('as reauths')
+  if (
+    input.discriminator === 'success' &&
+    input.items.discriminator === 'preAuthorizationResponse'
+  ) {
+    return input.items.signedPartialTransaction
+  }
+}
+
+export const preAuthorizationResponseResolver =
+  (dependencies: {
+    requestItemModule: RequestItemModule
+    updateConnectButtonStatus: UpdateConnectButtonStatus
+  }): WalletResponseResolver =>
+  ({ walletInteraction, walletInteractionResponse }) => {
+    const signedPartialTransaction = matchResponse(walletInteractionResponse)
+    if (!signedPartialTransaction) return okAsync(undefined)
+
+    const { interactionId } = walletInteraction
+
+    const { requestItemModule } = dependencies
+
+    return requestItemModule
+      .updateStatus({
+        id: interactionId,
+        status: 'success',
+        metadata: {
+          signedPartialTransaction,
+        },
+      })
+      .orElse((error) => {
+        dependencies.updateConnectButtonStatus('fail')
+        return err(SdkError(error.reason, interactionId))
+      })
+      .andTee(() => dependencies.updateConnectButtonStatus('success'))
+      .map(() => undefined)
+  }
diff --git a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
index 54ecc3db..16853f4c 100644
--- a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
+++ b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request.ts
@@ -37,6 +37,7 @@ import { RequestResolverModule } from './request-resolver/request-resolver.modul
 import {
   dataResponseResolver,
   failedResponseResolver,
+  preAuthorizationResponseResolver,
   sendTransactionResponseResolver,
 } from './request-resolver'
 import { RequestItemTypes } from 'radix-connect-common'
@@ -106,6 +107,10 @@ export const WalletRequestModule = (input: {
             requestItemModule,
             updateConnectButtonStatus,
           }),
+          preAuthorizationResponseResolver({
+            requestItemModule,
+            updateConnectButtonStatus,
+          }),
           failedResponseResolver({
             requestItemModule,
             updateConnectButtonStatus,
@@ -313,8 +318,8 @@ export const WalletRequestModule = (input: {
     return addNewRequest('preAuthorizationRequest', walletInteraction, false)
       .andThen(() => sendRequestAndAwaitResponse(walletInteraction))
       .map((requestItem) => ({
-        signedPartialTransaction:
-          requestItem.walletResponse.response.signedPartialTransaction,
+        signedPartialTransaction: requestItem.metadata
+          ?.signedPartialTransaction as string,
       }))
   }
 
diff --git a/packages/dapp-toolkit/src/schemas/index.ts b/packages/dapp-toolkit/src/schemas/index.ts
index 1685f4d9..4370f1b9 100644
--- a/packages/dapp-toolkit/src/schemas/index.ts
+++ b/packages/dapp-toolkit/src/schemas/index.ts
@@ -272,12 +272,6 @@ export const SubintentRequestItem = object({
   expiration: union([ExpireAtTime, ExpireAfterDelay]),
 })
 
-export type SubintentResponseItem = InferOutput<typeof SubintentResponseItem>
-export const SubintentResponseItem = object({
-  discriminator: literal('subintent'),
-  signedPartialTransaction: string(),
-})
-
 export type WalletPreAuthorizationItems = InferOutput<
   typeof WalletPreAuthorizationItems
 >
@@ -341,7 +335,7 @@ export type WalletPreAuthorizationResponseItems = InferOutput<
 >
 export const WalletPreAuthorizationResponseItems = object({
   discriminator: literal('preAuthorizationResponse'),
-  response: optional(SubintentResponseItem),
+  signedPartialTransaction: string(),
 })
 
 export const AuthLoginRequestResponseItem = union([