1 files changed, 140 insertions, 33 deletions

diff --git a/packages/taler-util/src/bank-api-client.ts b/packages/taler-util/src/bank-api-client.ts
index cc4123500..a8cd4b0da 100644
--- a/packages/taler-util/src/bank-api-client.ts
+++ b/packages/taler-util/src/bank-api-client.ts
@@ -146,11 +146,91 @@ export class WireGatewayApiClient {
   }
 }
 
+export interface ChallengeContactData {
+  // E-Mail address
+  email?: string;
+
+  // Phone number.
+  phone?: string;
+}
+
+export interface AccountBalance {
+  amount: AmountString;
+  credit_debit_indicator: "credit" | "debit";
+}
+
+export interface RegisterAccountRequest {
+  // Username
+  username: string;
+
+  // Password.
+  password: string;
+
+  // Legal name of the account owner
+  name: string;
+
+  // Defaults to false.
+  is_public?: boolean;
+
+  // Is this a taler exchange account?
+  // If true:
+  // - incoming transactions to the account that do not
+  //   have a valid reserve public key are automatically
+  // - the account provides the taler-wire-gateway-api endpoints
+  // Defaults to false.
+  is_taler_exchange?: boolean;
+
+  // Addresses where to send the TAN for transactions.
+  // Currently only used for cashouts.
+  // If missing, cashouts will fail.
+  // In the future, might be used for other transactions
+  // as well.
+  challenge_contact_data?: ChallengeContactData;
+
+  // 'payto' address pointing a bank account
+  // external to the libeufin-bank.
+  // Payments will be sent to this bank account
+  // when the user wants to convert the local currency
+  // back to fiat currency outside libeufin-bank.
+  cashout_payto_uri?: string;
+
+  // Internal payto URI of this bank account.
+  // Used mostly for testing.
+  internal_payto_uri?: string;
+}
+
+export interface AccountData {
+  // Legal name of the account owner.
+  name: string;
+
+  // Available balance on the account.
+  balance: AccountBalance;
+
+  // payto://-URI of the account.
+  payto_uri: string;
+
+  // Number indicating the max debit allowed for the requesting user.
+  debit_threshold: AmountString;
+
+  contact_data?: ChallengeContactData;
+
+  // 'payto' address pointing the bank account
+  // where to send cashouts.  This field is optional
+  // because not all the accounts are required to participate
+  // in the merchants' circuit.  One example is the exchange:
+  // that never cashouts.  Registering these accounts can
+  // be done via the access API.
+  cashout_payto_uri?: string;
+}
+
+export interface ConfirmWithdrawalArgs {
+  withdrawalOperationId: string;
+}
+
 /**
- * This API look like it belongs to harness
- * but it will be nice to have in utils to be used by others
+ * Client for the Taler corebank API.
  */
-export class BankAccessApiClient {
+export class TalerCorebankApiClient {
   httpLib: HttpRequestLibrary;
 
   constructor(
@@ -184,7 +264,7 @@ export class BankAccessApiClient {
     const resp = await this.httpLib.fetch(url.href, {
       headers: this.makeAuthHeader(),
     });
-    return await resp.json();
+    return readSuccessResponseJsonOrThrow(resp, codecForAny());
   }
 
   async getTransactions(username: string): Promise<void> {
@@ -215,24 +295,53 @@ export class BankAccessApiClient {
     return await readSuccessResponseJsonOrThrow(resp, codecForAny());
   }
 
-  async registerAccount(
-    username: string,
-    password: string,
-    options: {
-      iban?: string;
-    } = {},
-  ): Promise<BankUser> {
-    const url = new URL("testing/register", this.baseUrl);
+  async registerAccountExtended(req: RegisterAccountRequest): Promise<void> {
+    const url = new URL("accounts", this.baseUrl);
+    const resp = await this.httpLib.fetch(url.href, {
+      method: "POST",
+      body: req,
+    });
+
+    if (
+      resp.status !== 200 &&
+      resp.status !== 201 &&
+      resp.status !== 202 &&
+      resp.status !== 204
+    ) {
+      logger.error(`unexpected status ${resp.status} from POST ${url.href}`);
+      logger.error(`${j2s(await resp.json())}`);
+      throw TalerError.fromDetail(
+        TalerErrorCode.GENERIC_UNEXPECTED_REQUEST_ERROR,
+        {
+          httpStatusCode: resp.status,
+        },
+      );
+    }
+  }
+
+  /**
+   * Register a new account and return information about it.
+   *
+   * This is a helper, as it does both the registration and the
+   * account info query.
+   */
+  async registerAccount(username: string, password: string): Promise<BankUser> {
+    const url = new URL("accounts", this.baseUrl);
     const resp = await this.httpLib.fetch(url.href, {
       method: "POST",
       body: {
         username,
         password,
-        iban: options?.iban,
+        name: username,
       },
     });
-    let paytoUri = `payto://x-taler-bank/localhost/${username}`;
-    if (resp.status !== 200 && resp.status !== 202 && resp.status !== 204) {
+    if (
+      resp.status !== 200 &&
+      resp.status !== 201 &&
+      resp.status !== 202 &&
+      resp.status !== 204
+    ) {
+      logger.error(`unexpected status ${resp.status} from POST ${url.href}`);
       logger.error(`${j2s(await resp.json())}`);
       throw TalerError.fromDetail(
         TalerErrorCode.GENERIC_UNEXPECTED_REQUEST_ERROR,
@@ -241,31 +350,29 @@ export class BankAccessApiClient {
         },
       );
     }
-    try {
-      // Pybank has no body, thus this might throw.
-      const respJson = await resp.json();
-      // LibEuFin demobank returns payto URI in response
-      if (respJson.paytoUri) {
-        paytoUri = respJson.paytoUri;
-      }
-    } catch (e) {
-      // Do nothing
-    }
+    // FIXME: Corebank should directly return this info!
+    const infoUrl = new URL(`accounts/${username}`, this.baseUrl);
+    const infoResp = await this.httpLib.fetch(infoUrl.href, {
+      headers: {
+        Authorization: makeBasicAuthHeader(username, password),
+      },
+    });
+    // FIXME: Validate!
+    const acctInfo: AccountData = await readSuccessResponseJsonOrThrow(
+      infoResp,
+      codecForAny(),
+    );
     return {
       password,
       username,
-      accountPaytoUri: paytoUri,
+      accountPaytoUri: acctInfo.payto_uri,
     };
   }
 
   async createRandomBankUser(): Promise<BankUser> {
     const username = "user-" + encodeCrock(getRandomBytes(10)).toLowerCase();
     const password = "pw-" + encodeCrock(getRandomBytes(10)).toLowerCase();
-    // FIXME: This is just a temporary workaround, because demobank is running out of short IBANs
-    const iban = generateIban("DE", 15);
-    return await this.registerAccount(username, password, {
-      iban,
-    });
+    return await this.registerAccount(username, password);
   }
 
   async createWithdrawalOperation(
@@ -288,10 +395,10 @@ export class BankAccessApiClient {
 
   async confirmWithdrawalOperation(
     username: string,
-    wopi: WithdrawalOperationInfo,
+    wopi: ConfirmWithdrawalArgs,
   ): Promise<void> {
     const url = new URL(
-      `accounts/${username}/withdrawals/${wopi.withdrawal_id}/confirm`,
+      `withdrawals/${wopi.withdrawalOperationId}/confirm`,
       this.baseUrl,
     );
     logger.info(`confirming withdrawal operation via ${url.href}`);