diff --git a/packages/frames.js/src/getAddressForFid.ts b/packages/frames.js/src/getAddressForFid.ts index 8360e89e..117dd372 100644 --- a/packages/frames.js/src/getAddressForFid.ts +++ b/packages/frames.js/src/getAddressForFid.ts @@ -21,16 +21,20 @@ export async function getAddressForFid< const { fallbackToCustodyAddress = true, hubHttpUrl = DEFAULT_HUB_API_URL, - hubRequestOptions = { - headers: { - api_key: DEFAULT_HUB_API_KEY, - }, - }, + hubRequestOptions = {}, } = options; + const requestOptions = { + ...hubRequestOptions, + headers: { + ...(hubRequestOptions.headers ?? {}), + api_key: DEFAULT_HUB_API_KEY, + }, + }; + const response = await fetch( `${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`, - hubRequestOptions + requestOptions ); const { messages } = (await response .clone() diff --git a/packages/frames.js/src/getAddressesForFid.ts b/packages/frames.js/src/getAddressesForFid.ts index 80918533..740f0a6c 100644 --- a/packages/frames.js/src/getAddressesForFid.ts +++ b/packages/frames.js/src/getAddressesForFid.ts @@ -31,15 +31,19 @@ export async function getAddressesForFid({ }): Promise { const { hubHttpUrl = DEFAULT_HUB_API_URL, - hubRequestOptions = { - headers: { - api_key: DEFAULT_HUB_API_KEY, - }, - }, + hubRequestOptions = {}, } = options; + const requestOptions = { + ...hubRequestOptions, + headers: { + ...(hubRequestOptions.headers ?? {}), + api_key: DEFAULT_HUB_API_KEY, + }, + }; + const [verificationsResponse, custodyAddress] = await Promise.all([ - fetch(`${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`, hubRequestOptions), + fetch(`${hubHttpUrl}/v1/verificationsByFid?fid=${fid}`, requestOptions), getCustodyAddressForFid(fid), ]); diff --git a/packages/frames.js/src/getUserDataForFid.ts b/packages/frames.js/src/getUserDataForFid.ts index 9d0af3b4..943aba37 100644 --- a/packages/frames.js/src/getUserDataForFid.ts +++ b/packages/frames.js/src/getUserDataForFid.ts @@ -16,16 +16,22 @@ export async function getUserDataForFid< }): Promise { const { hubHttpUrl = DEFAULT_HUB_API_URL, - hubRequestOptions = { - headers: { - api_key: DEFAULT_HUB_API_KEY, - }, - }, + hubRequestOptions = {}, } = options; + const requestHeaders = { + api_key: DEFAULT_HUB_API_KEY, + ...(hubRequestOptions.headers ?? {}), + }; + + const requestOptions = { + ...hubRequestOptions, + headers: requestHeaders, + }; + const userDataResponse = await fetch( `${hubHttpUrl}/v1/userDataByFid?fid=${fid}`, - hubRequestOptions + requestOptions ); const { messages } = (await userDataResponse @@ -59,9 +65,7 @@ export async function getUserDataForFid< const { type, value } = message.data.userDataBody; const foundValue = acc[type]; - if (foundValue && foundValue.timestamp < timestamp) { - acc[type] = { value, timestamp }; - } else { + if (!foundValue || foundValue.timestamp < timestamp) { acc[type] = { value, timestamp }; } } catch (error) {