X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=fulbank%2Ffsb.py;h=723f61be2e25b79396c8322b0d01c49d95286a36;hb=c526374d7861581204f40aa046002e5f3942d405;hp=b529d465bb107f5903f05089d35d04d5be94da32;hpb=8c456209c0fd2a23dd883202d64a87b2a73cf155;p=fulbank.git

diff --git a/fulbank/fsb.py b/fulbank/fsb.py
index b529d46..723f61b 100644
--- a/fulbank/fsb.py
+++ b/fulbank/fsb.py
@@ -1,7 +1,7 @@
 import json, http.cookiejar, binascii, time, datetime, pickle, hashlib
 from urllib import request, parse
 from bs4 import BeautifulSoup as soup
-from . import currency
+from . import currency, auth
 soupify = lambda cont: soup(cont, "html.parser")
 
 apibase = "https://online.swedbank.se/TDE_DAP_Portal_REST_WEB/api/"
@@ -96,6 +96,8 @@ class account(object):
     @property
     def fullnumber(self): return resolve(self.data, ("fullyFormattedNumber",))
     @property
+    def balance(self): return currency.currency.get(resolve(self.data, ("balance", "currencyCode"))).parse(resolve(self.data, ("balance", "amount")))
+    @property
     def name(self): return resolve(self._idata, ("name",))
 
     def transactions(self):
@@ -166,7 +168,9 @@ class session(object):
         rolesw = linkurl(resolve(prof["banks"][0], ("privateProfile", "links", "next", "uri")))
         self._jreq(rolesw, method="POST")
 
-    def auth_bankid(self, user):
+    def auth_bankid(self, user, conv=None):
+        if conv is None:
+            conv = auth.default()
         data = self._jreq("v5/identification/bankid/mobile", data = {
             "userId": user,
             "useEasyLogin": False,
@@ -174,13 +178,15 @@ class session(object):
         if data.get("status") != "USER_SIGN":
             raise fmterror("unexpected bankid status: " + str(data.get("status")))
         vfy = linkurl(resolve(data, ("links", "next", "uri")))
+        fst = None
         while True:
             time.sleep(3)
             vdat = self._jreq(vfy)
             st = vdat.get("status")
-            if st == "USER_SIGN":
-                continue
-            elif st == "CLIENT_NOT_STARTED":
+            if st in {"USER_SIGN", "CLIENT_NOT_STARTED"}:
+                if st != fst:
+                    conv.message("Status: %s" % (st,), auth.conv.msg_info)
+                    fst = st
                 continue
             elif st == "COMPLETE":
                 self._postlogin()
@@ -236,4 +242,4 @@ class session(object):
     @classmethod
     def load(cls, filename):
         with open(filename, "rb") as fp:
-            return picke.load(fp)
+            return pickle.load(fp)