commit f15d87ade77297429d753edbff679fb8e1fa95e8
parent ca7de594e0aae9e7af944fbeede3852614ec5469
Author: Martin Schanzenbach <schanzen@gnunet.org>
Date: Wed, 21 Oct 2026 11:13:02 +0200
mailbox: correctly name MailboxBaseUrl type GetMailboxRequest, all other uses should have been strings and are now.
Diffstat:
4 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/packages/taler-util/src/types-taler-wallet.ts b/packages/taler-util/src/types-taler-wallet.ts
@@ -1644,7 +1644,7 @@ export interface TaldirRegistrationCompletionRequest {
aliasType: string;
challenge: string;
taldirBaseUrl: string;
- mailboxBaseUrl: MailboxBaseUrl;
+ mailboxBaseUrl: string;
mailboxAddress: string;
progressToken?: string;
}
@@ -1652,7 +1652,7 @@ export interface TaldirRegistrationCompletionRequest {
export const codecForTaldirRegistrationCompletionRequest =
(): Codec<TaldirRegistrationCompletionRequest> =>
buildCodecForObject<TaldirRegistrationCompletionRequest>()
- .property("mailboxBaseUrl", codecForMailboxBaseUrl())
+ .property("mailboxBaseUrl", codecForString())
.property("mailboxAddress", codecForString())
.property("taldirBaseUrl", codecForString())
.property("alias", codecForString())
@@ -1665,7 +1665,7 @@ export interface TaldirRegistrationRequest {
alias: string;
aliasType: string;
taldirBaseUrl: string;
- mailboxBaseUrl: MailboxBaseUrl;
+ mailboxBaseUrl: string;
mailboxAddress: string;
duration: RelativeTime;
progressToken?: string;
@@ -1674,7 +1674,7 @@ export interface TaldirRegistrationRequest {
export const codecForTaldirRegistrationRequest =
(): Codec<TaldirRegistrationRequest> =>
buildCodecForObject<TaldirRegistrationRequest>()
- .property("mailboxBaseUrl", codecForMailboxBaseUrl())
+ .property("mailboxBaseUrl", codecForString())
.property("mailboxAddress", codecForString())
.property("taldirBaseUrl", codecForString())
.property("alias", codecForString())
@@ -1725,14 +1725,14 @@ export interface MailboxMessageRecordsResponse {
messages: MailboxMessageRecord[];
}
-export interface MailboxBaseUrl {
+export interface GetMailboxRequest {
mailboxBaseUrl: string;
}
-export const codecForMailboxBaseUrl = (): Codec<MailboxBaseUrl> =>
-buildCodecForObject<MailboxBaseUrl>()
+export const codecForGetMailboxRequest = (): Codec<GetMailboxRequest> =>
+buildCodecForObject<GetMailboxRequest>()
.property("mailboxBaseUrl", codecForString())
- .build("MailboxBaseUrl");
+ .build("GetMailboxRequest");
export interface MailboxConfiguration {
mailboxBaseUrl: string;
@@ -1783,14 +1783,14 @@ export const codecForMailboxRegistrationRequest =
.build("MailboxRegistrationRequest");
export interface MailboxInitializationRequest {
- mailboxBaseUrl: MailboxBaseUrl;
+ mailboxBaseUrl: string;
progressToken?: string;
}
export const codecForMailboxInitializationRequest =
(): Codec<MailboxInitializationRequest> =>
buildCodecForObject<MailboxInitializationRequest>()
- .property("mailboxBaseUrl", codecForMailboxBaseUrl())
+ .property("mailboxBaseUrl", codecForString())
.property("progressToken", codecOptional(codecForString()))
.build("MailboxInitializationRequest");
diff --git a/packages/taler-wallet-core/src/mailbox.ts b/packages/taler-wallet-core/src/mailbox.ts
@@ -29,7 +29,6 @@ import {
GetMailboxResponse,
HttpStatusCode,
Logger,
- MailboxBaseUrl,
MailboxConfiguration,
MailboxMessageRecord,
MailboxMessageRecordsResponse,
@@ -61,6 +60,7 @@ import {
succeedOrThrow,
MailboxRegisterRequestHttp,
MailboxInitializationRequest,
+ GetMailboxRequest,
} from "@gnu-taler/taler-util";
import { WalletExecutionContext } from "./wallet.js";
import {
@@ -225,12 +225,12 @@ async function internalRegisterMailbox(
*/
export async function getMailbox(
wex: WalletExecutionContext,
- mailboxBaseUrl: MailboxBaseUrl,
+ mailboxReq: GetMailboxRequest,
): Promise<GetMailboxResponse> {
return await wex.runWalletDbTx(async (tx) => {
return {
mailboxConfiguration: await tx.getMailboxConfiguration(
- mailboxBaseUrl.mailboxBaseUrl,
+ mailboxReq.mailboxBaseUrl,
),
};
});
@@ -256,7 +256,6 @@ async function internalInitializeMailbox(
wex: WalletExecutionContext,
req: MailboxInitializationRequest,
): Promise<MailboxConfiguration> {
- const mailboxBaseUrl = req.mailboxBaseUrl;
const keys = createEddsaKeyPair();
const hpkeKey = encodeCrock(hpkeCreateSecretKey());
const privKey = encodeCrock(keys.eddsaPriv);
@@ -268,7 +267,7 @@ async function internalInitializeMailbox(
}),
);
const mailboxConf: MailboxConfiguration = {
- mailboxBaseUrl: mailboxBaseUrl.mailboxBaseUrl,
+ mailboxBaseUrl: req.mailboxBaseUrl,
privateKey: privKey,
privateEncryptionKey: hpkeKey,
hAddress: hAddress,
diff --git a/packages/taler-wallet-core/src/requests.ts b/packages/taler-wallet-core/src/requests.ts
@@ -230,7 +230,7 @@ import {
codecForListWithdrawalExchangeCandidatesRequest,
codecForListSubscriptionsRequest,
codecForMigrateDatabaseRequest,
- codecForMailboxBaseUrl,
+ codecForGetMailboxRequest,
codecForMailboxRefreshRequest,
codecForPrepareBankIntegratedWithdrawalRequest,
codecForPreparePayForPaivanaRequest,
@@ -2595,7 +2595,7 @@ const handlers: { [T in WalletApiOperation]: HandlerWithValidator<T> } = {
handler: initializeMailbox,
},
[WalletApiOperation.GetMailbox]: {
- codec: codecForMailboxBaseUrl(),
+ codec: codecForGetMailboxRequest(),
handler: getMailbox,
},
[WalletApiOperation.SendTalerUriMailboxMessage]: {
diff --git a/packages/taler-wallet-core/src/wallet-api-types.ts b/packages/taler-wallet-core/src/wallet-api-types.ts
@@ -158,7 +158,6 @@ import {
ListGlobalCurrencyExchangesResponse,
ListSubscriptionsRequest,
ListSubscriptionsResponse,
- MailboxBaseUrl,
MailboxConfiguration,
MailboxMessageRecordsResponse,
MailboxMessagesResponse,
@@ -234,6 +233,7 @@ import {
WithdrawalDetailsForAmount,
MailboxRefreshRequest,
MailboxInitializationRequest,
+ GetMailboxRequest,
} from "@gnu-taler/taler-util";
import { PaymentBalanceDetails } from "./balance.js";
import { WithdrawTestBalanceResult } from "./testing.js";
@@ -667,7 +667,7 @@ export type InitializeMailboxOp = {
*/
export type GetMailboxOp = {
op: WalletApiOperation.GetMailbox;
- request: MailboxBaseUrl;
+ request: GetMailboxRequest;
response: GetMailboxResponse;
};