taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

taler URI parsing

Browse Source 
* add support for non-https taler://pay URIs
* implement path prefix properly
This commit is contained in:
Florian Dold 2019-10-02 14:21:31 +05:30
parent e3a5dbfe32
commit 3f6d3d186b
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
2 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/taleruri-test.ts
View File

@ -86,7 +86,7 @@ test("taler pay url parsing: instance", (t) => {
t.fail(); t.fail();
return; return;
} }
t.is(r1.downloadUrl, "https://example.com/instances/myinst/public/proposal?order_id=myorder"); t.is(r1.downloadUrl, "https://example.com/public/instances/myinst/proposal?order_id=myorder");
}); });
@ -97,7 +97,47 @@ test("taler pay url parsing: path prefix and instance", (t) => {
t.fail(); t.fail();
return; return;
} }
t.is(r1.downloadUrl, "https://example.com/mypfx/instances/myinst/public/proposal?order_id=myorder"); t.is(r1.downloadUrl, "https://example.com/mypfx/instances/myinst/proposal?order_id=myorder");
});
test("taler pay url parsing: complex path prefix", (t) => {
const url1 = "taler://pay/example.com/mypfx%2Fpublic/-/myorder";
const r1 = parsePayUri(url1);
if (!r1) {
t.fail();
return;
}
t.is(r1.downloadUrl, "https://example.com/mypfx/public/proposal?order_id=myorder");
});
test("taler pay url parsing: complex path prefix and instance", (t) => {
const url1 = "taler://pay/example.com/mypfx%2Fpublic/foo/myorder";
const r1 = parsePayUri(url1);
if (!r1) {
t.fail();
return;
}
t.is(r1.downloadUrl, "https://example.com/mypfx/public/instances/foo/proposal?order_id=myorder");
});
test("taler pay url parsing: non-https #1", (t) => {
const url1 = "taler://pay/example.com/-/-/myorder?insecure=1";
const r1 = parsePayUri(url1);
if (!r1) {
t.fail();
return;
}
t.is(r1.downloadUrl, "http://example.com/public/proposal?order_id=myorder");
});
test("taler pay url parsing: non-https #2", (t) => {
const url1 = "taler://pay/example.com/-/-/myorder?insecure=2";
const r1 = parsePayUri(url1);
if (!r1) {
t.fail();
return;
}
t.is(r1.downloadUrl, "https://example.com/public/proposal?order_id=myorder");
}); });

10
src/taleruri.ts
View File

@ -61,6 +61,7 @@ export function parseWithdrawUri(s: string): WithdrawUriResult | undefined {
export function parsePayUri(s: string): PayUriResult | undefined { export function parsePayUri(s: string): PayUriResult | undefined {
const parsedUri = new URI(s); const parsedUri = new URI(s);
const query: any = parsedUri.query(true);
if (parsedUri.scheme() === "http" || parsedUri.scheme() === "https") { if (parsedUri.scheme() === "http" || parsedUri.scheme() === "https") {
return { return {
downloadUrl: s, downloadUrl: s,
@ -96,7 +97,7 @@ export function parsePayUri(s: string): PayUriResult | undefined {
} }
if (maybePath === "-") { if (maybePath === "-") {
maybePath = ""; maybePath = "public/";
} else { } else {
maybePath = decodeURIComponent(maybePath) + "/"; maybePath = decodeURIComponent(maybePath) + "/";
} }
@ -105,8 +106,13 @@ export function parsePayUri(s: string): PayUriResult | undefined {
maybeInstancePath = `instances/${maybeInstance}/`; maybeInstancePath = `instances/${maybeInstance}/`;
} }
let protocol = "https";
if (query["insecure"] === "1") {
protocol = "http";
}
const downloadUrl = new URI( const downloadUrl = new URI(
"https://" + host + "/" + decodeURIComponent(maybePath) + maybeInstancePath + "public/proposal", protocol + "://" + host + "/" + decodeURIComponent(maybePath) + maybeInstancePath + "proposal",
) )
.addQuery({ order_id: orderId }) .addQuery({ order_id: orderId })
.href(); .href();