merge getwalletaddress util

Author: DarianM

frontend/app/routes/api.config.$type.ts

@@ -16,7 +16,6 @@ import {
   getValidWalletAddress
 } from '~/utils/open-payments.server.js'
 import { APP_BASEPATH } from '~/lib/constants.js'
-import { normalizeWalletAddress } from '@shared/utils'
 
 export async function loader({ request, params, context }: LoaderFunctionArgs) {
   try {
@@ -97,7 +96,7 @@ export async function action({ request, params, context }: ActionFunctionArgs) {
     return json({ errors, success: false, intent }, { status: 400 })
   }
 
-  let ownerWalletAddress: string = payload.walletAddress
+  const ownerWalletAddress: string = payload.walletAddress
   const walletAddress = await getValidWalletAddress(env, ownerWalletAddress)
 
   const session = await getSession(request.headers.get('Cookie'))
@@ -136,7 +135,6 @@ export async function action({ request, params, context }: ActionFunctionArgs) {
     }
   }
 
-  ownerWalletAddress = normalizeWalletAddress(walletAddress)
   const storageService = new ConfigStorageService(env)
   switch (request.method) {
     case 'POST':

frontend/app/utils/validate.server.ts

@@ -2,7 +2,7 @@ import { z } from 'zod'
 import { CornerType, PositionType, SlideAnimationType } from '@shared/types'
 import {
   checkHrefFormat,
-  isValidWalletAddress,
+  getWalletAddress,
   toWalletAddressUrl,
   WalletAddressFormatError
 } from '@shared/utils'
@@ -19,7 +19,7 @@ export const walletSchema = z.object({
 
       try {
         checkHrefFormat(updatedUrl)
-        await isValidWalletAddress(updatedUrl)
+        await getWalletAddress(updatedUrl)
       } catch (e) {
         ctx.addIssue({
           code: z.ZodIssueCode.custom,

shared/utils/index.ts

@@ -1,30 +1,38 @@
 import type { WalletAddress } from '@interledger/open-payments'
 
-export function toWalletAddressUrl(s: string): string {
-  return s.startsWith('$') ? s.replace('$', 'https://') : s
-}
-
 export async function getWalletAddress(
   walletAddressUrl: string
 ): Promise<WalletAddress> {
   const url = toWalletAddressUrl(walletAddressUrl)
 
-  const res = await fetch(url)
-  if (!res.ok) {
-    throw new Error('Unable to fetch wallet details', {
-      cause: new Error(res.statusText || `HTTP ${res.status}`)
+  const response = await fetch(url)
+  if (!response.ok) {
+    if (response.status === 404) {
+      throw new WalletAddressFormatError('This wallet address does not exist')
+    }
+    throw new WalletAddressFormatError('Unable to fetch wallet details', {
+      cause: new WalletAddressFormatError(
+        response.statusText || `HTTP ${response.status}`
+      )
     })
   }
 
+  let json: Record<string, unknown>
   try {
-    const json: Record<string, unknown> = await res.json()
-    if (!isWalletAddress(json)) {
-      throw new Error('Invalid wallet address format')
-    }
-    return json
+    json = await response.json()
   } catch (error) {
-    throw new Error('Failed to parse wallet address content', { cause: error })
+    throw new WalletAddressFormatError(
+      'Provided URL is not a valid wallet address',
+      {
+        cause: error
+      }
+    )
+  }
+  if (!isWalletAddress(json)) {
+    throw new WalletAddressFormatError('Invalid wallet address format')
   }
+
+  return normalizeWalletAddress(json)
 }
 
 export function isWalletAddress(
@@ -44,7 +52,13 @@ export function isWalletAddress(
   )
 }
 
-export function normalizeWalletAddress(walletAddress: WalletAddress): string {
+export function toWalletAddressUrl(s: string): string {
+  return s.startsWith('$') ? s.replace('$', 'https://') : s
+}
+
+export function normalizeWalletAddress(
+  walletAddress: WalletAddress
+): WalletAddress {
   const IS_INTERLEDGER_CARDS =
     walletAddress.authServer === 'https://auth.interledger.cards'
   const url = new URL(toWalletAddressUrl(walletAddress.id))
@@ -60,9 +74,12 @@ export function normalizeWalletAddress(walletAddress: WalletAddress): string {
     //
     // Not all `ilp.interledger.cards` wallet addresses can be used with `ilp.dev`.
     // Manually created wallet addresses cannot be used with `ilp.dev`.
-    return walletAddress.id.replace('ilp.dev', 'ilp.interledger.cards')
+    return {
+      ...walletAddress,
+      id: walletAddress.id.replace('ilp.dev', 'ilp.interledger.cards')
+    }
   }
-  return walletAddress.id
+  return walletAddress
 }
 
 export class WalletAddressFormatError extends Error {
@@ -100,33 +117,3 @@ export function checkHrefFormat(href: string): string {
 
   return href
 }
-
-export async function isValidWalletAddress(
-  walletAddressUrl: string
-): Promise<boolean> {
-  const response = await fetch(walletAddressUrl, {
-    headers: {
-      Accept: 'application/json'
-    }
-  })
-
-  if (!response.ok) {
-    if (response.status === 404) {
-      throw new WalletAddressFormatError('This wallet address does not exist.')
-    }
-    throw new WalletAddressFormatError('Failed to fetch wallet address.')
-  }
-
-  const msgInvalidWalletAddress = 'Provided URL is not a valid wallet address.'
-  const json = await response.json().catch((error) => {
-    throw new WalletAddressFormatError(msgInvalidWalletAddress, {
-      cause: error
-    })
-  })
-
-  if (!isWalletAddress(json as Record<string, unknown>)) {
-    throw new WalletAddressFormatError(msgInvalidWalletAddress)
-  }
-
-  return true
-}