diff options
Diffstat (limited to 'packages/taler-util/src/http-client')
-rw-r--r-- | packages/taler-util/src/http-client/authentication.ts | 12 | ||||
-rw-r--r-- | packages/taler-util/src/http-client/bank-core.ts | 10 | ||||
-rw-r--r-- | packages/taler-util/src/http-client/merchant.ts | 6 |
3 files changed, 16 insertions, 12 deletions
diff --git a/packages/taler-util/src/http-client/authentication.ts b/packages/taler-util/src/http-client/authentication.ts index 00ef21a06..f77df2ed0 100644 --- a/packages/taler-util/src/http-client/authentication.ts +++ b/packages/taler-util/src/http-client/authentication.ts @@ -45,7 +45,6 @@ export class TalerAuthenticationHttpClient { constructor( readonly baseUrl: string, - readonly username: string, httpClient?: HttpRequestLibrary, ) { this.httpLib = httpClient ?? createPlatformHttpLib(); @@ -61,7 +60,8 @@ export class TalerAuthenticationHttpClient { * * @returns */ - async createAccessToken( + async createAccessTokenBasic( + username: string, password: string, body: TalerAuthentication.TokenRequest, ) { @@ -69,7 +69,7 @@ export class TalerAuthenticationHttpClient { const resp = await this.httpLib.fetch(url.href, { method: "POST", headers: { - Authorization: makeBasicAuthHeader(this.username, password), + Authorization: makeBasicAuthHeader(username, password), }, body, }); @@ -90,15 +90,15 @@ export class TalerAuthenticationHttpClient { * * @returns */ - async createAccessTokenMerchant( - password: string, + async createAccessTokenBearer( + token: string, body: TalerAuthentication.TokenRequest, ) { const url = new URL(`token`, this.baseUrl); const resp = await this.httpLib.fetch(url.href, { method: "POST", headers: { - Authorization: makeBearerTokenAuthHeader(password as AccessToken), + Authorization: makeBearerTokenAuthHeader(token as AccessToken), }, body, }); diff --git a/packages/taler-util/src/http-client/bank-core.ts b/packages/taler-util/src/http-client/bank-core.ts index b544d56fe..7a98b6281 100644 --- a/packages/taler-util/src/http-client/bank-core.ts +++ b/packages/taler-util/src/http-client/bank-core.ts @@ -140,16 +140,18 @@ export class TalerCoreBankHttpClient { * */ async createAccount( - auth: AccessToken, + auth: AccessToken | undefined, body: TalerCorebankApi.RegisterAccountRequest, ) { const url = new URL(`accounts`, this.baseUrl); + const headers: Record<string, string> = {} + if (auth) { + headers.Authorization = makeBearerTokenAuthHeader(auth) + } const resp = await this.httpLib.fetch(url.href, { method: "POST", body, - headers: { - Authorization: makeBearerTokenAuthHeader(auth), - }, + headers: headers, }); switch (resp.status) { case HttpStatusCode.Ok: { diff --git a/packages/taler-util/src/http-client/merchant.ts b/packages/taler-util/src/http-client/merchant.ts index 1b1a7b4a8..394625e38 100644 --- a/packages/taler-util/src/http-client/merchant.ts +++ b/packages/taler-util/src/http-client/merchant.ts @@ -354,10 +354,11 @@ export class TalerMerchantInstanceHttpClient { headers, }); - // switch (resp.status) { case HttpStatusCode.Ok: return opEmptySuccess(resp); + case HttpStatusCode.NoContent: // FIXME: missing in docs + return opEmptySuccess(resp); case HttpStatusCode.NotFound: return opKnownHttpFailure(resp.status, resp); default: @@ -1778,9 +1779,10 @@ export class TalerMerchantManagementHttpClient extends TalerMerchantInstanceHttp */ async updateInstanceAuthentication( token: AccessToken | undefined, + instanceId: string, body: TalerMerchantApi.InstanceAuthConfigurationMessage, ) { - const url = new URL(`management/instances`, this.baseUrl); + const url = new URL(`management/instances/${instanceId}/auth`, this.baseUrl); const headers: Record<string, string> = {} if (token) { |