Fix: use home domain for SEP-10 auth + don't show duplicate logs (ste…

…llar#324) * Fix duplicate logs * Use home domain for SEP-10 auth
espresso-cash · Sep 19, 2023 · 16a925b · 16a925b
1 parent 5d60caa
commit 16a925b
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 21 deletions.
diff --git a/packages/demo-wallet-client/src/components/Logs.tsx b/packages/demo-wallet-client/src/components/Logs.tsx
@@ -29,11 +29,9 @@ export const Logs = () => {
 
     document.addEventListener(LOG_MESSAGE_EVENT, onLogEventMessage);
 
-    return document.removeEventListener(
-      LOG_MESSAGE_EVENT,
-      onLogEventMessage,
-      true,
-    );
+    return () => {
+      document.removeEventListener(LOG_MESSAGE_EVENT, onLogEventMessage);
+    };
   }, [dispatch]);
 
   const logsToMarkdown = (logItems: LogItemProps[]) => {

diff --git a/packages/demo-wallet-client/src/ducks/logs.ts b/packages/demo-wallet-client/src/ducks/logs.ts
@@ -27,7 +27,14 @@ const logsSlice = createSlice({
       state.status = ActionStatus.PENDING;
     });
     builder.addCase(addLogAction.fulfilled, (state, action) => {
-      state.items = [...state.items, action.payload];
+      // Make sure we're not duplicating logs
+      const currentLogId = `${action.payload.type}-${action.payload.title}`;
+      const previousLog = [...state.items]?.pop();
+      const previousLogId = `${previousLog?.type}-${previousLog?.title}`;
+
+      if (currentLogId !== previousLogId) {
+        state.items = [...state.items, action.payload];
+      }
       state.status = ActionStatus.SUCCESS;
     });
   },

diff --git a/packages/demo-wallet-client/src/ducks/sep24DepositAsset.ts b/packages/demo-wallet-client/src/ducks/sep24DepositAsset.ts
@@ -5,6 +5,7 @@ import { settingsSelector } from "ducks/settings";
 import { custodialSelector } from "ducks/custodial";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { normalizeHomeDomainUrl } from "demo-wallet-shared/build/helpers/normalizeHomeDomainUrl";
 import { log } from "demo-wallet-shared/build/helpers/log";
 import {
   sep10AuthStart,
@@ -114,14 +115,12 @@ export const depositAssetAction = createAsyncThunk<
           "SEP-24 deposit is enabled, and requires authentication so we should go through SEP-10",
       });
 
-      const serviceDomain = new URL(tomlResponse.TRANSFER_SERVER_SEP0024).host;
-
       // SEP-10 start
       const challengeTransaction = await sep10AuthStart({
         authEndpoint: tomlResponse.WEB_AUTH_ENDPOINT,
         serverSigningKey: tomlResponse.SIGNING_KEY,
         publicKey: custodialPublicKey || publicKey,
-        homeDomain: serviceDomain,
+        homeDomain: normalizeHomeDomainUrl(homeDomain).host,
         clientDomain,
         memoId: custodialMemoId,
       });

diff --git a/packages/demo-wallet-client/src/ducks/sep24WithdrawAsset.ts b/packages/demo-wallet-client/src/ducks/sep24WithdrawAsset.ts
@@ -4,6 +4,7 @@ import { accountSelector } from "ducks/account";
 import { custodialSelector } from "ducks/custodial";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { normalizeHomeDomainUrl } from "demo-wallet-shared/build/helpers/normalizeHomeDomainUrl";
 import { log } from "demo-wallet-shared/build/helpers/log";
 import {
   sep10AuthStart,
@@ -91,14 +92,12 @@ export const withdrawAssetAction = createAsyncThunk<
           "SEP-24 withdrawal is enabled, and requires authentication so we should go through SEP-10",
       });
 
-      const serviceDomain = new URL(tomlResponse.TRANSFER_SERVER_SEP0024).host;
-
       // SEP-10 start
       const challengeTransaction = await sep10AuthStart({
         authEndpoint: tomlResponse.WEB_AUTH_ENDPOINT,
         serverSigningKey: tomlResponse.SIGNING_KEY,
         publicKey: custodialPublicKey || publicKey,
-        homeDomain: serviceDomain,
+        homeDomain: normalizeHomeDomainUrl(homeDomain).host,
         clientDomain,
         memoId: custodialMemoId,
       });

diff --git a/packages/demo-wallet-client/src/ducks/sep31Send.ts b/packages/demo-wallet-client/src/ducks/sep31Send.ts
@@ -3,6 +3,7 @@ import { RootState, walletBackendEndpoint, clientDomain } from "config/store";
 import { accountSelector } from "ducks/account";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { normalizeHomeDomainUrl } from "demo-wallet-shared/build/helpers/normalizeHomeDomainUrl";
 import { log } from "demo-wallet-shared/build/helpers/log";
 
 import {
@@ -221,16 +222,15 @@ export const fetchSendFieldsAction = createAsyncThunk<
         senderType,
         receiverType,
         fields,
+        homeDomain,
       } = data;
 
-      const serviceDomain = new URL(kycServer).host;
-
       // SEP-10 start
       const challengeTransaction = await sep10AuthStart({
         authEndpoint,
         serverSigningKey,
         publicKey,
-        homeDomain: serviceDomain,
+        homeDomain: normalizeHomeDomainUrl(homeDomain).host,
         clientDomain,
       });
 

diff --git a/packages/demo-wallet-client/src/ducks/sep6DepositAsset.ts b/packages/demo-wallet-client/src/ducks/sep6DepositAsset.ts
@@ -4,6 +4,7 @@ import { accountSelector } from "ducks/account";
 import { settingsSelector } from "ducks/settings";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { normalizeHomeDomainUrl } from "demo-wallet-shared/build/helpers/normalizeHomeDomainUrl";
 import { log } from "demo-wallet-shared/build/helpers/log";
 import { checkDepositWithdrawInfo } from "demo-wallet-shared/build/methods/checkDepositWithdrawInfo";
 import {
@@ -116,14 +117,12 @@ export const initiateDepositAction = createAsyncThunk<
             "SEP-6 deposit is enabled, and requires authentication so we should go through SEP-10",
         });
 
-        const serviceDomain = new URL(tomlResponse.TRANSFER_SERVER).host;
-
         // SEP-10 start
         const challengeTransaction = await sep10AuthStart({
           authEndpoint: webAuthTomlResponse.WEB_AUTH_ENDPOINT,
           serverSigningKey: webAuthTomlResponse.SIGNING_KEY,
           publicKey,
-          homeDomain: serviceDomain,
+          homeDomain: normalizeHomeDomainUrl(homeDomain).host,
           clientDomain,
         });
 

diff --git a/packages/demo-wallet-client/src/ducks/sep6WithdrawAsset.ts b/packages/demo-wallet-client/src/ducks/sep6WithdrawAsset.ts
@@ -4,6 +4,7 @@ import { accountSelector } from "ducks/account";
 import { settingsSelector } from "ducks/settings";
 import { getErrorMessage } from "demo-wallet-shared/build/helpers/getErrorMessage";
 import { getNetworkConfig } from "demo-wallet-shared/build/helpers/getNetworkConfig";
+import { normalizeHomeDomainUrl } from "demo-wallet-shared/build/helpers/normalizeHomeDomainUrl";
 import { log } from "demo-wallet-shared/build/helpers/log";
 import { checkDepositWithdrawInfo } from "demo-wallet-shared/build/methods/checkDepositWithdrawInfo";
 import {
@@ -111,14 +112,12 @@ export const initiateWithdrawAction = createAsyncThunk<
             "SEP-6 withdrawal is enabled, and requires authentication so we should go through SEP-10",
         });
 
-        const serviceDomain = new URL(tomlResponse.TRANSFER_SERVER).host;
-
         // SEP-10 start
         const challengeTransaction = await sep10AuthStart({
           authEndpoint: webAuthTomlResponse.WEB_AUTH_ENDPOINT,
           serverSigningKey: webAuthTomlResponse.SIGNING_KEY,
           publicKey,
-          homeDomain: serviceDomain,
+          homeDomain: normalizeHomeDomainUrl(homeDomain).host,
           clientDomain,
         });