summaryrefslogtreecommitdiff
path: root/packages/taler-wallet-core/src/util/taleruri.ts
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2020-11-16 14:12:37 +0100
committerFlorian Dold <florian@dold.me>2020-11-16 14:12:37 +0100
commit292160f7e979a0d9fdea7430f0d26b2dc1122a16 (patch)
treef82a576398408ebbe04d96a93355de61d745c925 /packages/taler-wallet-core/src/util/taleruri.ts
parentcdf5cc583cd7fc938f38137da25aaee2aeaf28a9 (diff)
downloadwallet-core-292160f7e979a0d9fdea7430f0d26b2dc1122a16.tar.gz
wallet-core-292160f7e979a0d9fdea7430f0d26b2dc1122a16.tar.bz2
wallet-core-292160f7e979a0d9fdea7430f0d26b2dc1122a16.zip
fix tip record creation, migrate DB
Diffstat (limited to 'packages/taler-wallet-core/src/util/taleruri.ts')
-rw-r--r--packages/taler-wallet-core/src/util/taleruri.ts9
1 files changed, 5 insertions, 4 deletions
diff --git a/packages/taler-wallet-core/src/util/taleruri.ts b/packages/taler-wallet-core/src/util/taleruri.ts
index 839d0b29f..ee055a32f 100644
--- a/packages/taler-wallet-core/src/util/taleruri.ts
+++ b/packages/taler-wallet-core/src/util/taleruri.ts
@@ -14,6 +14,7 @@
GNU Taler; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/
+import { canonicalizeBaseUrl } from './helpers';
import { URLSearchParams } from "./url";
export interface PayUriResult {
@@ -59,7 +60,7 @@ export function parseWithdrawUri(s: string): WithdrawUriResult | undefined {
const p = [host, ...pathSegments].join("/");
return {
- bankIntegrationApiBaseUrl: `${pi.innerProto}://${p}/`,
+ bankIntegrationApiBaseUrl: canonicalizeBaseUrl(`${pi.innerProto}://${p}/`),
withdrawalOperationId: withdrawId,
};
}
@@ -155,7 +156,7 @@ export function parsePayUri(s: string): PayUriResult | undefined {
const orderId = parts[parts.length - 2];
const pathSegments = parts.slice(1, parts.length - 2);
const p = [host, ...pathSegments].join("/");
- const merchantBaseUrl = `${pi.innerProto}://${p}/`;
+ const merchantBaseUrl = canonicalizeBaseUrl(`${pi.innerProto}://${p}/`);
return {
merchantBaseUrl,
@@ -183,7 +184,7 @@ export function parseTipUri(s: string): TipUriResult | undefined {
const tipId = parts[parts.length - 1];
const pathSegments = parts.slice(1, parts.length - 1);
const p = [host, ...pathSegments].join("/");
- const merchantBaseUrl = `${pi.innerProto}://${p}/`;
+ const merchantBaseUrl = canonicalizeBaseUrl(`${pi.innerProto}://${p}/`);
return {
merchantBaseUrl,
@@ -210,7 +211,7 @@ export function parseRefundUri(s: string): RefundUriResult | undefined {
const orderId = parts[parts.length - 2];
const pathSegments = parts.slice(1, parts.length - 2);
const p = [host, ...pathSegments].join("/");
- const merchantBaseUrl = `${pi.innerProto}://${p}/`;
+ const merchantBaseUrl = canonicalizeBaseUrl(`${pi.innerProto}://${p}/`);
return {
merchantBaseUrl,