From 82f2b76e25a4a67e01ec67e5ebe39d14ad771ea8 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Thu, 20 Apr 2017 03:09:25 +0200
Subject: Reorganize module loading.

We now use webpack instead of SystemJS, effectively bundling modules
into one file (plus commons chunks) for every entry point.  This results
in a much smaller extension size (almost half).  Furthermore we use
yarn/npm even for extension run-time dependencies.  This relieves us
from manually vendoring and building dependencies.  It's also easier to
understand for new developers familiar with node.
---
 src/wallet.ts | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

(limited to 'src/wallet.ts')

diff --git a/src/wallet.ts b/src/wallet.ts
index 5b76a01ac..a809b94cc 100644
--- a/src/wallet.ts
+++ b/src/wallet.ts
@@ -66,6 +66,7 @@ import {
   getTalerStampSec,
 } from "./helpers";
 import {CryptoApi} from "./cryptoApi";
+import URI = require("urijs");
 
 "use strict";
 
@@ -245,7 +246,13 @@ function setTimeout(f: any, t: number) {
 function isWithdrawableDenom(d: DenominationRecord) {
   const now_sec = (new Date).getTime() / 1000;
   const stamp_withdraw_sec = getTalerStampSec(d.stampExpireWithdraw);
+  if (stamp_withdraw_sec == null) {
+    return false;
+  }
   const stamp_start_sec = getTalerStampSec(d.stampStart);
+  if (stamp_start_sec == null) {
+    return false;
+  }
   // Withdraw if still possible to withdraw within a minute
   if ((stamp_withdraw_sec + 60 > now_sec) && (now_sec >= stamp_start_sec)) {
     return true;
@@ -976,8 +983,8 @@ export class Wallet {
     wd.reserve_pub = pc.reservePub;
     wd.reserve_sig = pc.withdrawSig;
     wd.coin_ev = pc.coinEv;
-    let reqUrl = URI("reserve/withdraw").absoluteTo(reserve.exchange_base_url);
-    let resp = await this.http.postJson(reqUrl, wd);
+    let reqUrl = (new URI("reserve/withdraw")).absoluteTo(reserve.exchange_base_url);
+    let resp = await this.http.postJson(reqUrl.href(), wd);
 
     if (resp.status != 200) {
       throw new RequestException({
@@ -1068,9 +1075,9 @@ export class Wallet {
     if (!reserve) {
       throw Error("reserve not in db");
     }
-    let reqUrl = URI("reserve/status").absoluteTo(exchange.baseUrl);
+    let reqUrl = new URI("reserve/status").absoluteTo(exchange.baseUrl);
     reqUrl.query({'reserve_pub': reservePub});
-    let resp = await this.http.get(reqUrl);
+    let resp = await this.http.get(reqUrl.href());
     if (resp.status != 200) {
       throw Error();
     }
@@ -1105,8 +1112,8 @@ export class Wallet {
    */
   async getWireInfo(exchangeBaseUrl: string): Promise<WireInfo> {
     exchangeBaseUrl = canonicalizeBaseUrl(exchangeBaseUrl);
-    let reqUrl = URI("wire").absoluteTo(exchangeBaseUrl);
-    let resp = await this.http.get(reqUrl);
+    let reqUrl = new URI("wire").absoluteTo(exchangeBaseUrl);
+    let resp = await this.http.get(reqUrl.href());
 
     if (resp.status != 200) {
       throw Error("/wire request failed");
@@ -1216,8 +1223,8 @@ export class Wallet {
    */
   async updateExchangeFromUrl(baseUrl: string): Promise<ExchangeRecord> {
     baseUrl = canonicalizeBaseUrl(baseUrl);
-    let reqUrl = URI("keys").absoluteTo(baseUrl);
-    let resp = await this.http.get(reqUrl);
+    let reqUrl = new URI("keys").absoluteTo(baseUrl);
+    let resp = await this.http.get(reqUrl.href());
     if (resp.status != 200) {
       throw Error("/keys request failed");
     }
@@ -1569,7 +1576,7 @@ export class Wallet {
       return;
     }
 
-    let reqUrl = URI("refresh/melt").absoluteTo(refreshSession.exchangeBaseUrl);
+    let reqUrl = new URI("refresh/melt").absoluteTo(refreshSession.exchangeBaseUrl);
     let meltCoin = {
       coin_pub: coin.coinPub,
       denom_pub: coin.denomPub,
@@ -1585,7 +1592,7 @@ export class Wallet {
       "coin_evs": coinEvs,
     };
     console.log("melt request:", req);
-    let resp = await this.http.postJson(reqUrl, req);
+    let resp = await this.http.postJson(reqUrl.href(), req);
 
     console.log("melt request:", req);
     console.log("melt response:", resp.responseText);
@@ -1626,10 +1633,10 @@ export class Wallet {
       "transfer_privs": privs,
     };
 
-    let reqUrl = URI("refresh/reveal")
+    let reqUrl = new URI("refresh/reveal")
       .absoluteTo(refreshSession.exchangeBaseUrl);
     console.log("reveal request:", req);
-    let resp = await this.http.postJson(reqUrl, req);
+    let resp = await this.http.postJson(reqUrl.href(), req);
 
     console.log("session:", refreshSession);
     console.log("reveal response:", resp);
-- 
cgit v1.2.3