[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-typescript-core] 02/02: fixed MerchantAuthMethod as enum
|
From: |
Admin |
|
Subject: |
[taler-typescript-core] 02/02: fixed MerchantAuthMethod as enum |
|
Date: |
Wed, 12 Feb 2025 20:33:36 +0100 |
This is an automated email from the git hooks/post-receive script.
sebasjm pushed a commit to branch master
in repository taler-typescript-core.
commit dbdc6073fcb2a937ac0d15b8c787b99f5581740e
Author: Sebastian <sebasjm@gmail.com>
AuthorDate: Wed Feb 12 16:33:25 2025 -0300
fixed MerchantAuthMethod as enum
---
.../src/hooks/instance.test.ts | 29 ++++++++++------------
.../src/paths/admin/create/CreatePage.tsx | 5 ++--
.../paths/instance/kyc/list/ListPage.stories.tsx | 8 +++++-
.../instance/orders/details/Detail.stories.tsx | 1 +
.../src/paths/instance/token/index.tsx | 19 ++++++++------
.../src/paths/instance/update/Update.stories.tsx | 3 ++-
packages/taler-harness/src/index.ts | 7 +++---
7 files changed, 41 insertions(+), 31 deletions(-)
diff --git a/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
b/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
index f409592b0..d9f4a4cd9 100644
--- a/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
+++ b/packages/merchant-backoffice-ui/src/hooks/instance.test.ts
@@ -19,14 +19,11 @@
* @author Sebastian Javier Marchano (sebasjm)
*/
-import { TalerMerchantApi } from "@gnu-taler/taler-util";
+import { MerchantAuthMethod, TalerMerchantApi } from "@gnu-taler/taler-util";
import { useMerchantApiContext } from "@gnu-taler/web-util/browser";
import * as tests from "@gnu-taler/web-util/testing";
import { expect } from "chai";
-import {
- useBackendInstances,
- useInstanceDetails,
-} from "./instance.js";
+import { useBackendInstances, useInstanceDetails } from "./instance.js";
import { ApiMockEnvironment } from "./testing.js";
import {
API_CREATE_INSTANCE,
@@ -51,7 +48,7 @@ describe("instance api interaction with details", () => {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
// const api = useInstanceAPI();
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useInstanceDetails();
return { query, api };
},
@@ -119,7 +116,7 @@ describe("instance api interaction with details", () => {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useInstanceDetails();
return { query, api };
},
@@ -155,7 +152,7 @@ describe("instance api interaction with details", () => {
// "d_us": "forever",
// },
// refreshable: true,
- // },
+ // },
// });
env.addRequestExpectation(API_GET_CURRENT_INSTANCE, {
response: {
@@ -205,7 +202,7 @@ describe("instance api interaction with details", () => {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useInstanceDetails();
return { query, api };
},
@@ -243,7 +240,7 @@ describe("instance api interaction with details", () => {
});
api.instance.updateCurrentInstanceAuthentication(undefined, {
- method: "external"
+ method: MerchantAuthMethod.EXTERNAL,
});
},
({ query, api }) => {
@@ -338,7 +335,7 @@ describe("instance admin api interaction with listing", ()
=> {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useBackendInstances();
return { query, api };
},
@@ -382,7 +379,7 @@ describe("instance admin api interaction with listing", ()
=> {
api.instance.createInstance(undefined, {
name: "other_name",
- } as TalerMerchantApi.InstanceConfigurationMessage)
+ } as TalerMerchantApi.InstanceConfigurationMessage);
},
({ query, api }) => {
expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -429,7 +426,7 @@ describe("instance admin api interaction with listing", ()
=> {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useBackendInstances();
return { query, api };
},
@@ -583,7 +580,7 @@ describe("instance admin api interaction with listing", ()
=> {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useBackendInstances();
return { query, api };
},
@@ -628,7 +625,7 @@ describe("instance admin api interaction with listing", ()
=> {
},
});
- api.instance.deleteInstance(undefined, "the_id", { purge: true })
+ api.instance.deleteInstance(undefined, "the_id", { purge: true });
},
({ query, api }) => {
expect(env.assertJustExpectedRequestWereMade()).deep.eq({
@@ -671,7 +668,7 @@ describe("instance management api interaction with
listing", () => {
const hookBehavior = await tests.hookBehaveLikeThis(
() => {
- const { lib: api } = useMerchantApiContext()
+ const { lib: api } = useMerchantApiContext();
const query = useBackendInstances();
return { query, api };
},
diff --git
a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
index 406cfd698..f6cbaf06e 100644
--- a/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/admin/create/CreatePage.tsx
@@ -21,6 +21,7 @@
import {
Duration,
+ MerchantAuthMethod,
TalerMerchantApi,
createRFC8959AccessTokenPlain,
} from "@gnu-taler/taler-util";
@@ -148,9 +149,9 @@ export function CreatePage({ onCreate, onBack, forceId }:
Props): VNode {
const accessControl = !!tokenForm.accessControl;
newValue.auth_token = undefined;
newValue.auth = !accessControl
- ? { method: "external" }
+ ? { method: MerchantAuthMethod.EXTERNAL }
: {
- method: "token",
+ method: MerchantAuthMethod.TOKEN,
token: createRFC8959AccessTokenPlain(tokenForm.token!),
};
if (!newValue.address) newValue.address = {};
diff --git
a/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.stories.tsx
b/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.stories.tsx
index 2220b6d1e..f8ae67606 100644
---
a/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.stories.tsx
+++
b/packages/merchant-backoffice-ui/src/paths/instance/kyc/list/ListPage.stories.tsx
@@ -19,7 +19,7 @@
* @author Sebastian Javier Marchano (sebasjm)
*/
-import { PaytoString } from "@gnu-taler/taler-util";
+import { MerchantAccountKycStatus, PaytoString } from "@gnu-taler/taler-util";
import * as tests from "@gnu-taler/web-util/testing";
import { ListPage as TestedComponent } from "./ListPage.js";
@@ -38,6 +38,8 @@ export const Example = tests.createExample(TestedComponent, {
kyc_data: [
{
exchange_url: "http://exchange.taler";,
+ status: MerchantAccountKycStatus.AWAITING_AML_REVIEW,
+ h_wire: "",
payto_uri: "payto://iban/de123123123" as PaytoString,
// kyc_url: "http://exchange.taler/kyc";,
exchange_http_status: 0,
@@ -46,6 +48,8 @@ export const Example = tests.createExample(TestedComponent, {
},
{
exchange_http_status: 1,
+ status: MerchantAccountKycStatus.AWAITING_AML_REVIEW,
+ h_wire: "",
exchange_url: "http://exchange.taler";,
payto_uri: "payto://iban/de123123123" as PaytoString,
auth_conflict: false,
@@ -53,6 +57,8 @@ export const Example = tests.createExample(TestedComponent, {
},
{
exchange_http_status: 2,
+ status: MerchantAccountKycStatus.AWAITING_AML_REVIEW,
+ h_wire: "",
exchange_url: "http://exchange.taler";,
payto_uri: "payto://iban/de123123123" as PaytoString,
auth_conflict: false,
diff --git
a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/Detail.stories.tsx
b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/Detail.stories.tsx
index 7d4877db9..15979a7e9 100644
---
a/packages/merchant-backoffice-ui/src/paths/instance/orders/details/Detail.stories.tsx
+++
b/packages/merchant-backoffice-ui/src/paths/instance/orders/details/Detail.stories.tsx
@@ -72,6 +72,7 @@ export const Claimed = createExample(TestedComponent, {
id: "2021.165-03GDFC26Y1NNG",
selected: {
order_status: "claimed",
+ order_status_url: "http://asd.com/";,
contract_terms: defaultContractTerm,
},
});
diff --git a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
index b9659951c..0145218a5 100644
--- a/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
+++ b/packages/merchant-backoffice-ui/src/paths/instance/token/index.tsx
@@ -15,6 +15,7 @@
*/
import {
HttpStatusCode,
+ MerchantAuthMethod,
TalerError,
assertUnreachable,
} from "@gnu-taler/taler-util";
@@ -73,7 +74,7 @@ export default function Token({ onChange, onCancel }: Props):
VNode {
const resp = await
lib.instance.updateCurrentInstanceAuthentication(
currentToken,
{
- method: "external",
+ method: MerchantAuthMethod.EXTERNAL,
},
);
if (resp.type === "ok") {
@@ -89,7 +90,8 @@ export default function Token({ onChange, onCancel }: Props):
VNode {
return setNotif({
message: i18n.str`Failed to clear token`,
type: "ERROR",
- description: error instanceof Error ? error.message :
String(error),
+ description:
+ error instanceof Error ? error.message : String(error),
});
}
}}
@@ -101,7 +103,7 @@ export default function Token({ onChange, onCancel }:
Props): VNode {
currentToken,
{
token: newToken,
- method: "token",
+ method: MerchantAuthMethod.TOKEN,
},
);
if (resp.type === "fail") {
@@ -132,11 +134,12 @@ export default function Token({ onChange, onCancel }:
Props): VNode {
});
}
} catch (error) {
- return setNotif({
- message: i18n.str`Failed to set new token`,
- type: "ERROR",
- description: error instanceof Error ? error.message :
String(error),
- });
+ return setNotif({
+ message: i18n.str`Failed to set new token`,
+ type: "ERROR",
+ description:
+ error instanceof Error ? error.message : String(error),
+ });
}
}}
/>
diff --git
a/packages/merchant-backoffice-ui/src/paths/instance/update/Update.stories.tsx
b/packages/merchant-backoffice-ui/src/paths/instance/update/Update.stories.tsx
index 5bd12e4e9..eeeb2aeb6 100644
---
a/packages/merchant-backoffice-ui/src/paths/instance/update/Update.stories.tsx
+++
b/packages/merchant-backoffice-ui/src/paths/instance/update/Update.stories.tsx
@@ -21,6 +21,7 @@
import { FunctionalComponent, h } from "preact";
import { UpdatePage as TestedComponent } from "./UpdatePage.js";
+import { MerchantAuthMethod } from "@gnu-taler/taler-util";
export default {
title: "Pages/Instance/Update",
@@ -43,7 +44,7 @@ function createExample<Props>(
export const Example = createExample(TestedComponent, {
selected: {
name: "name",
- auth: { method: "external" },
+ auth: { method: MerchantAuthMethod.EXTERNAL },
address: {},
user_type: "business",
use_stefan: true,
diff --git a/packages/taler-harness/src/index.ts
b/packages/taler-harness/src/index.ts
index aaf513ba4..b4321e953 100644
--- a/packages/taler-harness/src/index.ts
+++ b/packages/taler-harness/src/index.ts
@@ -27,6 +27,7 @@ import {
Duration,
HttpStatusCode,
Logger,
+ MerchantAuthMethod,
PaytoString,
TalerAuthenticationHttpClient,
TalerBankConversionHttpClient,
@@ -899,7 +900,7 @@ deploymentCli
const resp = await merchantManager.createInstance(managementToken, {
address: {},
auth: {
- method: "token",
+ method: MerchantAuthMethod.TOKEN,
token: createRFC8959AccessTokenPlain(password),
},
default_pay_delay: Duration.toTalerProtocolDuration(
@@ -1057,7 +1058,7 @@ deploymentCli
const resp = await
merchantInstance.updateCurrentInstanceAuthentication(
createRFC8959AccessTokenEncoded(prevPassword),
{
- method: "token",
+ method: MerchantAuthMethod.TOKEN,
token: createRFC8959AccessTokenPlain(randomPassword),
},
);
@@ -1176,7 +1177,7 @@ deploymentCli
const createResp = await managementApi.createInstance(managementToken, {
address: {},
auth: {
- method: "token",
+ method: MerchantAuthMethod.TOKEN,
token: instanceTokenPlain,
},
default_pay_delay: Duration.toTalerProtocolDuration(defaultPayDelay),
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.